Diff: globals.h

Revision:

60:5058465904e0

Parent:

50:937e860f4621

Child:

61:a7782a35ce4f

--- a/globals.h	Fri Apr 12 22:00:32 2013 +0000
+++ b/globals.h	Sat Apr 13 22:41:00 2013 +0000
@@ -8,7 +8,7 @@
 
 #define ENABLE_GLOBAL_ENCODERS
 
-const float ENCODER_M_PER_TICK = 0.00084;
+const float ENCODER_M_PER_TICK = 1.0f/11980.0f;
 const float ENCODER_WHEELBASE = 0.068;
 const float TURRET_FWD_PLACEMENT = -0.042;
 
@@ -65,10 +65,10 @@
 const PinName P_COLOR_SENSOR_IN_UPPER = p20;
 const PinName P_COLOR_SENSOR_IN_LOWER = p19;
 
-const PinName P_MOT_LEFT_A     = p21;
-const PinName P_MOT_LEFT_B     = p22;
-const PinName P_MOT_RIGHT_A      = p23;
-const PinName P_MOT_RIGHT_B      = p24;
+const PinName P_MOT_LEFT_A     = p22;
+const PinName P_MOT_LEFT_B     = p21;
+const PinName P_MOT_RIGHT_A      = p24;
+const PinName P_MOT_RIGHT_B      = p23;
 
 const PinName P_ENC_RIGHT_A     = p26;
 const PinName P_ENC_RIGHT_B     = p25;