summaryrefslogtreecommitdiff
path: root/digital
diff options
context:
space:
mode:
authorNicolas Schodet2011-05-30 11:45:09 +0200
committerNicolas Schodet2011-05-30 11:45:09 +0200
commit5e4f6921f117d650025fee172af7bf4e68b69129 (patch)
tree06a9aa3e0ef5e4e12c157336364811a8f8eafc1b /digital
parent0e1b966d3a66518bae9b44d888b3daea918f10f7 (diff)
digital/io-hub, host/simu: add Strat contact
Diffstat (limited to 'digital')
-rw-r--r--digital/io-hub/src/robospierre/contact_defs.h8
-rw-r--r--digital/io-hub/src/robospierre/pawn_sensor.c2
-rw-r--r--digital/io-hub/tools/io_hub/mex.py2
3 files changed, 7 insertions, 5 deletions
diff --git a/digital/io-hub/src/robospierre/contact_defs.h b/digital/io-hub/src/robospierre/contact_defs.h
index 1e04f6bf..8c60342a 100644
--- a/digital/io-hub/src/robospierre/contact_defs.h
+++ b/digital/io-hub/src/robospierre/contact_defs.h
@@ -25,8 +25,9 @@
*
* }}} */
-#define CONTACT_COLOR A, 7
-#define CONTACT_JACK F, 7
+#define CONTACT_COLOR E, 5
+#define CONTACT_JACK E, 6
+#define CONTACT_STRAT E, 5
#define CONTACT_FRONT_BOTTOM A, 4
#define CONTACT_FRONT_MIDDLE F, 4
#define CONTACT_BACK_BOTTOM A, 5
@@ -42,6 +43,7 @@
CONTACT (CONTACT_BACK_BOTTOM) \
CONTACT (CONTACT_BACK_MIDDLE) \
CONTACT (CONTACT_BACK_TOP) \
- CONTACT (CONTACT_SIDE)
+ CONTACT (CONTACT_SIDE) \
+ CONTACT (CONTACT_STRAT)
#endif /* contact_defs_h */
diff --git a/digital/io-hub/src/robospierre/pawn_sensor.c b/digital/io-hub/src/robospierre/pawn_sensor.c
index 65f0afe4..3a59e908 100644
--- a/digital/io-hub/src/robospierre/pawn_sensor.c
+++ b/digital/io-hub/src/robospierre/pawn_sensor.c
@@ -52,7 +52,7 @@ struct pawn_sensor_t pawn_sensor_front, pawn_sensor_back;
static uint8_t
pawn_sensor_get_type (uint8_t direction)
{
- uint8_t element_type = contact_get_color () ? ELEMENT_PAWN : ELEMENT_KING;
+ uint8_t element_type = IO_GET (CONTACT_STRAT) ? ELEMENT_PAWN : ELEMENT_KING;
return element_type;
}
diff --git a/digital/io-hub/tools/io_hub/mex.py b/digital/io-hub/tools/io_hub/mex.py
index 44c41010..66060ea1 100644
--- a/digital/io-hub/tools/io_hub/mex.py
+++ b/digital/io-hub/tools/io_hub/mex.py
@@ -31,7 +31,7 @@ ADC_NB = 8
PWM_NB = 6
PWM_VALUE_MAX = 1024
-CONTACT_NB = 9
+CONTACT_NB = 10
CONTACT_INIT = 0xffffffff
class Mex: