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

diff --git a/main.h b/main.h
index 001ecc0..ba0836e 100644
--- a/main.h
+++ b/main.h
@@ -45,6 +45,7 @@
 
 /** ERROR NUMS */
 #define E_USER_DEFAULT           194
+#define E_USER_XBEE              195
 
 #define LED1_ON()       sbi(PORTA, 2)
 #define LED1_OFF()      cbi(PORTA, 2)
@@ -59,10 +60,12 @@
 #define BUZZER_OFF()      cbi(PORTA, 4)
 
 /* highest priority */
-#define LED_PRIO           170
-#define TIME_PRIO          160
-#define BEEP_PRIO          130
+#define LED_PRIO           160
+#define TIME_PRIO          140
+#define BEEP_PRIO          120
 #define SPI_PRIO           100 /* users of spi_servo must have lower prio */
+#define XBEE_PRIO           80
+#define LOW_PRIO            60
 /* lowest priority */
 
 #define MAX_POWER_LEVEL 5
@@ -72,10 +75,10 @@ struct xbeeboard {
 	struct rdline rdl;
 	char prompt[RDLINE_PROMPT_SIZE];
 
-	struct callout_mgr mainloop_cm;
 	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];
@@ -87,4 +90,3 @@ extern struct xbeeboard xbeeboard;
 extern volatile uint32_t global_ms;
 
 void bootloader(void);
-