Diff: globals.h

Revision:

5:7ac07bf30707

Parent:

2:cffa347bb943

Child:

9:377560539b74

--- a/globals.h	Thu Apr 26 22:05:59 2012 +0000
+++ b/globals.h	Thu Apr 26 23:49:49 2012 +0000
@@ -7,22 +7,26 @@
 #define ROBOT_PRIMARY
 // invert echo polarity for primary
 #define SONAR_ECHO_INV
+// Primary Robot constants
+const int robot_width = 410;
+const int encoderRevCount = 1856;
+const int wheelmm = 314;
+const int robotCircumference = 1256;
+#else
+//Secondary Robot constants in mm
+const int robot_width = 260;
+const int encoderRevCount = 360;
+const int wheelmm = 226;
+const int robotCircumference = 816;
 #endif
 
 #include "mbed.h"
 
 #define PI 3.14159265
 
-//Robot constants
-//const int encoderRevCount = 1856;
-//const int wheelmm = 314;
-//const int robotCircumference = 1256;
+
 
-//Robot constants in mm
-const int robot_width = 260;
-const int encoderRevCount = 360;
-const int wheelmm = 226;
-const int robotCircumference = 816;
+
 
 //Robot movement constants
 const float fwdvarperunit = 0.005; //1 std dev = 7% //NEEDS TO BE MEASURED AGAIN!