use callout instead of scheduler

[protos/xbee-avr.git] / main.h

diff --git a/main.h b/main.h
index f77a535..30a9262 100644 (file)
--- a/main.h
+++ b/main.h
@@ -31,8 +31,6 @@
 #include <aversive/error.h>
 
 #include <uart.h>
-#include <scheduler.h>
-#include <clock_time.h>
 #include <parse.h>
 #include <rdline.h>
 #include <timer.h>
@@ -43,8 +41,6 @@
 #include "rc_proto.h"
 #include "spi_servo.h"
 
-extern volatile uint16_t global_ms;
-
 #define NB_LOGS 4
 
 /** ERROR NUMS */
@@ -76,6 +72,11 @@ 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;
+
        /* log */
        uint8_t logs[NB_LOGS+1];
        uint8_t log_level;
@@ -99,9 +100,7 @@ extern struct xbee_dev *xbee_dev;
 extern int xbee_raw;
 extern int xbee_hexdump;
 extern int xbee_debug;
-
-extern struct callout_mgr cm;
-
+extern volatile uint32_t global_ms;
 
 void bootloader(void);