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:
8a557d1
)
command: replace printf printf_P
author
Fabrice Desclaux
<serpilliere@droids-corp.org>
Tue, 21 Feb 2012 18:20:16 +0000
(19:20 +0100)
committer
Fabrice Desclaux
<serpilliere@droids-corp.org>
Tue, 21 Feb 2012 18:20:16 +0000
(19:20 +0100)
commands.c
patch
|
blob
|
history
diff --git
a/commands.c
b/commands.c
index
1cacfed
..
986ca92
100644
(file)
--- a/
commands.c
+++ b/
commands.c
@@
-396,7
+396,7
@@
static void cmd_write_parsed(void *parsed_result, void *data)
param = &res->u32;
}
else {
param = &res->u32;
}
else {
- printf
("Unknown argument type\n"
);
+ printf
_P(PSTR("Unknown argument type\r\n")
);
return;
}
memcpy_P(&cmd, copy.name, 2);
return;
}
memcpy_P(&cmd, copy.name, 2);
@@
-612,7
+612,7
@@
static void cmd_range_parsed(void *parsed_result, void *data)
}
else if (!strcmp(res->action, "start")) {
if (range_running) {
}
else if (!strcmp(res->action, "start")) {
if (range_running) {
- printf
("already running\n"
);
+ printf
_P(PSTR("already running\r\n")
);
return;
}
range_cur_count = range_count;
return;
}
range_cur_count = range_count;
@@
-623,7
+623,7
@@
static void cmd_range_parsed(void *parsed_result, void *data)
}
else if (!strcmp(res->action, "end")) {
if (range_running == 0) {
}
else if (!strcmp(res->action, "end")) {
if (range_running == 0) {
- printf
("not running\n"
);
+ printf
_P(PSTR("not running\r\n")
);
return;
}
range_running = 0;
return;
}
range_running = 0;
@@
-669,7
+669,7
@@
static void cmd_range_period_parsed(void *parsed_result, void *data)
struct cmd_range_period_result *res = parsed_result;
if (res->period < 10) {
struct cmd_range_period_result *res = parsed_result;
if (res->period < 10) {
- printf
("error, minimum period is 10 ms\n"
);
+ printf
_P(PSTR("error, minimum period is 10 ms\r\n")
);
return;
}
return;
}
@@
-847,15
+847,15
@@
static void cmd_monitor_parsed(void *parsed_result, void *data)
printf_P(PSTR("monitor period is %d ms, %d regs in list\r\n"),
monitor_period_ms, monitor_count);
LIST_FOREACH(m, &xbee_monitor_list, next)
printf_P(PSTR("monitor period is %d ms, %d regs in list\r\n"),
monitor_period_ms, monitor_count);
LIST_FOREACH(m, &xbee_monitor_list, next)
- printf_P(PSTR(" %S\n"), m->desc);
+ printf_P(PSTR(" %S\
r\
n"), m->desc);
}
else if (!strcmp_P(res->action, PSTR("start"))) {
if (monitor_running) {
}
else if (!strcmp_P(res->action, PSTR("start"))) {
if (monitor_running) {
- printf
("already running\n"
);
+ printf
_P(PSTR("already running\r\n")
);
return;
}
if (monitor_count == 0) {
return;
}
if (monitor_count == 0) {
- printf
("no regs to be monitored\n"
);
+ printf
_P(PSTR("no regs to be monitored\r\n")
);
return;
}
callout_init(&monitor_event);
return;
}
callout_init(&monitor_event);
@@
-869,7
+869,7
@@
static void cmd_monitor_parsed(void *parsed_result, void *data)
}
else if (!strcmp_P(res->action, PSTR("end"))) {
if (monitor_running == 0) {
}
else if (!strcmp_P(res->action, PSTR("end"))) {
if (monitor_running == 0) {
- printf
("not running\n"
);
+ printf
_P(PSTR("not running\r\n")
);
return;
}
monitor_running = 0;
return;
}
monitor_running = 0;
@@
-923,13
+923,13
@@
static void cmd_monitor_add_parsed(void *parsed_result, void *data)
}
if (m != NULL) {
}
if (m != NULL) {
- printf
("already exist\n"
);
+ printf
_P(PSTR("already exist\r\n")
);
return;
}
m = malloc(sizeof(*m));
if (m == NULL) {
return;
}
m = malloc(sizeof(*m));
if (m == NULL) {
- printf
("no mem\n"
);
+ printf
_P(PSTR("no mem\r\n")
);
return;
}
m->desc = copy.desc;
return;
}
m->desc = copy.desc;
@@
-980,7
+980,7
@@
static void cmd_monitor_period_parsed(void *parsed_result, void *data)
struct cmd_monitor_period_result *res = parsed_result;
if (res->period < 100) {
struct cmd_monitor_period_result *res = parsed_result;
if (res->period < 100) {
- printf
("error, minimum period is 100 ms\n"
);
+ printf
_P(PSTR("error, minimum period is 100 ms\r\n")
);
return;
}
return;
}
@@
-1032,7
+1032,7
@@
static void cmd_monitor_del_parsed(void *parsed_result, void *data)
free(res->m);
monitor_count --;
if (monitor_count == 0) {
free(res->m);
monitor_count --;
if (monitor_count == 0) {
- printf
("Disable monitoring, no more event\n"
);
+ printf
_P(PSTR("Disable monitoring, no more event\r\n")
);
callout_stop(&cm, &monitor_event);
monitor_running = 0;
return;
callout_stop(&cm, &monitor_event);
monitor_running = 0;
return;
@@
-1107,7
+1107,7
@@
struct cmd_raw_result {
/* function called when cmd_raw is parsed successfully */
static void cmd_raw_parsed(void *parsed_result, void *data)
{
/* function called when cmd_raw is parsed successfully */
static void cmd_raw_parsed(void *parsed_result, void *data)
{
- printf
("switched to raw mode, CTRL-D to exit\n"
);
+ printf
_P(PSTR("switched to raw mode, CTRL-D to exit\r\n")
);
rdline_stop(&xbeeboard.rdl); /* don't display prompt when return */
xbee_raw = 1;
}
rdline_stop(&xbeeboard.rdl); /* don't display prompt when return */
xbee_raw = 1;
}