From 1536c83f2fa9dbbc1abb35ee1aeebacfc824280c Mon Sep 17 00:00:00 2001 From: fros4943 Date: Wed, 1 Apr 2009 13:38:14 +0000 Subject: [PATCH] added serial line init --- tools/cooja/config/contiki_template.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/tools/cooja/config/contiki_template.c b/tools/cooja/config/contiki_template.c index b8aaafce2..17881d2a4 100644 --- a/tools/cooja/config/contiki_template.c +++ b/tools/cooja/config/contiki_template.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: contiki_template.c,v 1.12 2009/03/17 10:34:02 fros4943 Exp $ + * $Id: contiki_template.c,v 1.13 2009/04/01 13:38:14 fros4943 Exp $ */ /** @@ -65,14 +65,13 @@ #include "contiki-lib.h" #include "contiki-conf.h" #include "sys/clock.h" - -#include "lib/simEnvChange.h" -#include "lib/sensors.h" -#include "dev/cooja-radio.h" #include "sys/etimer.h" #include "sys/cooja_mt.h" +#include "dev/serial-line.h" +#include "dev/cooja-radio.h" +#include "lib/simEnvChange.h" +#include "lib/sensors.h" #include "net/init-net.h" - #include "node-id.h" PROCINIT(&etimer_process,&sensors_process); @@ -118,8 +117,6 @@ print_processes(struct process * const processes[]) static void start_process_run_loop(void *data) { - int i; - /* Initialize random generator */ random_init(0); @@ -139,11 +136,9 @@ start_process_run_loop(void *data) /* Initialize communication stack */ init_net(); - printf("Rime started with address "); - for(i = 0; i < sizeof(rimeaddr_node_addr.u8) - 1; i++) { - printf("%d.", rimeaddr_node_addr.u8[i]); - } - printf("%d\n", rimeaddr_node_addr.u8[i]); + + /* Start serial process */ + serial_line_init(); /* Start autostart processes (defined in Contiki application) */ print_processes(autostart_processes);