X-Git-Url: http://git.droids-corp.org/?p=protos%2Fxbee-avr.git;a=blobdiff_plain;f=cmdline.c;h=0b0c6068d7e734e6b387b1df9d5b56673051ee3e;hp=9f4129efa60cd374a9c5d61366622fed268ce2b9;hb=21d10011bc4b009d7a09131b955953fa7aba3815;hpb=701d7cbf7d30c49e1d21943ce47d00bf250c70e7

diff --git a/cmdline.c b/cmdline.c
index 9f4129e..0b0c606 100644
--- a/cmdline.c
+++ b/cmdline.c
@@ -79,8 +79,7 @@ int xbee_dev_recv(FILE* f)
 	return c;
 }
 
-static void
-valid_buffer(const char *buf, uint8_t size)
+void cmdline_valid_buffer(const char *buf, uint8_t size)
 {
 	int8_t ret;
 	PGM_P ctx = (PGM_P)main_ctx;
@@ -104,7 +103,7 @@ complete_buffer(const char *buf, char *dstbuf, uint8_t dstsize,
 }
 
 
-static void write_char(char c)
+void cmdline_write_char(char c)
 {
 	cmdline_dev_send(c, NULL);
 }
@@ -112,7 +111,7 @@ static void write_char(char c)
 
 void cmdline_init(void)
 {
-	rdline_init(&xbeeboard.rdl, write_char, valid_buffer, complete_buffer);
+	rdline_init(&xbeeboard.rdl, cmdline_write_char, cmdline_valid_buffer, complete_buffer);
 	snprintf_P(xbeeboard.prompt, sizeof(xbeeboard.prompt), PSTR("mainboard > "));
 }
 
@@ -128,8 +127,10 @@ void emergency(char c)
 		i++;
 	else if ( !(i == 1 && c == 'p') )
 		i = 0;
-	if (i == 3)
-		bootloader();
+	if (i == 3) {
+		//bootloader();
+		reset();
+	}
 }
 
 /* log function, add a command to configure