deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Set node_id, disabled watchdog for now

Browse source
This commit is contained in:
Niclas Finne 2011-09-21 20:11:58 +02:00
parent 05b10eb9ce
commit 6c5379606b
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
platform/wismote/contiki-wismote-main.c
View file

@ -228,6 +228,7 @@ main(int argc, char **argv)
/* Restore node id if such has been stored in external mem */ /* Restore node id if such has been stored in external mem */
//node_id_restore(); //node_id_restore();
node_id = NODE_ID;
/* for setting "hardcoded" IEEE 802.15.4 MAC addresses */ /* for setting "hardcoded" IEEE 802.15.4 MAC addresses */
#ifdef IEEE_802154_MAC_ADDRESS #ifdef IEEE_802154_MAC_ADDRESS
@ -279,10 +280,9 @@ main(int argc, char **argv)
} }
#if WITH_UIP6 #if WITH_UIP6
//memcpy(&uip_lladdr.addr, ds2411_id, sizeof(uip_lladdr.addr)); /* memcpy(&uip_lladdr.addr, ds2411_id, sizeof(uip_lladdr.addr)); */
memcpy(&uip_lladdr.addr, rimeaddr_node_addr.u8,
for(i =0;i<RIMEADDR_SIZE;i++) UIP_LLADDR_LEN > RIMEADDR_SIZE ? RIMEADDR_SIZE : UIP_LLADDR_LEN);
uip_lladdr.addr[i] = rimeaddr_node_addr.u8[i];
/* Setup nullmac-like MAC for 802.15.4 */ /* Setup nullmac-like MAC for 802.15.4 */
/* sicslowpan_init(sicslowmac_init(&cc2520_driver)); */ /* sicslowpan_init(sicslowmac_init(&cc2520_driver)); */
@ -391,6 +391,8 @@ main(int argc, char **argv)
ENERGEST_ON(ENERGEST_TYPE_CPU); ENERGEST_ON(ENERGEST_TYPE_CPU);
watchdog_start(); watchdog_start();
/* Stop the watchdog */
watchdog_stop();
print_processes(autostart_processes); print_processes(autostart_processes);
autostart_start(autostart_processes); autostart_start(autostart_processes);