Skip to content

Commit 719cd26

Browse files
jilaypandyakartben
authored andcommitted
drivers: stepper: refactor set_actual_position to set_reference_position
This commit refactos set_actual_position to set_reference_position. stepper_set_reference_position is more apt in regards to what this func actually does Signed-off-by: Jilay Pandya <[email protected]>
1 parent fb811f1 commit 719cd26

File tree

10 files changed

+35
-32
lines changed

10 files changed

+35
-32
lines changed

doc/hardware/peripherals/stepper.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Configure Stepper Driver
1010

1111
- Configure **micro-stepping resolution** using :c:func:`stepper_set_micro_step_res`
1212
and :c:func:`stepper_get_micro_step_res`.
13-
- Configure **actual position a.k.a step count** in microsteps using :c:func:`stepper_set_actual_position`
13+
- Configure **reference position** in microsteps using :c:func:`stepper_set_reference_position`
1414
and :c:func:`stepper_get_actual_position`.
1515
- Set **max velocity** in micro-steps per second using :c:func:`stepper_set_max_velocity`
1616
- **Enable** the stepper driver using :c:func:`stepper_enable`.

doc/releases/migration-guide-4.1.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ Stepper
117117
=======
118118

119119
* Renamed the ``compatible`` from ``zephyr,gpio-steppers`` to :dtcompatible:`zephyr,gpio-stepper`.
120+
* Renamed the ``stepper_set_actual_position`` function to :c:func:`stepper_set_reference_position`.
120121

121122
Regulator
122123
=========

drivers/stepper/adi_tmc/adi_tmc5041_stepper_controller.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ static int tmc5041_stepper_get_micro_step_res(const struct device *dev,
410410
return 0;
411411
}
412412

413-
static int tmc5041_stepper_set_actual_position(const struct device *dev, const int32_t position)
413+
static int tmc5041_stepper_set_reference_position(const struct device *dev, const int32_t position)
414414
{
415415
const struct tmc5041_stepper_config *config = dev->config;
416416
int err;
@@ -728,7 +728,7 @@ static int tmc5041_stepper_init(const struct device *dev)
728728
.set_max_velocity = tmc5041_stepper_set_max_velocity, \
729729
.set_micro_step_res = tmc5041_stepper_set_micro_step_res, \
730730
.get_micro_step_res = tmc5041_stepper_get_micro_step_res, \
731-
.set_actual_position = tmc5041_stepper_set_actual_position, \
731+
.set_reference_position = tmc5041_stepper_set_reference_position, \
732732
.get_actual_position = tmc5041_stepper_get_actual_position, \
733733
.set_target_position = tmc5041_stepper_set_target_position, \
734734
.enable_constant_velocity_mode = tmc5041_stepper_enable_constant_velocity_mode, \

drivers/stepper/fake_stepper_controller.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ DEFINE_FAKE_VALUE_FUNC(int, fake_stepper_set_micro_step_res, const struct device
3333
DEFINE_FAKE_VALUE_FUNC(int, fake_stepper_get_micro_step_res, const struct device *,
3434
enum stepper_micro_step_resolution *);
3535

36-
DEFINE_FAKE_VALUE_FUNC(int, fake_stepper_set_actual_position, const struct device *, int32_t);
36+
DEFINE_FAKE_VALUE_FUNC(int, fake_stepper_set_reference_position, const struct device *, int32_t);
3737

3838
DEFINE_FAKE_VALUE_FUNC(int, fake_stepper_get_actual_position, const struct device *, int32_t *);
3939

@@ -65,7 +65,7 @@ static int fake_stepper_get_micro_step_res_delegate(const struct device *dev,
6565
return 0;
6666
}
6767

68-
static int fake_stepper_set_actual_position_delegate(const struct device *dev, const int32_t pos)
68+
static int fake_stepper_set_reference_position_delegate(const struct device *dev, const int32_t pos)
6969
{
7070
struct fake_stepper_data *data = dev->data;
7171

@@ -95,16 +95,16 @@ static void fake_stepper_reset_rule_before(const struct ztest_unit_test *test, v
9595
RESET_FAKE(fake_stepper_set_max_velocity);
9696
RESET_FAKE(fake_stepper_set_micro_step_res);
9797
RESET_FAKE(fake_stepper_get_micro_step_res);
98-
RESET_FAKE(fake_stepper_set_actual_position);
98+
RESET_FAKE(fake_stepper_set_reference_position);
9999
RESET_FAKE(fake_stepper_get_actual_position);
100100
RESET_FAKE(fake_stepper_set_target_position);
101101
RESET_FAKE(fake_stepper_enable_constant_velocity_mode);
102102

103103
/* Install custom fakes for the setter and getter functions */
104104
fake_stepper_set_micro_step_res_fake.custom_fake = fake_stepper_set_micro_step_res_delegate;
105105
fake_stepper_get_micro_step_res_fake.custom_fake = fake_stepper_get_micro_step_res_delegate;
106-
fake_stepper_set_actual_position_fake.custom_fake =
107-
fake_stepper_set_actual_position_delegate;
106+
fake_stepper_set_reference_position_fake.custom_fake =
107+
fake_stepper_set_reference_position_delegate;
108108
fake_stepper_get_actual_position_fake.custom_fake =
109109
fake_stepper_get_actual_position_delegate;
110110
}
@@ -116,8 +116,8 @@ static int fake_stepper_init(const struct device *dev)
116116
{
117117
fake_stepper_set_micro_step_res_fake.custom_fake = fake_stepper_set_micro_step_res_delegate;
118118
fake_stepper_get_micro_step_res_fake.custom_fake = fake_stepper_get_micro_step_res_delegate;
119-
fake_stepper_set_actual_position_fake.custom_fake =
120-
fake_stepper_set_actual_position_delegate;
119+
fake_stepper_set_reference_position_fake.custom_fake =
120+
fake_stepper_set_reference_position_delegate;
121121
fake_stepper_get_actual_position_fake.custom_fake =
122122
fake_stepper_get_actual_position_delegate;
123123

@@ -131,7 +131,7 @@ static const struct stepper_driver_api fake_stepper_driver_api = {
131131
.set_max_velocity = fake_stepper_set_max_velocity,
132132
.set_micro_step_res = fake_stepper_set_micro_step_res,
133133
.get_micro_step_res = fake_stepper_get_micro_step_res,
134-
.set_actual_position = fake_stepper_set_actual_position,
134+
.set_reference_position = fake_stepper_set_reference_position,
135135
.get_actual_position = fake_stepper_get_actual_position,
136136
.set_target_position = fake_stepper_set_target_position,
137137
.enable_constant_velocity_mode = fake_stepper_enable_constant_velocity_mode,

drivers/stepper/gpio_stepper_controller.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ static int gpio_stepper_move(const struct device *dev, int32_t micro_steps)
194194
return 0;
195195
}
196196

197-
static int gpio_stepper_set_actual_position(const struct device *dev, int32_t position)
197+
static int gpio_stepper_set_reference_position(const struct device *dev, int32_t position)
198198
{
199199
struct gpio_stepper_data *data = dev->data;
200200

@@ -356,7 +356,7 @@ static const struct stepper_driver_api gpio_stepper_api = {
356356
.enable = gpio_stepper_enable,
357357
.move = gpio_stepper_move,
358358
.is_moving = gpio_stepper_is_moving,
359-
.set_actual_position = gpio_stepper_set_actual_position,
359+
.set_reference_position = gpio_stepper_set_reference_position,
360360
.get_actual_position = gpio_stepper_get_actual_position,
361361
.set_target_position = gpio_stepper_set_target_position,
362362
.set_max_velocity = gpio_stepper_set_max_velocity,

drivers/stepper/stepper_shell.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ static int cmd_stepper_get_micro_step_res(const struct shell *sh, size_t argc, c
294294
return err;
295295
}
296296

297-
static int cmd_stepper_set_actual_position(const struct shell *sh, size_t argc, char **argv)
297+
static int cmd_stepper_set_reference_position(const struct shell *sh, size_t argc, char **argv)
298298
{
299299
const struct device *dev;
300300
int err = 0;
@@ -309,7 +309,7 @@ static int cmd_stepper_set_actual_position(const struct shell *sh, size_t argc,
309309
return err;
310310
}
311311

312-
err = stepper_set_actual_position(dev, position);
312+
err = stepper_set_reference_position(dev, position);
313313
if (err) {
314314
shell_error(sh, "Error: %d", err);
315315
}
@@ -462,8 +462,8 @@ SHELL_STATIC_SUBCMD_SET_CREATE(
462462
"<device> <resolution>", cmd_stepper_set_micro_step_res, 3, 0),
463463
SHELL_CMD_ARG(get_micro_step_res, &dsub_pos_stepper_motor_name, "<device>",
464464
cmd_stepper_get_micro_step_res, 2, 0),
465-
SHELL_CMD_ARG(set_actual_position, &dsub_pos_stepper_motor_name, "<device> <position>",
466-
cmd_stepper_set_actual_position, 3, 0),
465+
SHELL_CMD_ARG(set_reference_position, &dsub_pos_stepper_motor_name, "<device> <position>",
466+
cmd_stepper_set_reference_position, 3, 0),
467467
SHELL_CMD_ARG(get_actual_position, &dsub_pos_stepper_motor_name, "<device>",
468468
cmd_stepper_get_actual_position, 2, 0),
469469
SHELL_CMD_ARG(set_target_position, &dsub_pos_stepper_motor_name, "<device> <micro_steps>",

include/zephyr/drivers/stepper.h

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
/*
99
* SPDX-FileCopyrightText: Copyright (c) 2024 Carl Zeiss Meditec AG
10+
* SPDX-FileCopyrightText: Copyright (c) 2024 Jilay Sandeep Pandya
1011
* SPDX-License-Identifier: Apache-2.0
1112
*/
1213

@@ -135,11 +136,11 @@ typedef int (*stepper_set_micro_step_res_t)(const struct device *dev,
135136
typedef int (*stepper_get_micro_step_res_t)(const struct device *dev,
136137
enum stepper_micro_step_resolution *resolution);
137138
/**
138-
* @brief Set the actual a.k.a reference position of the stepper
139+
* @brief Set the reference position of the stepper
139140
*
140141
* @see stepper_set_actual_position() for details.
141142
*/
142-
typedef int (*stepper_set_actual_position_t)(const struct device *dev, const int32_t value);
143+
typedef int (*stepper_set_reference_position_t)(const struct device *dev, const int32_t value);
143144

144145
/**
145146
* @brief Get the actual a.k.a reference position of the stepper
@@ -194,7 +195,7 @@ __subsystem struct stepper_driver_api {
194195
stepper_set_max_velocity_t set_max_velocity;
195196
stepper_set_micro_step_res_t set_micro_step_res;
196197
stepper_get_micro_step_res_t get_micro_step_res;
197-
stepper_set_actual_position_t set_actual_position;
198+
stepper_set_reference_position_t set_reference_position;
198199
stepper_get_actual_position_t get_actual_position;
199200
stepper_set_target_position_t set_target_position;
200201
stepper_is_moving_t is_moving;
@@ -318,7 +319,7 @@ static inline int z_impl_stepper_get_micro_step_res(const struct device *dev,
318319
}
319320

320321
/**
321-
* @brief Set the actual a.k.a reference position of the stepper
322+
* @brief Set the reference position of the stepper
322323
*
323324
* @param dev Pointer to the stepper motor controller instance.
324325
* @param value The reference position to set in micro-steps.
@@ -327,16 +328,17 @@ static inline int z_impl_stepper_get_micro_step_res(const struct device *dev,
327328
* @retval -ENOSYS If not implemented by device driver
328329
* @retval 0 Success
329330
*/
330-
__syscall int stepper_set_actual_position(const struct device *dev, int32_t value);
331+
__syscall int stepper_set_reference_position(const struct device *dev, int32_t value);
331332

332-
static inline int z_impl_stepper_set_actual_position(const struct device *dev, const int32_t value)
333+
static inline int z_impl_stepper_set_reference_position(const struct device *dev,
334+
const int32_t value)
333335
{
334336
const struct stepper_driver_api *api = (const struct stepper_driver_api *)dev->api;
335337

336-
if (api->set_actual_position == NULL) {
338+
if (api->set_reference_position == NULL) {
337339
return -ENOSYS;
338340
}
339-
return api->set_actual_position(dev, value);
341+
return api->set_reference_position(dev, value);
340342
}
341343

342344
/**

include/zephyr/drivers/stepper/stepper_fake.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ DECLARE_FAKE_VALUE_FUNC(int, fake_stepper_set_micro_step_res, const struct devic
2626
DECLARE_FAKE_VALUE_FUNC(int, fake_stepper_get_micro_step_res, const struct device *,
2727
enum stepper_micro_step_resolution *);
2828

29-
DECLARE_FAKE_VALUE_FUNC(int, fake_stepper_set_actual_position, const struct device *, int32_t);
29+
DECLARE_FAKE_VALUE_FUNC(int, fake_stepper_set_reference_position, const struct device *, int32_t);
3030

3131
DECLARE_FAKE_VALUE_FUNC(int, fake_stepper_get_actual_position, const struct device *, int32_t *);
3232

tests/drivers/stepper/shell/src/main.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,13 @@ ZTEST(stepper_shell, test_stepper_get_micro_step_res)
9999
ASSERT_STEPPER_FUNC_CALLED(fake_stepper_get_micro_step_res_fake, err);
100100
}
101101

102-
ZTEST(stepper_shell, test_stepper_set_actual_position)
102+
ZTEST(stepper_shell, test_stepper_set_reference_position)
103103
{
104104
const struct shell *sh = shell_backend_dummy_get_ptr();
105-
int err = shell_execute_cmd(sh, "stepper set_actual_position " FAKE_STEPPER_NAME " 100");
105+
int err = shell_execute_cmd(sh, "stepper set_reference_position " FAKE_STEPPER_NAME " 100");
106106

107-
ASSERT_STEPPER_FUNC_CALLED(fake_stepper_set_actual_position_fake, err);
108-
zassert_equal(fake_stepper_set_actual_position_fake.arg1_val, 100,
107+
ASSERT_STEPPER_FUNC_CALLED(fake_stepper_set_reference_position_fake, err);
108+
zassert_equal(fake_stepper_set_reference_position_fake.arg1_val, 100,
109109
"wrong actual position value");
110110
}
111111

tests/drivers/stepper/stepper_api/src/main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ static void *stepper_setup(void)
5656
static void stepper_before(void *f)
5757
{
5858
struct stepper_fixture *fixture = f;
59-
(void)stepper_set_actual_position(fixture->dev, 0);
59+
(void)stepper_set_reference_position(fixture->dev, 0);
6060
k_poll_signal_reset(&stepper_signal);
6161
}
6262

@@ -73,7 +73,7 @@ ZTEST_F(stepper, test_micro_step_res)
7373
ZTEST_F(stepper, test_actual_position)
7474
{
7575
int32_t pos = 100u;
76-
(void)stepper_set_actual_position(fixture->dev, pos);
76+
(void)stepper_set_reference_position(fixture->dev, pos);
7777
(void)stepper_get_actual_position(fixture->dev, &pos);
7878
zassert_equal(pos, 100u, "Actual position not set correctly");
7979
}

0 commit comments

Comments
 (0)