git.droids-corp.org
/
aversive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
reliability
[aversive.git]
/
projects
/
microb2010
/
ballboard
/
commands_gen.c
diff --git
a/projects/microb2010/ballboard/commands_gen.c
b/projects/microb2010/ballboard/commands_gen.c
index
b2a1e5d
..
b314938
100644
(file)
--- a/
projects/microb2010/ballboard/commands_gen.c
+++ b/
projects/microb2010/ballboard/commands_gen.c
@@
-357,9
+357,8
@@
static const prog_char i2c_log[] = "i2c";
static const prog_char i2cproto_log[] = "i2cproto";
static const prog_char sensor_log[] = "sensor";
static const prog_char block_log[] = "bd";
static const prog_char i2cproto_log[] = "i2cproto";
static const prog_char sensor_log[] = "sensor";
static const prog_char block_log[] = "bd";
+static const prog_char state_log[] = "state";
static const prog_char beacon_log[] = "beacon";
static const prog_char beacon_log[] = "beacon";
-static const prog_char scanner_log[] = "scanner";
-static const prog_char imgprocess_log[] = "imgprocess";
struct log_name_and_num {
const prog_char * name;
struct log_name_and_num {
const prog_char * name;
@@
-372,9
+371,8
@@
static const struct log_name_and_num log_name_and_num[] = {
{ i2cproto_log, E_USER_I2C_PROTO },
{ sensor_log, E_USER_SENSOR },
{ block_log, E_BLOCKING_DETECTION_MANAGER },
{ i2cproto_log, E_USER_I2C_PROTO },
{ sensor_log, E_USER_SENSOR },
{ block_log, E_BLOCKING_DETECTION_MANAGER },
+ { state_log, E_USER_ST_MACH },
{ beacon_log, E_USER_BEACON },
{ beacon_log, E_USER_BEACON },
- { scanner_log, E_USER_SCANNER },
- { imgprocess_log, E_USER_IMGPROCESS },
};
static uint8_t
};
static uint8_t
@@
-523,7
+521,7
@@
static void cmd_log_type_parsed(void * parsed_result, void * data)
prog_char str_log_arg1_type[] = "type";
parse_pgm_token_string_t cmd_log_arg1_type = TOKEN_STRING_INITIALIZER(struct cmd_log_type_result, arg1, str_log_arg1_type);
/* keep it sync with log_name_and_num above */
prog_char str_log_arg1_type[] = "type";
parse_pgm_token_string_t cmd_log_arg1_type = TOKEN_STRING_INITIALIZER(struct cmd_log_type_result, arg1, str_log_arg1_type);
/* keep it sync with log_name_and_num above */
-prog_char str_log_arg2_type[] = "uart#i2c#i2cproto#sensor#bd#
beacon#scanner#imgprocess
";
+prog_char str_log_arg2_type[] = "uart#i2c#i2cproto#sensor#bd#
state#beacon
";
parse_pgm_token_string_t cmd_log_arg2_type = TOKEN_STRING_INITIALIZER(struct cmd_log_type_result, arg2, str_log_arg2_type);
prog_char str_log_arg3[] = "on#off";
parse_pgm_token_string_t cmd_log_arg3 = TOKEN_STRING_INITIALIZER(struct cmd_log_type_result, arg3, str_log_arg3);
parse_pgm_token_string_t cmd_log_arg2_type = TOKEN_STRING_INITIALIZER(struct cmd_log_type_result, arg2, str_log_arg2_type);
prog_char str_log_arg3[] = "on#off";
parse_pgm_token_string_t cmd_log_arg3 = TOKEN_STRING_INITIALIZER(struct cmd_log_type_result, arg3, str_log_arg3);