From c8d4bd0e0f79dc8e49ad0074a1e67317e903c41f Mon Sep 17 00:00:00 2001 From: Nicolas Schodet Date: Sat, 14 May 2011 01:28:54 +0200 Subject: digital/io-hub, host/simu: add contacts --- digital/io-hub/src/robospierre/contact_defs.h | 18 ++++++++++++++---- digital/io-hub/src/robospierre/simu.host.c | 2 +- digital/io-hub/src/robospierre/simu.host.h | 2 +- 3 files changed, 16 insertions(+), 6 deletions(-) (limited to 'digital/io-hub/src') 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) */ -- cgit v1.2.3