git.droids-corp.org
/
protos
/
xbee-avr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix log types in command line
[protos/xbee-avr.git]
/
main.c
diff --git
a/main.c
b/main.c
index
326ce64
..
a0839d2
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-89,9
+89,14
@@
void bootloader(void)
}
/* return time in milliseconds on unsigned 16 bits */
}
/* return time in milliseconds on unsigned 16 bits */
-
static
uint16_t get_time_ms(void)
+uint16_t get_time_ms(void)
{
{
- return (uint16_t)global_ms;
+ uint16_t ms;
+ uint8_t flags;
+ IRQ_LOCK(flags);
+ ms = global_ms;
+ IRQ_UNLOCK(flags);
+ return ms;
}
static void main_timer_interrupt(void)
}
static void main_timer_interrupt(void)
@@
-152,7
+157,6
@@
int main(void)
timer0_register_OV_intr(main_timer_interrupt);
callout_mgr_init(&xbeeboard.intr_cm, get_time_ms);
timer0_register_OV_intr(main_timer_interrupt);
callout_mgr_init(&xbeeboard.intr_cm, get_time_ms);
- callout_mgr_init(&xbeeboard.mainloop_cm, get_time_ms);
cmdline_init();
spi_servo_init();
cmdline_init();
spi_servo_init();
@@
-178,6
+182,8
@@
int main(void)
xbeeapp_init();
xbeeapp_init();
+ rc_proto_init();
+
sei();
eeprom_load_config();
sei();
eeprom_load_config();