irrational unblocking, low speed obstacle bug and spicke pack when y too big

[aversive.git] / projects / microb2010 / mainboard / display.py

diff --git a/projects/microb2010/mainboard/display.py b/projects/microb2010/mainboard/display.py
index 787c1c29ca11462088e5670dc948510866ab9670..ff5bb02be2ee3bad98517cf6add5f38e328622e0 100644 (file)
--- a/projects/microb2010/mainboard/display.py
+++ b/projects/microb2010/mainboard/display.py
@@ -383,7 +383,7 @@ while True:
                     print "cobboard: %x,%x"%(int(m.groups()[0]),int(m.groups()[1]))
                     side = int(m.groups()[0])
                     flags = int(m.groups()[1])
-                    if side == 0:
+                    if (side == 0 and color == YELLOW) or (side == 1 and color == BLUE):
                         robot_lspickle_deployed = ((flags & 1) * 2)
                         robot_lspickle_autoharvest = ((flags & 2) != 0)
                     else:
@@ -418,6 +418,8 @@ while True:
                 fw.write("l")
             elif k == "r":
                 fw.write("r")
+            elif k == "b":
+                fw.write("b")
             elif k == "c":
                 robot_trail_list = []
             elif k == "x":