X-Git-Url: http://git.droids-corp.org/?p=protos%2Fxbee-avr.git;a=blobdiff_plain;f=main.h;h=7ee9ed7df139aa48df5d6e7beb42810ba9cb4bbb;hp=ba0836e13998da3cc695e62444f9575a835744df;hb=HEAD;hpb=852fd37145aaaee0ce2117f5c8173f5b86020fd0

diff --git a/main.h b/main.h
index ba0836e..7ee9ed7 100644
--- a/main.h
+++ b/main.h
@@ -46,6 +46,8 @@
 /** ERROR NUMS */
 #define E_USER_DEFAULT           194
 #define E_USER_XBEE              195
+#define E_USER_RC_PROTO          196
+#define E_USER_I2C_PROTO         197
 
 #define LED1_ON()       sbi(PORTA, 2)
 #define LED1_OFF()      cbi(PORTA, 2)
@@ -65,6 +67,7 @@
 #define BEEP_PRIO          120
 #define SPI_PRIO           100 /* users of spi_servo must have lower prio */
 #define XBEE_PRIO           80
+#define I2C_PRIO            70
 #define LOW_PRIO            60
 /* lowest priority */
 
@@ -76,9 +79,6 @@ struct xbeeboard {
 	char prompt[RDLINE_PROMPT_SIZE];
 
 	struct callout_mgr intr_cm;
-	struct callout spi_timer;
-	struct callout beep_timer;
-	struct callout xbee_rx_poll_timer;
 
 	/* log */
 	uint8_t logs[NB_LOGS+1];
@@ -90,3 +90,4 @@ extern struct xbeeboard xbeeboard;
 extern volatile uint32_t global_ms;
 
 void bootloader(void);
+uint16_t get_time_ms(void);