link layer problem fixed
This commit is contained in:
parent
35c08597e6
commit
2a49608af6
@ -107,9 +107,8 @@ set_rf_params(void)
|
|||||||
{
|
{
|
||||||
uint8_t ext_addr[8];
|
uint8_t ext_addr[8];
|
||||||
|
|
||||||
#if MAKE_MAC == MAKE_MAC_OTHER
|
#if MAKE_MAC == MAKE_MAC_BLE
|
||||||
ble_eui64_addr_cpy_to((uint8_t *)&ext_addr);
|
ble_eui64_addr_cpy_to((uint8_t *)&ext_addr);
|
||||||
memcpy(&linkaddr_node_addr, &ext_addr[8 - LINKADDR_SIZE], LINKADDR_SIZE);
|
|
||||||
NETSTACK_RADIO.set_object(RADIO_PARAM_64BIT_ADDR, ext_addr, 8);
|
NETSTACK_RADIO.set_object(RADIO_PARAM_64BIT_ADDR, ext_addr, 8);
|
||||||
#else
|
#else
|
||||||
uint16_t short_addr;
|
uint16_t short_addr;
|
||||||
@ -176,8 +175,13 @@ platform_init_stage_two()
|
|||||||
serial_line_init();
|
serial_line_init();
|
||||||
|
|
||||||
/* Populate linkaddr_node_addr */
|
/* Populate linkaddr_node_addr */
|
||||||
|
#if MAKE_MAC == MAKE_MAC_BLE
|
||||||
|
uint8_t ext_addr[8];
|
||||||
|
ble_eui64_addr_cpy_to((uint8_t *)&ext_addr);
|
||||||
|
memcpy(&linkaddr_node_addr, &ext_addr[8 - LINKADDR_SIZE], LINKADDR_SIZE);
|
||||||
|
#else
|
||||||
ieee_addr_cpy_to(linkaddr_node_addr.u8, LINKADDR_SIZE);
|
ieee_addr_cpy_to(linkaddr_node_addr.u8, LINKADDR_SIZE);
|
||||||
|
#endif
|
||||||
fade(LEDS_GREEN);
|
fade(LEDS_GREEN);
|
||||||
}
|
}
|
||||||
/*---------------------------------------------------------------------------*/
|
/*---------------------------------------------------------------------------*/
|
||||||
|
@ -50,9 +50,9 @@
|
|||||||
#define NETSTACK_CONF_RADIO ble_cc2650_driver
|
#define NETSTACK_CONF_RADIO ble_cc2650_driver
|
||||||
|
|
||||||
#define LOG_CONF_LEVEL_MAC LOG_LEVEL_INFO
|
#define LOG_CONF_LEVEL_MAC LOG_LEVEL_INFO
|
||||||
#define LOG_CONF_LEVEL_6LOWPAN LOG_LEVEL_WARN
|
//#define LOG_CONF_LEVEL_6LOWPAN LOG_LEVEL_WARN
|
||||||
#define LOG_CONF_LEVEL_IPV6 LOG_LEVEL_WARN
|
//#define LOG_CONF_LEVEL_IPV6 LOG_LEVEL_WARN
|
||||||
#define LOG_CONF_LEVEL_TCPIP LOG_LEVEL_WARN
|
//#define LOG_CONF_LEVEL_TCPIP LOG_LEVEL_WARN
|
||||||
|
|
||||||
/* BLE L2CAP settings */
|
/* BLE L2CAP settings */
|
||||||
#define BLE_CONF_DEVICE_NAME "TI CC26xx device"
|
#define BLE_CONF_DEVICE_NAME "TI CC26xx device"
|
||||||
|
@ -95,8 +95,6 @@ main(void)
|
|||||||
LOG_INFO_LLADDR(&linkaddr_node_addr);
|
LOG_INFO_LLADDR(&linkaddr_node_addr);
|
||||||
LOG_INFO_("\n");
|
LOG_INFO_("\n");
|
||||||
|
|
||||||
platform_init_stage_three();
|
|
||||||
|
|
||||||
#if NETSTACK_CONF_WITH_IPV6
|
#if NETSTACK_CONF_WITH_IPV6
|
||||||
{
|
{
|
||||||
uip_ds6_addr_t *lladdr;
|
uip_ds6_addr_t *lladdr;
|
||||||
@ -110,6 +108,8 @@ main(void)
|
|||||||
}
|
}
|
||||||
#endif /* NETSTACK_CONF_WITH_IPV6 */
|
#endif /* NETSTACK_CONF_WITH_IPV6 */
|
||||||
|
|
||||||
|
platform_init_stage_three();
|
||||||
|
|
||||||
#if BUILD_WITH_ORCHESTRA
|
#if BUILD_WITH_ORCHESTRA
|
||||||
orchestra_init();
|
orchestra_init();
|
||||||
LOG_DBG("With Orchestra\n");
|
LOG_DBG("With Orchestra\n");
|
||||||
|
Loading…
Reference in New Issue
Block a user