X-Git-Url: http://git.droids-corp.org/?p=aversive.git;a=blobdiff_plain;f=projects%2Fmicrob2010%2Fmainboard%2Fmain.h;h=1c41d8933c9ce5c5b71f97827c69abfc83644e88;hp=48655eb0024f9263e9caa0741c9ac10cb270682c;hb=51418f44261edc59d818ca990456726027e366ad;hpb=fa8546ea39c7442ad3bf5a822a72a2b50a41045d

diff --git a/projects/microb2010/mainboard/main.h b/projects/microb2010/mainboard/main.h
index 48655eb..1c41d89 100755
--- a/projects/microb2010/mainboard/main.h
+++ b/projects/microb2010/mainboard/main.h
@@ -19,6 +19,8 @@
  *
  */
 
+/* was sensorboard in 2009 */
+
 #define LED_TOGGLE(port, bit) do {		\
 		if (port & _BV(bit))		\
 			port &= ~_BV(bit);	\
@@ -53,13 +55,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)
@@ -117,9 +119,10 @@
 #define CS_PRIO            100
 #define STRAT_PRIO          30
 #define I2C_POLL_PRIO       20
+#define BEACON_PRIO         15
 #define EEPROM_TIME_PRIO    10
 
-#define CS_PERIOD 5000L /* in microsecond */ 
+#define CS_PERIOD 5000L /* in microsecond */
 #define CS_HZ (1000000. / CS_PERIOD)
 
 #define NB_LOGS 4
@@ -168,6 +171,7 @@ struct mainboard {
 #define DO_BD       16
 #define DO_TIMER    32
 #define DO_POWER    64
+#define DO_ERRBLOCKING 128
 	uint8_t flags;                /* misc flags */
 
 	/* control systems */
@@ -193,6 +197,8 @@ struct mainboard {
 struct cobboard {
 	uint8_t mode;
 	uint8_t status;
+	uint8_t lspickle;
+	uint8_t rspickle;
 	int16_t left_cobroller_speed;
 	int16_t right_cobroller_speed;
 	uint8_t cob_count;
@@ -200,15 +206,28 @@ struct cobboard {
 
 /* state of ballboard, synchronized through i2c */
 struct ballboard {
-	uint8_t mode;
+	volatile uint8_t mode;
 	uint8_t status;
 	uint8_t ball_count;
+	uint8_t lcob;
+	uint8_t rcob;
+};
+
+/* state of beaconboard, sync'd through uart */
+struct beaconboard {
+	int16_t oppx;
+	int16_t oppy;
+	int16_t oppa;
+	int16_t oppd;
+	uint16_t posx;
+	uint16_t posy;
 };
 
 extern struct genboard gen;
 extern struct mainboard mainboard;
-extern struct cobboard cobboard;
-extern struct ballboard ballboard;
+extern volatile struct cobboard cobboard;
+extern volatile struct ballboard ballboard;
+extern volatile struct beaconboard beaconboard;
 
 /* start the bootloader */
 void bootloader(void);