X-Git-Url: http://git.droids-corp.org/?p=protos%2Fxbee-avr.git;a=blobdiff_plain;f=commands.c;h=446d92dc41fbb815848a4bdbd6bfca717f10e201;hp=54e56d70fc88a04ebac813d34ec9b1822dea9b97;hb=c17da94fafe8e0fa1a467f0c8fb7922fec8386e5;hpb=a53014b7f52462e163a7d7ac64866aa75977422f

diff --git a/commands.c b/commands.c
index 54e56d7..446d92d 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"
@@ -1247,6 +1248,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;