Skip to content

Commit d658d6d

Browse files
committed
modmotor: make reset_angle argument explicit
instead of defaulting to 0
1 parent 615791d commit d658d6d

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

bricks/ev3dev/modules/pybricks/ev3devices.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ class GyroSensor(Ev3devUartSensor):
214214
def __init__(self, port, direction=Direction.CLOCKWISE):
215215
Ev3devUartSensor.__init__(self, port)
216216
self._direction = direction
217-
self.reset_angle()
217+
self.reset_angle(0)
218218

219219
def speed(self):
220220
if self._direction == Direction.CLOCKWISE:
@@ -228,7 +228,7 @@ def angle(self):
228228
else:
229229
return -self._value(0) - self.offset
230230

231-
def reset_angle(self, angle=0):
231+
def reset_angle(self, angle):
232232
if self._direction == Direction.CLOCKWISE:
233233
self.offset = self._value(0) - angle
234234
else:

examples

extmod/modmotor.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(motor_Motor_stalled_obj, motor_Motor_stalled);
147147

148148
STATIC mp_obj_t motor_Motor_reset_angle(size_t n_args, const mp_obj_t *args){
149149
pbio_port_t port = get_port(args[0]);
150-
int32_t reset_angle = n_args > 1 ? mp_obj_get_num(args[1]) : 0;
150+
int32_t reset_angle = mp_obj_get_num(args[1]);
151151
pbio_error_t err;
152152

153153
pb_thread_enter();
@@ -158,7 +158,7 @@ STATIC mp_obj_t motor_Motor_reset_angle(size_t n_args, const mp_obj_t *args){
158158

159159
return mp_const_none;
160160
}
161-
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(motor_Motor_reset_angle_obj, 1, 2, motor_Motor_reset_angle);
161+
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(motor_Motor_reset_angle_obj, 2, 2, motor_Motor_reset_angle);
162162

163163
STATIC mp_obj_t motor_Motor_speed(mp_obj_t self_in) {
164164
pbio_port_t port = get_port(self_in);
@@ -175,9 +175,9 @@ STATIC mp_obj_t motor_Motor_speed(mp_obj_t self_in) {
175175
}
176176
MP_DEFINE_CONST_FUN_OBJ_1(motor_Motor_speed_obj, motor_Motor_speed);
177177

178-
STATIC mp_obj_t motor_Motor_run(size_t n_args, const mp_obj_t *args){
179-
pbio_port_t port = get_port(args[0]);
180-
int32_t speed = mp_obj_get_num(args[1]);
178+
STATIC mp_obj_t motor_Motor_run(mp_obj_t self_in, mp_obj_t speed_in) {
179+
pbio_port_t port = get_port(self_in);
180+
int32_t speed = mp_obj_get_num(speed_in);
181181
pbio_error_t err;
182182

183183
pb_thread_enter();
@@ -189,7 +189,7 @@ STATIC mp_obj_t motor_Motor_run(size_t n_args, const mp_obj_t *args){
189189

190190
return mp_const_none;
191191
}
192-
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(motor_Motor_run_obj, 2, 3, motor_Motor_run);
192+
MP_DEFINE_CONST_FUN_OBJ_2(motor_Motor_run_obj, motor_Motor_run);
193193

194194
STATIC mp_obj_t motor_Motor_stop(size_t n_args, const mp_obj_t *args){
195195
// Parse arguments and/or set default optional arguments

lib/fake-pybricks/pybricks/ev3devices.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,11 @@ def stalled(self):
9393
"""
9494
pass
9595

96-
def reset_angle(self, angle=0):
96+
def reset_angle(self, angle):
9797
"""Reset the accumulated rotation angle of the motor.
9898
9999
Arguments:
100-
angle (:ref:`angle`): Value to which the angle should be reset (*Default*: 0).
100+
angle (:ref:`angle`): Value to which the angle should be reset.
101101
"""
102102
pass
103103

@@ -434,11 +434,11 @@ def angle(self):
434434
"""
435435
pass
436436

437-
def reset_angle(self, angle=0):
437+
def reset_angle(self, angle):
438438
"""Set the rotation angle of the sensor to a desired value.
439439
440440
Arguments:
441-
angle (:ref:`angle`): Value to which the angle should be reset (*Default*: 0).
441+
angle (:ref:`angle`): Value to which the angle should be reset.
442442
"""
443443
pass
444444

0 commit comments

Comments
 (0)