uoled: added game color indication

diff --git a/build/linux/config.target b/build/linux/config.target
index 7f2713c248cf6d7aa77b67be2e03a6a4fe526ef3..2ef1af91193c3de1cdbf52a739b08eb599e55895 100644 (file)
--- a/build/linux/config.target
+++ b/build/linux/config.target
@@ -10,3 +10,4 @@ CFLAGS = -O2 -g -Wall
 CXXFLAGS = -O2 -g -Wall
 
 IDL_COMPILER=$(USER_BIN_DIR)/orte-idl
+CFLAGS += -DDISPLAY_DEBUG

diff --git a/src/disp-4dgl/control_new.4dg b/src/disp-4dgl/control_new.4dg
index 6ed1676baea397ae73d24d971f14002fe90f4a6f..c6da3f297166f037e76235ae243f420157aaa362 100644 (file)
--- a/src/disp-4dgl/control_new.4dg
+++ b/src/disp-4dgl/control_new.4dg
@@ -4,7 +4,7 @@
 //#inherit "4DGL-System.fnc"
 \r
 #constant MSG_TERM '~'\r
-#constant MSG_BUFF_LEN 79\r
+#constant MSG_BUFF_LEN 82\r
 #constant MSG_POWER 'V'\r
 #constant MSG_POSITION 'P'\r
 #constant MSG_FSM_STATE 'F'\r
@@ -289,6 +289,12 @@ func process_msg()
         position[6]:=msg_rcvd[27];\r
         position[7]:=msg_rcvd[28];\r
         \r
+        if(msg_rcvd[31]==0)\r
+            game_color := LIGHTGREEN;\r
+        else\r
+            game_color := RED;\r
+        endif\r
+        \r
         draw_voltage33();\r
         draw_voltage50();\r
         draw_voltage80();\r

diff --git a/src/uoled/uoled.c b/src/uoled/uoled.c
index 173f40034b7701e2601968d38266c1cfc944f98b..c447af5550da59b05745a4b54138a76a8275d2b6 100644 (file)
--- a/src/uoled/uoled.c
+++ b/src/uoled/uoled.c
@@ -184,7 +184,14 @@ int uoled_send_status(struct robot *state)
        if(ret==-1)
                return -1;
        else
-               idx += ret;     
+               idx += ret;
+
+       ret = oled_set_color(msg+idx, sizeof(msg)-idx, state->team_color);
+       if(ret==-1)
+               return -1;
+       else
+               idx += ret;
+
 
        ret = uoled_write_cmd(msg, idx);
        if(ret)