From 46010cbbd68c400d7768a255b2adede20b937f39 Mon Sep 17 00:00:00 2001 From: "andreas@reder.eu" Date: Wed, 20 Mar 2013 07:18:23 +0100 Subject: [PATCH] bugfix: panid is now correctly loaded from eeprom and set in mac framer and radio on startup --- platform/osd-merkur/contiki-main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platform/osd-merkur/contiki-main.c b/platform/osd-merkur/contiki-main.c index e267b1060..65d3ad07a 100644 --- a/platform/osd-merkur/contiki-main.c +++ b/platform/osd-merkur/contiki-main.c @@ -59,7 +59,6 @@ #include "radio/rf230bb/rf230bb.h" #include "net/mac/frame802154.h" #include "net/mac/framer-802154.h" -#include "net/sicslowpan.h" #include "contiki.h" #include "contiki-net.h" @@ -281,6 +280,8 @@ uint8_t i; #endif rimeaddr_set_node_addr(&addr); + PRINTA("Panid:%u\n", params_get_panid()); + framer_802154_set_panid(params_get_panid()); rf230_set_pan_addr(params_get_panid(),params_get_panaddr(),(uint8_t *)&addr.u8); rf230_set_channel(params_get_channel()); rf230_set_txpower(params_get_txpower());