@@ -278,7 +278,7 @@ def __init__(self, leftport, rightport):
278
278
super ().__init__ ()
279
279
self ._leftmotor = Motor (leftport )
280
280
self ._rightmotor = Motor (rightport )
281
- self .default_speed = 50
281
+ self .default_speed = 20
282
282
283
283
def set_default_speed (self , default_speed ):
284
284
"""Sets the default speed of the motor
@@ -298,8 +298,7 @@ def run_for_rotations(self, rotations, speedl=None, speedr=None):
298
298
speedl = self .default_speed
299
299
if speedr is None :
300
300
speedr = self .default_speed
301
- self ._leftmotor .run_for_degrees (int (rotations * 360 ), speedl )
302
- self ._rightmotor .run_for_degrees (int (rotations * 360 ), speedr )
301
+ self .run_for_degrees (int (rotations * 360 ), speedl , speedr )
303
302
304
303
def run_for_degrees (self , degrees , speedl = None , speedr = None ):
305
304
"""Runs pair of motors for degrees
@@ -312,8 +311,14 @@ def run_for_degrees(self, degrees, speedl=None, speedr=None):
312
311
speedl = self .default_speed
313
312
if speedr is None :
314
313
speedr = self .default_speed
315
- self ._leftmotor .run_for_degrees (degrees , speedl )
316
- self ._rightmotor .run_for_degrees (degrees , speedr )
314
+ th1 = threading .Thread (target = self ._leftmotor .run_for_degrees , args = (degrees ,), kwargs = {'speed' : speedl , 'blocking' : True })
315
+ th1 .daemon = True
316
+ th2 = threading .Thread (target = self ._rightmotor .run_for_degrees , args = (degrees ,), kwargs = {'speed' : speedr , 'blocking' : True })
317
+ th2 .daemon = True
318
+ th1 .start ()
319
+ th2 .start ()
320
+ th1 .join ()
321
+ th2 .join ()
317
322
318
323
def run_for_seconds (self , seconds , speedl = None , speedr = None ):
319
324
"""Runs pair for N seconds
@@ -326,9 +331,9 @@ def run_for_seconds(self, seconds, speedl=None, speedr=None):
326
331
speedl = self .default_speed
327
332
if speedr is None :
328
333
speedr = self .default_speed
329
- th1 = threading .Thread (target = self ._leftmotor ._run_for_seconds , args = (seconds ,), kwargs = {'speed' : speedl , 'blocking' : True })
334
+ th1 = threading .Thread (target = self ._leftmotor ._run_for_seconds , args = (seconds ,), kwargs = {'speed' : speedl })
330
335
th1 .daemon = True
331
- th2 = threading .Thread (target = self ._rightmotor ._run_for_seconds , args = (seconds ,), kwargs = {'speed' : speedr , 'blocking' : True })
336
+ th2 = threading .Thread (target = self ._rightmotor ._run_for_seconds , args = (seconds ,), kwargs = {'speed' : speedr })
332
337
th2 .daemon = True
333
338
th1 .start ()
334
339
th2 .start ()
0 commit comments