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
update notes
[protos/xbee-avr.git]
/
main.h
diff --git
a/main.h
b/main.h
index
001ecc0
..
0f87a4f
100644
(file)
--- a/
main.h
+++ b/
main.h
@@
-45,6
+45,8
@@
/** ERROR NUMS */
#define E_USER_DEFAULT 194
/** ERROR NUMS */
#define E_USER_DEFAULT 194
+#define E_USER_XBEE 195
+#define E_USER_RC_PROTO 196
#define LED1_ON() sbi(PORTA, 2)
#define LED1_OFF() cbi(PORTA, 2)
#define LED1_ON() sbi(PORTA, 2)
#define LED1_OFF() cbi(PORTA, 2)
@@
-59,10
+61,12
@@
#define BUZZER_OFF() cbi(PORTA, 4)
/* highest priority */
#define BUZZER_OFF() cbi(PORTA, 4)
/* highest priority */
-#define LED_PRIO 1
7
0
-#define TIME_PRIO 1
6
0
-#define BEEP_PRIO 1
3
0
+#define LED_PRIO 1
6
0
+#define TIME_PRIO 1
4
0
+#define BEEP_PRIO 1
2
0
#define SPI_PRIO 100 /* users of spi_servo must have lower prio */
#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
/* lowest priority */
#define MAX_POWER_LEVEL 5
@@
-72,10
+76,7
@@
struct xbeeboard {
struct rdline rdl;
char prompt[RDLINE_PROMPT_SIZE];
struct rdline rdl;
char prompt[RDLINE_PROMPT_SIZE];
- struct callout_mgr mainloop_cm;
struct callout_mgr intr_cm;
struct callout_mgr intr_cm;
- struct callout spi_timer;
- struct callout beep_timer;
/* log */
uint8_t logs[NB_LOGS+1];
/* log */
uint8_t logs[NB_LOGS+1];
@@
-87,4
+88,4
@@
extern struct xbeeboard xbeeboard;
extern volatile uint32_t global_ms;
void bootloader(void);
extern volatile uint32_t global_ms;
void bootloader(void);
-
+uint16_t get_time_ms(void);