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
avoid copy by using iovecs
[protos/xbee-avr.git]
/
commands.c
diff --git
a/commands.c
b/commands.c
index
df76f47
..
ffcd918
100644
(file)
--- a/
commands.c
+++ b/
commands.c
@@
-36,14
+36,15
@@
#include <parse_num.h>
#include <uart.h>
#include <xbee.h>
#include <parse_num.h>
#include <uart.h>
#include <xbee.h>
+#include <callout.h>
-#include "callout.h"
#include "parse_atcmd.h"
#include "parse_neighbor.h"
#include "parse_monitor.h"
#include "spi_servo.h"
#include "rc_proto.h"
#include "parse_atcmd.h"
#include "parse_neighbor.h"
#include "parse_monitor.h"
#include "spi_servo.h"
#include "rc_proto.h"
+#include "xbee_user.h"
#include "main.h"
#include "cmdline.h"
#include "beep.h"
#include "main.h"
#include "cmdline.h"
#include "beep.h"
@@
-56,7
+57,7
@@
extern const parse_inst_t PROGMEM cmd_log;
extern const parse_inst_t PROGMEM cmd_log_show;
extern const parse_inst_t PROGMEM cmd_log_type;
extern const parse_inst_t PROGMEM cmd_stack_space;
extern const parse_inst_t PROGMEM cmd_log_show;
extern const parse_inst_t PROGMEM cmd_log_type;
extern const parse_inst_t PROGMEM cmd_stack_space;
-extern const parse_inst_t PROGMEM cmd_
scheduler
;
+extern const parse_inst_t PROGMEM cmd_
callout
;
static int monitor_period_ms = 1000;
static int monitor_running = 0;
static int monitor_period_ms = 1000;
static int monitor_running = 0;
@@
-119,7
+120,7
@@
static void range_cb(struct callout_mgr *cm,
if (range_cur_count == 0) {
range_running = 0;
if (range_cur_count == 0) {
range_running = 0;
-
return
;
+
callout_stop(cm, clt)
;
}
callout_reschedule(cm, clt, range_period_ms);
}
callout_reschedule(cm, clt, range_period_ms);
@@
-532,9
+533,15
@@
struct cmd_sendmsg_result {
static void cmd_sendmsg_parsed(void *parsed_result, void *data)
{
struct cmd_sendmsg_result *res = parsed_result;
static void cmd_sendmsg_parsed(void *parsed_result, void *data)
{
struct cmd_sendmsg_result *res = parsed_result;
+ struct xbee_msg msg;
(void)data;
(void)data;
- xbeeapp_send_msg(res->addr, res->data, strlen(res->data), 1);
+
+ msg.iovlen = 1;
+ msg.iov[0].buf = res->data;
+ msg.iov[0].len = strlen(res->data);
+
+ xbeeapp_send_msg(res->addr, &msg, 1);
}
const char PROGMEM str_sendmsg[] = "sendmsg";
}
const char PROGMEM str_sendmsg[] = "sendmsg";
@@
-675,9
+682,15
@@
struct cmd_sendmsg_name_result {
static void cmd_sendmsg_name_parsed(void *parsed_result, void *data)
{
struct cmd_sendmsg_name_result *res = parsed_result;
static void cmd_sendmsg_name_parsed(void *parsed_result, void *data)
{
struct cmd_sendmsg_name_result *res = parsed_result;
+ struct xbee_msg msg;
(void)data;
(void)data;
- xbeeapp_send_msg(res->neigh->addr, res->data, strlen(res->data), 1);
+
+ msg.iovlen = 1;
+ msg.iov[0].buf = res->data;
+ msg.iov[0].len = strlen(res->data);
+
+ xbeeapp_send_msg(res->neigh->addr, &msg, 1);
}
const parse_token_string_t PROGMEM cmd_sendmsg_name_sendmsg_name =
}
const parse_token_string_t PROGMEM cmd_sendmsg_name_sendmsg_name =
@@
-741,7
+754,8
@@
static void cmd_range_parsed(void *parsed_result, void *data)
}
range_cur_count = range_count;
callout_init(&range_event, range_cb, NULL, 0);
}
range_cur_count = range_count;
callout_init(&range_event, range_cb, NULL, 0);
- callout_schedule(&cm, &range_event, 0); /* immediate */
+ callout_schedule(&xbeeboard.mainloop_cm,
+ &range_event, 0); /* immediate */
range_running = 1;
}
else if (!strcmp(res->action, "end")) {
range_running = 1;
}
else if (!strcmp(res->action, "end")) {
@@
-750,7
+764,7
@@
static void cmd_range_parsed(void *parsed_result, void *data)
return;
}
range_running = 0;
return;
}
range_running = 0;
- callout_stop(&cm, &range_event);
+ callout_stop(&
xbeeboard.mainloop_
cm, &range_event);
}
}
}
}
@@
-990,7
+1004,8
@@
static void cmd_monitor_parsed(void *parsed_result, void *data)
return;
}
callout_init(&monitor_event, monitor_cb, NULL, 0);
return;
}
callout_init(&monitor_event, monitor_cb, NULL, 0);
- callout_schedule(&cm, &monitor_event, 0); /* immediate */
+ callout_schedule(&xbeeboard.mainloop_cm,
+ &monitor_event, 0); /* immediate */
monitor_running = 1;
monitor_current = LIST_FIRST(&xbee_monitor_list);
printf_P(PSTR("monitor cb: %S %s\r\n"),
monitor_running = 1;
monitor_current = LIST_FIRST(&xbee_monitor_list);
printf_P(PSTR("monitor cb: %S %s\r\n"),
@@
-1004,7
+1019,7
@@
static void cmd_monitor_parsed(void *parsed_result, void *data)
return;
}
monitor_running = 0;
return;
}
monitor_running = 0;
- callout_stop(&cm, &monitor_event);
+ callout_stop(&
xbeeboard.mainloop_
cm, &monitor_event);
}
}
}
}
@@
-1167,7
+1182,7
@@
static void cmd_monitor_del_parsed(void *parsed_result, void *data)
monitor_count --;
if (monitor_count == 0) {
printf_P(PSTR("Disable monitoring, no more event\r\n"));
monitor_count --;
if (monitor_count == 0) {
printf_P(PSTR("Disable monitoring, no more event\r\n"));
- callout_stop(&cm, &monitor_event);
+ callout_stop(&
xbeeboard.mainloop_
cm, &monitor_event);
monitor_running = 0;
return;
}
monitor_running = 0;
return;
}
@@
-1245,6
+1260,11
@@
static void cmd_raw_parsed(void *parsed_result, void *data)
{
(void)parsed_result;
(void)data;
{
(void)parsed_result;
(void)data;
+
+ if (range_running || monitor_running) {
+ printf_P(PSTR("stop running range or monitor first\r\n"));
+ return;
+ }
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;
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;
@@
-1892,7
+1912,7
@@
const parse_ctx_t PROGMEM main_ctx[] = {
&cmd_log_show,
&cmd_log_type,
&cmd_stack_space,
&cmd_log_show,
&cmd_log_type,
&cmd_stack_space,
- &cmd_
scheduler
,
+ &cmd_
callout
,
&cmd_help,
&cmd_neigh_del,
&cmd_neigh_add,
&cmd_help,
&cmd_neigh_del,
&cmd_neigh_add,