Skip to content

Commit af797f4

Browse files
dpgeorgedpgeorge
committed
stmhal, servo: Rename calibrate method to calibration.
It should be a noun, since it supports getting and setting depending on the number of arguments given.
1 parent 6691c9e commit af797f4

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

‎stmhal/qstrdefsport.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ Q(CIRCULAR)
191191
// for Servo object
192192
Q(Servo)
193193
Q(pulse_width)
194-
Q(calibrate)
194+
Q(calibration)
195195
Q(angle)
196196
Q(speed)
197197

‎stmhal/servo.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ STATIC mp_obj_t pyb_servo_pulse_width(uint n_args, const mp_obj_t *args) {
193193

194194
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_servo_pulse_width_obj, 1, 2, pyb_servo_pulse_width);
195195

196-
STATIC mp_obj_t pyb_servo_calibrate(uint n_args, const mp_obj_t *args) {
196+
STATIC mp_obj_t pyb_servo_calibration(uint n_args, const mp_obj_t *args) {
197197
pyb_servo_obj_t *self = args[0];
198198
if (n_args == 1) {
199199
// get calibration values
@@ -219,10 +219,10 @@ STATIC mp_obj_t pyb_servo_calibrate(uint n_args, const mp_obj_t *args) {
219219
}
220220

221221
// bad number of arguments
222-
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "calibrate expecting 1, 4 or 6 arguments, got %d", n_args));
222+
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "calibration expecting 1, 4 or 6 arguments, got %d", n_args));
223223
}
224224

225-
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_servo_calibrate_obj, 1, 6, pyb_servo_calibrate);
225+
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_servo_calibration_obj, 1, 6, pyb_servo_calibration);
226226

227227
STATIC mp_obj_t pyb_servo_angle(uint n_args, const mp_obj_t *args) {
228228
pyb_servo_obj_t *self = args[0];
@@ -278,7 +278,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_servo_speed_obj, 1, 3, pyb_servo_
278278

279279
STATIC const mp_map_elem_t pyb_servo_locals_dict_table[] = {
280280
{ MP_OBJ_NEW_QSTR(MP_QSTR_pulse_width), (mp_obj_t)&pyb_servo_pulse_width_obj },
281-
{ MP_OBJ_NEW_QSTR(MP_QSTR_calibrate), (mp_obj_t)&pyb_servo_calibrate_obj },
281+
{ MP_OBJ_NEW_QSTR(MP_QSTR_calibration), (mp_obj_t)&pyb_servo_calibration_obj },
282282
{ MP_OBJ_NEW_QSTR(MP_QSTR_angle), (mp_obj_t)&pyb_servo_angle_obj },
283283
{ MP_OBJ_NEW_QSTR(MP_QSTR_speed), (mp_obj_t)&pyb_servo_speed_obj },
284284
};

0 commit comments

Comments
 (0)