Revision 86:769e33a3f0ff, committed 2013-04-16

Comitter:

madcowswe

Date:

Tue Apr 16 11:35:43 2013 +0000

Parent:

85:b0858346d838

Child:

87:272a7129b04b

Commit message:

blue_56 works reliably

Changed in this revision

--- a/Actuators/Arms/Arm.cpp	Tue Apr 16 10:43:15 2013 +0000
+++ b/Actuators/Arms/Arm.cpp	Tue Apr 16 11:35:43 2013 +0000
@@ -4,6 +4,6 @@
 {
 
 Arm lower_arm(p25, 0.05, 0.9, 1.9);//2.0
-Arm upper_arm(p26, 0.05, 0.6, 2.2);//2.5
+Arm upper_arm(p26, 0.05, 0.6, 2.35);//2.5
 
 } //namespace
\ No newline at end of file

--- a/Processes/AI/ai.cpp	Tue Apr 16 10:43:15 2013 +0000
+++ b/Processes/AI/ai.cpp	Tue Apr 16 11:35:43 2013 +0000
@@ -88,7 +88,7 @@
     
     Waypoint mutable_cake_wp = {0, 0, 0, 0.01, 0.01*PI, 512};
     
-    float r = 0.26+0.35-0.01; //second 0.01 for being less collisiony with sensors
+    float r = 0.26+0.35-0.0075;//-0.01; //second 0.01 for being less collisiony with sensors
     
     layer layer_to_push = top_layer;
     

--- a/globals.h	Tue Apr 16 10:43:15 2013 +0000
+++ b/globals.h	Tue Apr 16 11:35:43 2013 +0000
@@ -2,8 +2,8 @@
 #ifndef GLOBALS_H
 #define GLOBALS_H
 
-#define TEAM_RED
-//#define TEAM_BLUE
+//#define TEAM_RED
+#define TEAM_BLUE
 
 #include "mbed.h"