use callout from aversive

[protos/xbee-avr.git] / commands.c

diff --git a/commands.c b/commands.c
index f5676be..df76f47 100644 (file)
--- a/commands.c
+++ b/commands.c
@@ -73,7 +73,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 +84,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;
@@ -124,9 +122,7 @@ static void range_cb(struct callout_manager *cm,
                return;
        }
 
-       callout_reset(cm, &range_event,
-                     range_period_ms,
-                     SINGLE, range_cb, NULL);
+       callout_reschedule(cm, clt, range_period_ms);
 #endif
 }
 
@@ -573,19 +569,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 +594,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 +603,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 +644,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 */
@@ -720,9 +740,8 @@ 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(&cm, &range_event, 0); /* immediate */
                range_running = 1;
        }
        else if (!strcmp(res->action, "end")) {
@@ -970,8 +989,8 @@ 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(&cm, &monitor_event, 0); /* immediate */
                monitor_running = 1;
                monitor_current = LIST_FIRST(&xbee_monitor_list);
                printf_P(PSTR("monitor cb: %S %s\r\n"),
@@ -1885,6 +1904,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,