X-Git-Url: http://git.droids-corp.org/?p=protos%2Fxbee-avr.git;a=blobdiff_plain;f=commands.c;h=ffcd918e1024a74750816eef4c02ea6b7fad0d50;hp=f5676bea87b64240f06934a68e2bdd28d34f1868;hb=a992a62a843658a6f6a38158c3e13ce3dae45568;hpb=9d53e5fccc7924c9ac24b8963376fb30c79b968e diff --git a/commands.c b/commands.c index f5676be..ffcd918 100644 --- a/commands.c +++ b/commands.c @@ -36,14 +36,15 @@ #include #include #include +#include -#include "callout.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" @@ -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_scheduler; +extern const parse_inst_t PROGMEM cmd_callout; static int monitor_period_ms = 1000; static int monitor_running = 0; @@ -73,7 +74,7 @@ static struct callout range_event; static int range_count = 100; static int range_cur_count = 0; -static void monitor_cb(struct callout_manager *cm, +static void monitor_cb(struct callout_mgr *cm, struct callout *clt, void *dummy) { (void)clt; @@ -84,12 +85,10 @@ static void monitor_cb(struct callout_manager *cm, xbeeapp_send_atcmd(monitor_current->atcmd, NULL, 0, 0, NULL, NULL); monitor_current = LIST_NEXT(monitor_current, next); - callout_reset(cm, &monitor_event, - monitor_period_ms / monitor_count, - SINGLE, monitor_cb, NULL); + callout_reschedule(cm, clt, monitor_period_ms / monitor_count); } -static void range_cb(struct callout_manager *cm, +static void range_cb(struct callout_mgr *cm, struct callout *clt, void *dummy) { (void)cm; @@ -121,12 +120,10 @@ static void range_cb(struct callout_manager *cm, if (range_cur_count == 0) { range_running = 0; - return; + callout_stop(cm, clt); } - callout_reset(cm, &range_event, - range_period_ms, - SINGLE, range_cb, NULL); + callout_reschedule(cm, clt, range_period_ms); #endif } @@ -536,9 +533,15 @@ struct cmd_sendmsg_result { static void cmd_sendmsg_parsed(void *parsed_result, void *data) { struct cmd_sendmsg_result *res = parsed_result; + struct xbee_msg msg; (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"; @@ -573,19 +576,24 @@ const parse_inst_t PROGMEM cmd_sendmsg = { struct cmd_send_hello_result { fixed_string_t send_hello; uint64_t addr; + struct xbee_neigh *neigh; uint16_t period; uint16_t count; fixed_string_t data; }; /* function called when cmd_send_hello is parsed successfully */ -static void cmd_send_hello_parsed(void *parsed_result, void *data) +static void cmd_send_hello_parsed(void *parsed_result, void *use_neigh) { struct cmd_send_hello_result *res = parsed_result; uint16_t now, next, diff; uint8_t flags; + uint64_t addr; - (void)data; + if (use_neigh) + addr = res->neigh->addr; + else + addr = res->addr; IRQ_LOCK(flags); now = global_ms; @@ -593,7 +601,7 @@ static void cmd_send_hello_parsed(void *parsed_result, void *data) next = now; - while (!cmdline_keypressed() || res->count == 0) { + while (!cmdline_keypressed() && res->count != 0) { IRQ_LOCK(flags); now = global_ms; IRQ_UNLOCK(flags); @@ -602,8 +610,9 @@ static void cmd_send_hello_parsed(void *parsed_result, void *data) if (diff < res->period) continue; - rc_proto_send_hello(res->addr, res->data, strlen(res->data)); + rc_proto_send_hello(addr, res->data, strlen(res->data)); next += res->period; + res->count--; } } @@ -642,6 +651,24 @@ const parse_inst_t PROGMEM cmd_send_hello = { }, }; +const parse_token_neighbor_t PROGMEM cmd_send_hello_neigh = + TOKEN_NEIGHBOR_INITIALIZER(struct cmd_send_hello_result, neigh, + &xbee_dev); + +const parse_inst_t PROGMEM cmd_send_hello_name = { + .f = cmd_send_hello_parsed, /* function to call */ + .data = (void *)1, /* 2nd arg of func */ + .help_str = help_send_hello, + .tokens = { /* token list, NULL terminated */ + (PGM_P)&cmd_send_hello_send_hello, + (PGM_P)&cmd_send_hello_neigh, + (PGM_P)&cmd_send_hello_period, + (PGM_P)&cmd_send_hello_count, + (PGM_P)&cmd_send_hello_data, + NULL, + }, +}; + /* ************* */ /* this structure is filled when cmd_sendmsg_name is parsed successfully */ @@ -655,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; + struct xbee_msg msg; (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 = @@ -720,9 +753,9 @@ static void cmd_range_parsed(void *parsed_result, void *data) return; } range_cur_count = range_count; - callout_init(&range_event); - callout_reset(&cm, &range_event, 0, - SINGLE, range_cb, NULL); + callout_init(&range_event, range_cb, NULL, 0); + callout_schedule(&xbeeboard.mainloop_cm, + &range_event, 0); /* immediate */ range_running = 1; } else if (!strcmp(res->action, "end")) { @@ -731,7 +764,7 @@ static void cmd_range_parsed(void *parsed_result, void *data) return; } range_running = 0; - callout_stop(&cm, &range_event); + callout_stop(&xbeeboard.mainloop_cm, &range_event); } } @@ -970,8 +1003,9 @@ static void cmd_monitor_parsed(void *parsed_result, void *data) printf_P(PSTR("no regs to be monitored\r\n")); return; } - callout_init(&monitor_event); - callout_reset(&cm, &monitor_event, 0, SINGLE, monitor_cb, NULL); + callout_init(&monitor_event, monitor_cb, NULL, 0); + 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"), @@ -985,7 +1019,7 @@ static void cmd_monitor_parsed(void *parsed_result, void *data) return; } monitor_running = 0; - callout_stop(&cm, &monitor_event); + callout_stop(&xbeeboard.mainloop_cm, &monitor_event); } } @@ -1148,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")); - callout_stop(&cm, &monitor_event); + callout_stop(&xbeeboard.mainloop_cm, &monitor_event); monitor_running = 0; return; } @@ -1226,6 +1260,11 @@ static void cmd_raw_parsed(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; @@ -1873,7 +1912,7 @@ const parse_ctx_t PROGMEM main_ctx[] = { &cmd_log_show, &cmd_log_type, &cmd_stack_space, - &cmd_scheduler, + &cmd_callout, &cmd_help, &cmd_neigh_del, &cmd_neigh_add, @@ -1885,6 +1924,7 @@ const parse_ctx_t PROGMEM main_ctx[] = { &cmd_write_u32, &cmd_sendmsg, &cmd_send_hello, + &cmd_send_hello_name, &cmd_sendmsg_name, &cmd_range, &cmd_range_period,