summaryrefslogtreecommitdiff
path: root/digital
diff options
context:
space:
mode:
authorNicolas Schodet2011-05-14 01:28:54 +0200
committerNicolas Schodet2011-05-14 01:38:19 +0200
commitc8d4bd0e0f79dc8e49ad0074a1e67317e903c41f (patch)
tree9a2b010211a2382f7dfe3812a907674a969fb75d /digital
parenta3fdbecac564a600c65568cac0e02fc72604567e (diff)
digital/io-hub, host/simu: add contacts
Diffstat (limited to 'digital')
-rw-r--r--digital/io-hub/src/robospierre/contact_defs.h18
-rw-r--r--digital/io-hub/src/robospierre/simu.host.c2
-rw-r--r--digital/io-hub/src/robospierre/simu.host.h2
-rw-r--r--digital/io-hub/tools/io_hub/mex.py2
4 files changed, 17 insertions, 7 deletions
diff --git a/digital/io-hub/src/robospierre/contact_defs.h b/digital/io-hub/src/robospierre/contact_defs.h
index 55b34354..1e04f6bf 100644
--- a/digital/io-hub/src/robospierre/contact_defs.h
+++ b/digital/io-hub/src/robospierre/contact_defs.h
@@ -27,11 +27,21 @@
#define CONTACT_COLOR A, 7
#define CONTACT_JACK F, 7
-#define CONTACT_EX1 E, 0
-#define CONTACT_EX2 E, 1
+#define CONTACT_FRONT_BOTTOM A, 4
+#define CONTACT_FRONT_MIDDLE F, 4
+#define CONTACT_BACK_BOTTOM A, 5
+#define CONTACT_BACK_MIDDLE F, 5
+#define CONTACT_FRONT_TOP A, 6
+#define CONTACT_BACK_TOP F, 6
+#define CONTACT_SIDE E, 7
#define CONTACT_LIST \
- CONTACT (CONTACT_EX1) \
- CONTACT (CONTACT_EX2)
+ CONTACT (CONTACT_FRONT_BOTTOM) \
+ CONTACT (CONTACT_FRONT_MIDDLE) \
+ CONTACT (CONTACT_FRONT_TOP) \
+ CONTACT (CONTACT_BACK_BOTTOM) \
+ CONTACT (CONTACT_BACK_MIDDLE) \
+ CONTACT (CONTACT_BACK_TOP) \
+ CONTACT (CONTACT_SIDE)
#endif /* contact_defs_h */
diff --git a/digital/io-hub/src/robospierre/simu.host.c b/digital/io-hub/src/robospierre/simu.host.c
index 8f4019aa..281a60d6 100644
--- a/digital/io-hub/src/robospierre/simu.host.c
+++ b/digital/io-hub/src/robospierre/simu.host.c
@@ -31,7 +31,7 @@
#include "io.h"
/** AVR registers. */
-uint8_t PINE;
+uint8_t PINA, PINE, PINF;
/** Initialise simulation. */
void
diff --git a/digital/io-hub/src/robospierre/simu.host.h b/digital/io-hub/src/robospierre/simu.host.h
index 4b461e86..ed6a002d 100644
--- a/digital/io-hub/src/robospierre/simu.host.h
+++ b/digital/io-hub/src/robospierre/simu.host.h
@@ -27,7 +27,7 @@
#ifdef HOST
-extern uint8_t PINE;
+extern uint8_t PINA, PINE, PINF;
#else /* !defined (HOST) */
diff --git a/digital/io-hub/tools/io_hub/mex.py b/digital/io-hub/tools/io_hub/mex.py
index 7c8c0012..d9568197 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 = 4
+CONTACT_NB = 9
CONTACT_INIT = 0xffffffff
class Mex: