Hardware/software radio HAL patch from Roger Larsson.
Use CHANNEL_802_15_4 define for RF channel on all AVR platforms, default 26. Remove hopefully unnecessary interrupt disable wrapper on eeprom reads and writes.
This commit is contained in:
parent
21b10e8021
commit
58b7a19803
12 changed files with 304 additions and 122 deletions
|
@ -122,15 +122,17 @@ init_lowlevel(void)
|
|||
|
||||
rimeaddr_t addr;
|
||||
memset(&addr, 0, sizeof(rimeaddr_t));
|
||||
AVR_ENTER_CRITICAL_REGION();
|
||||
eeprom_read_block ((void *)&addr.u8, &mac_address, 8);
|
||||
AVR_LEAVE_CRITICAL_REGION();
|
||||
|
||||
#if UIP_CONF_IPV6
|
||||
memcpy(&uip_lladdr.addr, &addr.u8, 8);
|
||||
#endif
|
||||
rf230_set_pan_addr(IEEE802154_PANID, 0, (uint8_t *)&addr.u8);
|
||||
rf230_set_channel(24);
|
||||
#ifdef CHANNEL_802_15_4
|
||||
rf230_set_channel(CHANNEL_802_15_4);
|
||||
#else
|
||||
rf230_set_channel(26);
|
||||
#endif
|
||||
|
||||
rimeaddr_set_node_addr(&addr);
|
||||
|
||||
|
|
|
@ -43,7 +43,6 @@
|
|||
#define __CONTIKI_CONF_H__
|
||||
|
||||
/* MCU and clock rate */
|
||||
#define MCU_MHZ 8
|
||||
#define PLATFORM PLATFORM_AVR
|
||||
#define HARWARE_REVISION ZIGBIT
|
||||
|
||||
|
@ -97,6 +96,7 @@
|
|||
#define NETSTACK_CONF_RDC sicslowmac_driver
|
||||
#define NETSTACK_CONF_FRAMER framer_802154
|
||||
#define NETSTACK_CONF_RADIO rf230_driver
|
||||
#define CHANNEL_802_15_4 26
|
||||
#define RF230_CONF_AUTOACK 1
|
||||
#define RF230_CONF_AUTORETRIES 2
|
||||
#define SICSLOWPAN_CONF_FRAG 1
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue