Merge pull request #267 from dwalton76/develop-misc

utils move_motor and stop_motor update to python3

Author: dwalton76

utils/move_motor.py

@@ -1,12 +1,11 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 """
 Used to adjust the position of a motor in an already assembled robot
 where you can"t move the motor by hand.
 """
 
-from ev3dev.auto import OUTPUT_A, OUTPUT_B, OUTPUT_C, OUTPUT_D
-from ev3dev.helper import LargeMotor
+from ev3dev.auto import OUTPUT_A, OUTPUT_B, OUTPUT_C, OUTPUT_D, Motor
 import argparse
 import logging
 import sys
@@ -19,19 +18,18 @@
 args = parser.parse_args()
 
 # logging
-logging.basicConfig(level=logging.DEBUG,
+logging.basicConfig(level=logging.INFO,
                     format="%(asctime)s %(levelname)5s: %(message)s")
 log = logging.getLogger(__name__)
 
-# For this it doesn't really matter if it is a LargeMotor or a MediumMotor
 if args.motor == "A":
-    motor = LargeMotor(OUTPUT_A)
+    motor = Motor(OUTPUT_A)
 elif args.motor == "B":
-    motor = LargeMotor(OUTPUT_B)
+    motor = Motor(OUTPUT_B)
 elif args.motor == "C":
-    motor = LargeMotor(OUTPUT_C)
+    motor = Motor(OUTPUT_C)
 elif args.motor == "D":
-    motor = LargeMotor(OUTPUT_D)
+    motor = Motor(OUTPUT_D)
 else:
     raise Exception("%s is invalid, options are A, B, C, D")
 
@@ -40,13 +38,8 @@
     sys.exit(1)
 
 if args.degrees:
-    log.info("Motor %s, move to position %d, max speed %d" % (args.motor, args.degrees, motor.max_speed))
+    log.info("Motor %s, current position %d, move to position %d, max speed %d" %
+             (args.motor, motor.position, args.degrees, motor.max_speed))
     motor.run_to_rel_pos(speed_sp=args.speed,
                          position_sp=args.degrees,
-                         # ramp_up_sp=500,
-                         # ramp_down_sp=500,
                          stop_action='hold')
-    motor.wait_for_running()
-    motor.wait_for_stop()
-    motor.stop(stop_action='brake')
-    log.info("Motor %s stopped, final position %d" % (args.motor, motor.position))

utils/stop_all_motors.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 """
 Stop all motors