X-Git-Url: http://git.droids-corp.org/?p=protos%2Fxbee-avr.git;a=blobdiff_plain;f=commands.c;h=2c663c1f7b0564aaf43a18691f5d73b4381c915b;hp=3448dedccb7c2b063fd01141c30c3c1a5ad6985a;hb=e39c5d534eaa4d29fea56d7851343612fdab9a23;hpb=852fd37145aaaee0ce2117f5c8173f5b86020fd0

diff --git a/commands.c b/commands.c
index 3448ded..2c663c1 100644
--- a/commands.c
+++ b/commands.c
@@ -83,7 +83,8 @@ static void monitor_cb(struct callout_mgr *cm,
 	if (monitor_current == NULL)
 		monitor_current = LIST_FIRST(&xbee_monitor_list);
 
-	xbeeapp_send_atcmd(monitor_current->atcmd, NULL, 0, 0, NULL, NULL);
+	/* no rx_cb given: the user must check the monitored values in logs */
+	xbeeapp_send_atcmd(monitor_current->atcmd, NULL, 0, NULL, NULL);
 	monitor_current = LIST_NEXT(monitor_current, next);
 	callout_reschedule(cm, clt, monitor_period_ms / monitor_count);
 }
@@ -125,6 +126,56 @@ static void range_cb(struct callout_mgr *cm,
 
 	callout_reschedule(cm, clt, range_period_ms);
 #endif
+/* callback invoked when a xbee_send is done */
+static int8_t send_msg_cb(int8_t retcode, void *frame, unsigned len,
+	void *arg)
+{
+	struct xbee_recv_hdr *recvframe = frame;
+	uint8_t *done = arg;
+
+	*done = 1;
+	if (retcode == XBEE_USER_RETCODE_TIMEOUT) {
+		printf_P(PSTR("timeout\r\n"));
+		return retcode;
+	}
+	if (retcode == XBEE_USER_RETCODE_BAD_FRAME ||
+		len <  sizeof(*recvframe)) {
+		printf_P(PSTR("invalid frame\r\n"));
+		return XBEE_USER_RETCODE_BAD_FRAME;
+	}
+
+	printf_P(PSTR("ok\r\n"));
+	return XBEE_USER_RETCODE_OK;
+}
+
+/* callback invoked to dump the response to AT command */
+static int8_t dump_xbee_atresp_cb(int8_t retcode, void *frame, unsigned len,
+	void *arg)
+{
+	struct xbee_atresp_hdr *recvframe = frame;
+	char atcmd_str[3];
+	char buf[32];
+	uint8_t *done = arg;
+
+	*done = 1;
+	if (retcode == XBEE_USER_RETCODE_TIMEOUT) {
+		printf_P(PSTR("timeout\r\n"));
+		return retcode;
+	}
+	if (retcode == XBEE_USER_RETCODE_BAD_FRAME ||
+		len <  sizeof(*recvframe)) {
+		printf_P(PSTR("invalid frame\r\n"));
+		return XBEE_USER_RETCODE_BAD_FRAME;
+	}
+
+	/* get AT command from frame */
+	memcpy(atcmd_str, &recvframe->cmd, 2);
+	atcmd_str[2] = '\0';
+
+	len -= sizeof(*recvframe);
+	atresp_to_str(buf, sizeof(buf), frame);
+	NOTICE(E_USER_XBEE, "status ok, len=%d, %s", len, buf);
+	return XBEE_USER_RETCODE_OK;
 }
 
 /* this structure is filled when cmd_help is parsed successfully */
@@ -324,9 +375,6 @@ const parse_inst_t PROGMEM cmd_neigh_list = {
 	},
 };
 
-
-
-
 /* ************* */
 
 /* this structure is filled when cmd_read is parsed successfully */
@@ -342,12 +390,14 @@ static void cmd_read_parsed(void *parsed_result,
 	struct cmd_read_result *res = parsed_result;
 	struct xbee_atcmd copy;
 	char cmd[3];
+	volatile uint8_t done = 0;
 
 	(void)data;
 	memcpy_P(&copy, res->cmd, sizeof(copy));
 	memcpy_P(&cmd, copy.name, 2);
 	cmd[2] = '\0';
-	xbeeapp_send_atcmd(cmd, NULL, 0, 1, NULL, NULL);
+	xbeeapp_send_atcmd(cmd, NULL, 0, dump_xbee_atresp_cb, (void *)&done);
+	while (done == 0);
 }
 
 const char PROGMEM str_read_read[] = "read";
@@ -394,6 +444,7 @@ static void cmd_write_parsed(void *parsed_result, void *data)
 	char cmd[3];
 	int len;
 	void *param;
+	volatile uint8_t done = 0;
 
 	(void)data;
 	memcpy_P(&copy, res->cmd, sizeof(copy));
@@ -422,7 +473,8 @@ static void cmd_write_parsed(void *parsed_result, void *data)
 	}
 	memcpy_P(&cmd, copy.name, 2);
 	cmd[2] = '\0';
-	xbeeapp_send_atcmd(cmd, param, len, 1, NULL, NULL);
+	xbeeapp_send_atcmd(cmd, param, len, dump_xbee_atresp_cb, (void *)&done);
+	while (done == 0);
 }
 
 const char PROGMEM str_write_none[] = "write";
@@ -534,6 +586,7 @@ static void cmd_sendmsg_parsed(void *parsed_result, void *data)
 {
 	struct cmd_sendmsg_result *res = parsed_result;
 	struct xbee_msg msg;
+	volatile uint8_t done = 0;
 
 	(void)data;
 
@@ -541,7 +594,8 @@ static void cmd_sendmsg_parsed(void *parsed_result, void *data)
 	msg.iov[0].buf = res->data;
 	msg.iov[0].len = strlen(res->data);
 
-	xbeeapp_send_msg(res->addr, &msg, 1);
+	xbeeapp_send_msg(res->addr, &msg, send_msg_cb, (void *)&done);
+	while (done == 0);
 }
 
 const char PROGMEM str_sendmsg[] = "sendmsg";
@@ -683,6 +737,7 @@ static void cmd_sendmsg_name_parsed(void *parsed_result, void *data)
 {
 	struct cmd_sendmsg_name_result *res = parsed_result;
 	struct xbee_msg msg;
+	volatile uint8_t done = 0;
 
 	(void)data;
 
@@ -690,7 +745,8 @@ static void cmd_sendmsg_name_parsed(void *parsed_result, void *data)
 	msg.iov[0].buf = res->data;
 	msg.iov[0].len = strlen(res->data);
 
-	xbeeapp_send_msg(res->neigh->addr, &msg, 1);
+	xbeeapp_send_msg(res->neigh->addr, &msg, send_msg_cb, (void *)&done);
+	while (done == 0);
 }
 
 const parse_token_string_t PROGMEM cmd_sendmsg_name_sendmsg_name =
@@ -1225,9 +1281,12 @@ struct cmd_ping_result {
 /* function called when cmd_ping is parsed successfully */
 static void cmd_ping_parsed(void *parsed_result, void *data)
 {
+	volatile uint8_t done = 0;
+
 	(void)parsed_result;
 	(void)data;
-	xbeeapp_send_atcmd("VL", NULL, 0, 1, NULL, NULL);
+	xbeeapp_send_atcmd("VL", NULL, 0, dump_xbee_atresp_cb, (void *)&done);
+	while (done == 0);
 }
 
 const char PROGMEM str_ping[] = "ping";