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

Reverse node_id bytes, patch from Geog von Zengen

Browse source
This commit is contained in:
David Kopf 2011-11-08 12:23:29 -05:00
parent c2364897f8
commit bdd164e003
1 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
platform/avr-raven/contiki-raven-main.c
View file

@ -520,19 +520,32 @@ uint8_t i;
#if UIP_CONF_IPV6 #if UIP_CONF_IPV6
memcpy(&uip_lladdr.addr, &addr.u8, sizeof(rimeaddr_t)); memcpy(&uip_lladdr.addr, &addr.u8, sizeof(rimeaddr_t));
#elif WITH_NODE_ID
node_id=get_panaddr_from_eeprom();
addr.u8[1]=node_id&0xff;
addr.u8[0]=(node_id&0xff00)>>8;
PRINTA("Node ID from eeprom: %X\n",node_id);
#endif
rimeaddr_set_node_addr(&addr); rimeaddr_set_node_addr(&addr);
rf230_set_pan_addr( rf230_set_pan_addr(
get_panid_from_eeprom(), get_panid_from_eeprom(),
get_panaddr_from_eeprom(), get_panaddr_from_eeprom(),
(uint8_t *)&addr.u8 (uint8_t *)&addr.u8
); );
#elif WITH_NODE_ID
node_id=get_panaddr_from_eeprom();
addr.u8[1]=node_id&0xff;
addr.u8[0]=(node_id&0xff00)>>8;
PRINTA("Node ID from eeprom: %X\n",node_id);
uint16_t inv_node_id=((node_id&0xff00)>>8)+((node_id&0xff)<<8); // change order of bytes for rf23x
rimeaddr_set_node_addr(&addr);
rf230_set_pan_addr(
get_panid_from_eeprom(),
inv_node_id,
NULL
);
#else
rimeaddr_set_node_addr(&addr);
rf230_set_pan_addr(
get_panid_from_eeprom(),
get_panaddr_from_eeprom(),
(uint8_t *)&addr.u8
);
#endif
rf230_set_channel(get_channel_from_eeprom()); rf230_set_channel(get_channel_from_eeprom());
rf230_set_txpower(get_txpower_from_eeprom()); rf230_set_txpower(get_txpower_from_eeprom());