serial shell works now

2 files changed, 25 insertions, 12 deletions

diff --git a/contrib/contiki-2.6.patch b/contrib/contiki-2.6.patch
index f153757..8bc4ecd 100644
--- a/contrib/contiki-2.6.patch
+++ b/contrib/contiki-2.6.patch
@@ -1,3 +1,15 @@
+diff -Nur contiki-2.6.orig/apps/serial-shell/serial-shell.c contiki-2.6/apps/serial-shell/serial-shell.c
+--- contiki-2.6.orig/apps/serial-shell/serial-shell.c	2012-07-17 12:11:02.000000000 +0200
++++ contiki-2.6/apps/serial-shell/serial-shell.c	2013-07-09 04:10:49.815163583 +0200
+@@ -81,7 +81,7 @@
+ void
+ shell_prompt(char *str)
+ {
+-  printf("%d.%d: %s\r\n", rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1],
++  printf("%d.%d: %s", rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1],
+ 	 str);
+ }
+ /*---------------------------------------------------------------------------*/
 diff -Nur contiki-2.6.orig/core/net/uip-nd6.c contiki-2.6/core/net/uip-nd6.c
 --- contiki-2.6.orig/core/net/uip-nd6.c	2012-07-17 12:11:04.000000000 +0200
 +++ contiki-2.6/core/net/uip-nd6.c	2013-06-25 01:45:38.193233756 +0200
@@ -31,7 +43,7 @@ diff -Nur contiki-2.6.orig/core/net/uip-nd6.c contiki-2.6/core/net/uip-nd6.c
          if(memcmp(&nd6_opt_llao[UIP_ND6_OPT_DATA_OFFSET],
 diff -Nur contiki-2.6.orig/platform/avr-zigbit/contiki-avr-zigbit-main.c contiki-2.6/platform/avr-zigbit/contiki-avr-zigbit-main.c
 --- contiki-2.6.orig/platform/avr-zigbit/contiki-avr-zigbit-main.c	2012-07-17 12:11:08.000000000 +0200
-+++ contiki-2.6/platform/avr-zigbit/contiki-avr-zigbit-main.c	2013-06-25 01:56:14.676389906 +0200
++++ contiki-2.6/platform/avr-zigbit/contiki-avr-zigbit-main.c	2013-07-09 04:38:35.415422849 +0200
 @@ -41,8 +41,8 @@
  #include "loader/symbols-def.h"
  #include "loader/symtab.h"
@@ -65,7 +77,7 @@ diff -Nur contiki-2.6.orig/platform/avr-zigbit/contiki-avr-zigbit-main.c contiki
  void
  init_lowlevel(void)
  {
- 
+-
    /* Second rs232 port for debugging */
 -  rs232_init(RS232_PORT_1, USART_BAUD_115200,
 +  rs232_init(RS232_PORT_1, USART_BAUD_57600,
@@ -73,7 +85,9 @@ diff -Nur contiki-2.6.orig/platform/avr-zigbit/contiki-avr-zigbit-main.c contiki
  
    /* Redirect stdout to second port */
    rs232_redirect_stdout(RS232_PORT_1);
-   
+-  
++  rs232_set_input(RS232_PORT_1, serial_line_input_byte);
++
 +  printf_P(PSTR("\n******** CONTIKI@AVR-Zigbit low level Initalization *********\n"));
 +
    /* Clock */
@@ -88,7 +102,7 @@ diff -Nur contiki-2.6.orig/platform/avr-zigbit/contiki-avr-zigbit-main.c contiki
  #endif
  
    process_start(&tcpip_process, NULL);
-@@ -182,14 +197,14 @@
+@@ -182,13 +197,15 @@
    /* Initialize hardware */
    init_lowlevel();
  
@@ -101,7 +115,7 @@ diff -Nur contiki-2.6.orig/platform/avr-zigbit/contiki-avr-zigbit-main.c contiki
    autostart_start(autostart_processes);
  
 -  printf_P(PSTR("\n********BOOTING CONTIKI*********\n"));
--
++  serial_line_init();
+ 
    printf_P(PSTR("System online.\n"));
  
-   /* Main scheduler loop */
diff --git a/software/dustmap-node/dustmap-node.c b/software/dustmap-node/dustmap-node.c
index 86e0547..7c13e0d 100644
--- a/software/dustmap-node/dustmap-node.c
+++ b/software/dustmap-node/dustmap-node.c
@@ -39,9 +39,8 @@ PROCESS_THREAD(hello_world_process, ev, data)
 }
 /*---------------------------------------------------------------------------*/
 
-
 /*---------------------------------------------------------------------------*/
-static struct etimer et;
+static struct etimer et_hb;
 PROCESS(heartbeat_process, "heartbeat process");
 PROCESS_THREAD(heartbeat_process, ev, data)
 {
@@ -49,11 +48,12 @@ PROCESS_THREAD(heartbeat_process, ev, data)
 
   DDRE |= (1<<PE2);
   PORTE &= ~(1<<PE2);
-  etimer_set(&et, CLOCK_SECOND/5);
+
+  etimer_set(&et_hb, CLOCK_SECOND/5);
 
   for(;;) {
-    PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&et));
-    etimer_reset(&et);
+    PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&et_hb));
+    etimer_reset(&et_hb);
     PORTE ^= (1<<PE2);
   }
 
@@ -61,7 +61,6 @@ PROCESS_THREAD(heartbeat_process, ev, data)
 }
 /*---------------------------------------------------------------------------*/
 
-
 /*---------------------------------------------------------------------------*/
 PROCESS(shell_init_process, "Shell init process");
 PROCESS_THREAD(shell_init_process, ev, data)