From d63de355803bfb89cd9a7788792b11c5a7e16b13 Mon Sep 17 00:00:00 2001 From: shrkey Date: Sun, 28 Feb 2016 22:52:31 +0000 Subject: [PATCH] Added second ROV control --- microrov.py | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/microrov.py b/microrov.py index c040caa..d9970cb 100644 --- a/microrov.py +++ b/microrov.py @@ -70,7 +70,10 @@ def motor(controller, port, starboard, depth): def port(controller, speed): #print port - mleft.setMotorSpeed(speed) + if controller == "aa": + mleft.setMotorSpeed(speed) + else: + mmleft.setMotorSpeed(speed) showmotor(controller, 2, speed) @@ -80,7 +83,10 @@ def port(controller, speed): def starboard(controller, speed): #print starboard - mright.setMotorSpeed(speed) + if controller == "aa": + mright.setMotorSpeed(speed) + else: + mmright.setMotorSpeed(speed) showmotor(controller, 0, speed) @@ -90,7 +96,10 @@ def starboard(controller, speed): def depth(controller, speed): #print depth - mvert.setMotorSpeed(speed) + if controller == "aa": + mvert.setMotorSpeed(speed) + else: + mmvert.setMotorSpeed(speed) showmotor(controller, 4, speed) @@ -167,6 +176,10 @@ mleft = dw.getMotor(2) mright = dw.getMotor(1) mvert = dw.getMotor(3) +mmleft = dw.getMotor(5) +mmright = dw.getMotor(4) +mmvert = dw.getMotor(6) + controllerlist = [] # create a ps3 object - we want to handle up to two controllers