X-Git-Url: http://git.droids-corp.org/?p=protos%2Fxbee-avr.git;a=blobdiff_plain;f=commands.c;h=f5676bea87b64240f06934a68e2bdd28d34f1868;hp=eff413db23e75f155eafadd024de5730259626c2;hb=2a15e9a535a36376bd04731ffeca716ad5384476;hpb=21d10011bc4b009d7a09131b955953fa7aba3815

diff --git a/commands.c b/commands.c
index eff413d..f5676be 100644
--- a/commands.c
+++ b/commands.c
@@ -35,12 +35,7 @@
 #include <parse_string.h>
 #include <parse_num.h>
 #include <uart.h>
-
-#include "xbee_atcmd.h"
-#include "xbee_neighbor.h"
-#include "xbee_stats.h"
-#include "xbee_proto.h"
-#include "xbee.h"
+#include <xbee.h>
 
 #include "callout.h"
 #include "parse_atcmd.h"
@@ -71,7 +66,7 @@ struct monitor_reg *monitor_current;
 
 static int range_period_ms = 1000;
 static int range_powermask = 0x1F;
-static uint8_t range_power = 0;
+//static uint8_t range_power = 0;
 static int range_running = 0;
 static uint64_t range_dstaddr = 0xFFFF; /* broadcast by default */
 static struct callout range_event;
@@ -97,6 +92,10 @@ static void monitor_cb(struct callout_manager *cm,
 static void range_cb(struct callout_manager *cm,
 		     struct callout *clt, void *dummy)
 {
+	(void)cm;
+	(void)clt;
+	(void)dummy;
+#if 0
 	uint8_t i, mask;
 	struct rc_proto_range rangepkt;
 
@@ -128,6 +127,7 @@ static void range_cb(struct callout_manager *cm,
 	callout_reset(cm, &range_event,
 		      range_period_ms,
 		      SINGLE, range_cb, NULL);
+#endif
 }
 
 /* this structure is filled when cmd_help is parsed successfully */
@@ -569,6 +569,81 @@ const parse_inst_t PROGMEM cmd_sendmsg = {
 
 /* ************* */
 
+/* this structure is filled when cmd_send_hello is parsed successfully */
+struct cmd_send_hello_result {
+	fixed_string_t send_hello;
+	uint64_t addr;
+	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)
+{
+	struct cmd_send_hello_result *res = parsed_result;
+	uint16_t now, next, diff;
+	uint8_t flags;
+
+	(void)data;
+
+	IRQ_LOCK(flags);
+	now = global_ms;
+	IRQ_UNLOCK(flags);
+
+	next = now;
+
+	while (!cmdline_keypressed() || res->count == 0) {
+		IRQ_LOCK(flags);
+		now = global_ms;
+		IRQ_UNLOCK(flags);
+
+		diff = now - next;
+		if (diff < res->period)
+			continue;
+
+		rc_proto_send_hello(res->addr, res->data, strlen(res->data));
+		next += res->period;
+	}
+}
+
+const char PROGMEM str_send_hello[] = "send_hello";
+
+const parse_token_string_t PROGMEM cmd_send_hello_send_hello =
+	TOKEN_STRING_INITIALIZER(struct cmd_send_hello_result, send_hello,
+				 str_send_hello);
+
+const parse_token_num_t PROGMEM cmd_send_hello_addr =
+	TOKEN_NUM_INITIALIZER(struct cmd_send_hello_result, addr, UINT64);
+
+const parse_token_num_t PROGMEM cmd_send_hello_period =
+	TOKEN_NUM_INITIALIZER(struct cmd_send_hello_result, period, UINT16);
+
+const parse_token_num_t PROGMEM cmd_send_hello_count =
+	TOKEN_NUM_INITIALIZER(struct cmd_send_hello_result, count, UINT16);
+
+const parse_token_string_t PROGMEM cmd_send_hello_data =
+	TOKEN_STRING_INITIALIZER(struct cmd_send_hello_result, data, NULL);
+
+const char PROGMEM help_send_hello[] =
+	"Send hello msg to a node: addr, period_ms, count, str";
+
+const parse_inst_t PROGMEM cmd_send_hello = {
+	.f = cmd_send_hello_parsed,  /* function to call */
+	.data = NULL,      /* 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_addr,
+		(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 */
 struct cmd_sendmsg_name_result {
 	fixed_string_t sendmsg_name;
@@ -1553,6 +1628,37 @@ const parse_inst_t PROGMEM cmd_test_spi = {
 
 /**********************************************************/
 
+/* this structure is filled when cmd_dump_xbee_stats is parsed successfully */
+struct cmd_dump_xbee_stats_result {
+	fixed_string_t arg0;
+};
+
+static void cmd_dump_xbee_stats_parsed(void *parsed_result, void *data)
+{
+	(void)parsed_result;
+	(void)data;
+
+	xbee_dump_stats(xbee_dev);
+}
+
+const char PROGMEM str_dump_xbee_stats_arg0[] = "dump_xbee_stats";
+const parse_token_string_t PROGMEM cmd_dump_xbee_stats_arg0 =
+	TOKEN_STRING_INITIALIZER(struct cmd_dump_xbee_stats_result, arg0,
+				 str_dump_xbee_stats_arg0);
+
+const char PROGMEM help_dump_xbee_stats[] = "Test the spi";
+const parse_inst_t PROGMEM cmd_dump_xbee_stats = {
+	.f = cmd_dump_xbee_stats_parsed,  /* function to call */
+	.data = NULL,      /* 2nd arg of func */
+	.help_str = help_dump_xbee_stats,
+	.tokens = {        /* token list, NULL terminated */
+		(PGM_P)&cmd_dump_xbee_stats_arg0,
+		NULL,
+	},
+};
+
+/**********************************************************/
+
 /* this structure is filled when cmd_test_eeprom_config is parsed successfully */
 struct cmd_test_eeprom_config_result {
 	fixed_string_t arg0;
@@ -1778,6 +1884,7 @@ const parse_ctx_t PROGMEM main_ctx[] = {
 	&cmd_write_u16,
 	&cmd_write_u32,
 	&cmd_sendmsg,
+	&cmd_send_hello,
 	&cmd_sendmsg_name,
 	&cmd_range,
 	&cmd_range_period,
@@ -1798,6 +1905,7 @@ const parse_ctx_t PROGMEM main_ctx[] = {
 	&cmd_servo_bypassppm,
 	&cmd_servo_show,
 	&cmd_test_spi,
+	&cmd_dump_xbee_stats,
 	&cmd_test_eeprom_config,
 	&cmd_eeprom_del,
 	&cmd_eeprom_add,