git.droids-corp.org
/
protos
/
xbee-avr.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6c945ea
)
add rc_proto log type
author
Olivier Matz
<zer0@droids-corp.org>
Thu, 3 Apr 2014 18:49:23 +0000
(20:49 +0200)
committer
Olivier Matz
<zer0@droids-corp.org>
Thu, 3 Apr 2014 18:49:23 +0000
(20:49 +0200)
commands_gen.c
patch
|
blob
|
history
main.h
patch
|
blob
|
history
diff --git
a/commands_gen.c
b/commands_gen.c
index
752b998
..
461a807
100644
(file)
--- a/
commands_gen.c
+++ b/
commands_gen.c
@@
-158,6
+158,7
@@
static const char PROGMEM uart_log[] = "uart";
static const char PROGMEM i2c_log[] = "i2c";
static const char PROGMEM default_log[] = "default";
static const char PROGMEM xbee_log[] = "xbee";
static const char PROGMEM i2c_log[] = "i2c";
static const char PROGMEM default_log[] = "default";
static const char PROGMEM xbee_log[] = "xbee";
+static const char PROGMEM rc_proto_log[] = "rc_proto";
struct log_name_and_num {
const char *name;
struct log_name_and_num {
const char *name;
@@
-169,6
+170,7
@@
static const struct log_name_and_num log_name_and_num[] = {
{ i2c_log, E_I2C },
{ default_log, E_USER_DEFAULT },
{ xbee_log, E_USER_XBEE },
{ i2c_log, E_I2C },
{ default_log, E_USER_DEFAULT },
{ xbee_log, E_USER_XBEE },
+ { rc_proto_log, E_USER_RC_PROTO },
};
static uint8_t
};
static uint8_t
diff --git
a/main.h
b/main.h
index
d64039b
..
d83c5fa
100644
(file)
--- a/
main.h
+++ b/
main.h
@@
-46,6
+46,7
@@
/** ERROR NUMS */
#define E_USER_DEFAULT 194
#define E_USER_XBEE 195
/** 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)