X-Git-Url: http://git.droids-corp.org/?p=aversive.git;a=blobdiff_plain;f=projects%2Fmicrob2010%2Fballboard%2Fmain.h;h=68ecf97808c68b2fb787879262959903bc7ad341;hp=3ebb1e70bf19a51c8212fe761abefc6b35a45297;hb=063af91cd38fceba6cbcf3a9b8abd4c48684d990;hpb=c8bae2eb9f3084d53436bc6c9fee9952dfcc1fda

diff --git a/projects/microb2010/ballboard/main.h b/projects/microb2010/ballboard/main.h
index 3ebb1e7..68ecf97 100755
--- a/projects/microb2010/ballboard/main.h
+++ b/projects/microb2010/ballboard/main.h
@@ -19,6 +19,8 @@
  *
  */
 
+/* was mainboard in 2009 */
+
 #define LED_TOGGLE(port, bit) do {		\
 		if (port & _BV(bit))		\
 			port &= ~_BV(bit);	\
@@ -30,13 +32,13 @@
 #define LED1_OFF() 	cbi(PORTJ, 2)
 #define LED1_TOGGLE() 	LED_TOGGLE(PORTJ, 2)
 
-#define LED2_ON() 	sbi(PORTL, 7)
-#define LED2_OFF() 	cbi(PORTL, 7)
-#define LED2_TOGGLE() 	LED_TOGGLE(PORTL, 7)
+#define LED2_ON() 	sbi(PORTJ, 3)
+#define LED2_OFF() 	cbi(PORTJ, 3)
+#define LED2_TOGGLE() 	LED_TOGGLE(PORTJ, 3)
 
-#define LED3_ON() 	sbi(PORTJ, 3)
-#define LED3_OFF() 	cbi(PORTJ, 3)
-#define LED3_TOGGLE() 	LED_TOGGLE(PORTJ, 3)
+#define LED3_ON() 	sbi(PORTL, 7)
+#define LED3_OFF() 	cbi(PORTL, 7)
+#define LED3_TOGGLE() 	LED_TOGGLE(PORTL, 7)
 
 #define LED4_ON() 	sbi(PORTL, 6)
 #define LED4_OFF() 	cbi(PORTL, 6)
@@ -60,9 +62,7 @@
 /** ERROR NUMS */
 #define E_USER_I2C_PROTO       195
 #define E_USER_SENSOR          196
-#define E_USER_BEACON          197
-#define E_USER_SCANNER         198
-#define E_USER_IMGPROCESS      199
+#define E_USER_ST_MACH         197
 
 #define LED_PRIO           170
 #define TIME_PRIO          160
@@ -115,6 +115,7 @@ struct ballboard {
 #define DO_CS        2
 #define DO_BD        4
 #define DO_POWER     8
+#define DO_ERRBLOCKING 16
 	uint8_t flags;                /* misc flags */
 
 	/* control systems */
@@ -132,7 +133,7 @@ extern struct ballboard ballboard;
 /* start the bootloader */
 void bootloader(void);
 
-#define wait_cond_or_timeout(cond, timeout)                   \
+#define WAIT_COND_OR_TIMEOUT(cond, timeout)                   \
 ({                                                            \
         microseconds __us = time_get_us2();                   \
         uint8_t __ret = 1;                                    \