X-Git-Url: http://git.droids-corp.org/?p=protos%2Fxbee-avr.git;a=blobdiff_plain;f=commands.c;h=ffcd918e1024a74750816eef4c02ea6b7fad0d50;hp=2e025519f5e285655bd32115e4105e1e35befd8b;hb=a992a62a843658a6f6a38158c3e13ce3dae45568;hpb=013bac441997a3a008507835aa4c745458422786

diff --git a/commands.c b/commands.c
index 2e02551..ffcd918 100644
--- a/commands.c
+++ b/commands.c
@@ -36,14 +36,15 @@
 #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 "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";
@@ -679,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 =
@@ -744,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")) {
@@ -755,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);
 	}
 }
 
@@ -994,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"),
@@ -1009,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);
 	}
 }
 
@@ -1172,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;
 	}
@@ -1250,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;
@@ -1897,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,