summaryrefslogtreecommitdiff
path: root/digital
diff options
context:
space:
mode:
Diffstat (limited to 'digital')
-rw-r--r--digital/ai/src/common/defs.h4
-rw-r--r--digital/io-hub/src/common/contact.avr.c2
-rw-r--r--digital/io-hub/src/common/contact.host.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/digital/ai/src/common/defs.h b/digital/ai/src/common/defs.h
index beec5608..12c47584 100644
--- a/digital/ai/src/common/defs.h
+++ b/digital/ai/src/common/defs.h
@@ -53,8 +53,8 @@ typedef struct position_t position_t;
/** Team color, determine the start zone side. */
enum team_color_e
{
- TEAM_COLOR_LEFT = 0,
- TEAM_COLOR_RIGHT = 1
+ TEAM_COLOR_RIGHT = 0,
+ TEAM_COLOR_LEFT = 1
};
/** Current team color, to be read at start up. */
diff --git a/digital/io-hub/src/common/contact.avr.c b/digital/io-hub/src/common/contact.avr.c
index 9f6869b4..d6692566 100644
--- a/digital/io-hub/src/common/contact.avr.c
+++ b/digital/io-hub/src/common/contact.avr.c
@@ -73,7 +73,7 @@ contact_update (void)
enum team_color_e
contact_get_color (void)
{
- return !IO_GET (CONTACT_COLOR) ? TEAM_COLOR_LEFT : TEAM_COLOR_RIGHT;
+ return IO_GET (CONTACT_COLOR) ? TEAM_COLOR_LEFT : TEAM_COLOR_RIGHT;
}
uint8_t
diff --git a/digital/io-hub/src/common/contact.host.c b/digital/io-hub/src/common/contact.host.c
index 5e2309c4..cc302f46 100644
--- a/digital/io-hub/src/common/contact.host.c
+++ b/digital/io-hub/src/common/contact.host.c
@@ -49,7 +49,7 @@ contact_handle (void *user, mex_msg_t *msg)
uint32_t contacts;
mex_msg_pop (msg, "L", &contacts);
ctx.all = contacts;
- ctx.color_state = !(contacts & 1) ? TEAM_COLOR_LEFT : TEAM_COLOR_RIGHT;
+ ctx.color_state = (contacts & 1) ? TEAM_COLOR_LEFT : TEAM_COLOR_RIGHT;
ctx.jack_state = (contacts & 2) ? 1 : 0;
contacts >>= 2;
#define CONTACT(io) do { \