Dammenisvoorcasuals / Mbed 2 deprecated chessRobot

control for robotic arm that can play chess using a granular gripper

Dependencies:   Encoder mbed HIDScope Servo MODSERIAL

Fork of chessRobot by a steenbeek

Diff: buttons.cpp

Revision:
102:b3ab436fbe8e
Parent:
101:b821e89fc108
Child:
103:4a37d19e8fcc
--- a/buttons.cpp	Thu Oct 22 09:34:31 2015 +0000
+++ b/buttons.cpp	Thu Oct 22 10:12:27 2015 +0000
@@ -122,15 +122,15 @@
     	switch (actuatorState){
         	case 0: 				// potmeters control X speed
         		redLed.write(0); greenLed.write(1); blueLed.write(1);
-        		motor1SetSpeed = 300*(pot2.read()-pot1.read());
+        		motor1SetSpeed = scaleXSpeed*(pot2.read()-pot1.read());
         		break;
         	case 1:         		// potmeters control Y speed
         		redLed.write(1); greenLed.write(0); blueLed.write(1);
-        		motor2SetSpeed = 300*(pot2.read()-pot1.read());
+        		motor2SetSpeed = scaleYSpeed*(pot2.read()-pot1.read());
         		break;
         	case 2:         		// potmeters control Servo pos
         		redLed.write(1); greenLed.write(1); blueLed.write(0);
-        		servoSpeed = pot2.read();
+        		servoSpeed = scaleZSpeed*(pot2.read()-pot1.read());
         		break;
         }
     }else{