update 1.8
This commit is contained in:
@@ -42,7 +42,6 @@ static uint8_t App_TaskID = 0; // Task ID for internal task/event processing
|
||||
static uint16_t App_ProcessEvent(uint8_t task_id, uint16_t events);
|
||||
|
||||
static uint8_t dev_uuid[16] = {0}; // 此设备的UUID
|
||||
uint8_t MACAddr[6]; // 此设备的mac
|
||||
|
||||
static const uint8_t self_prov_net_key[16] = {
|
||||
0x00, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
|
||||
@@ -612,9 +611,18 @@ void blemesh_on_sync(void)
|
||||
lpn_init_register(bt_mesh_lpn_init, lpn_state);
|
||||
#endif /* LPN */
|
||||
|
||||
FLASH_GetMACAddress(MACAddr);
|
||||
tmos_memcpy(dev_uuid, MACAddr, 6);
|
||||
err = bt_mesh_cfg_set(&app_mesh_cfg, &app_dev, MACAddr, &info);
|
||||
#if(defined(BLE_MAC)) && (BLE_MAC == TRUE)
|
||||
tmos_memcpy(dev_uuid, MacAddr, 6);
|
||||
err = bt_mesh_cfg_set(&app_mesh_cfg, &app_dev, MacAddr, &info);
|
||||
#else
|
||||
{
|
||||
uint8_t MacAddr[6];
|
||||
FLASH_GetMACAddress(MacAddr);
|
||||
tmos_memcpy(dev_uuid, MacAddr, 6);
|
||||
// 使用芯片mac地址
|
||||
err = bt_mesh_cfg_set(&app_mesh_cfg, &app_dev, MacAddr, &info);
|
||||
}
|
||||
#endif
|
||||
if(err)
|
||||
{
|
||||
APP_DBG("Unable set configuration (err:%d)", err);
|
||||
|
||||
@@ -91,6 +91,7 @@ void Main_Circulation(void)
|
||||
*/
|
||||
int main(void)
|
||||
{
|
||||
SystemCoreClockUpdate();
|
||||
Delay_Init();
|
||||
#ifdef DEBUG
|
||||
USART_Printf_Init( 115200 );
|
||||
|
||||
@@ -22,7 +22,6 @@
|
||||
void NMI_Handler(void) __attribute__((interrupt("WCH-Interrupt-fast")));
|
||||
void HardFault_Handler(void) __attribute__((interrupt("WCH-Interrupt-fast")));
|
||||
void BB_IRQHandler(void) __attribute__((interrupt("WCH-Interrupt-fast")));
|
||||
void LLE_IRQHandler(void) __attribute__((interrupt("WCH-Interrupt-fast")));
|
||||
|
||||
/*********************************************************************
|
||||
* @fn NMI_Handler
|
||||
@@ -60,15 +59,3 @@ void BB_IRQHandler(void)
|
||||
{
|
||||
BB_IRQLibHandler();
|
||||
}
|
||||
|
||||
/*********************************************************************
|
||||
* @fn LLE_IRQHandler
|
||||
*
|
||||
* @brief LLE Interrupt for BLE.
|
||||
*
|
||||
* @return None
|
||||
*/
|
||||
void LLE_IRQHandler(void)
|
||||
{
|
||||
LLE_IRQLibHandler();
|
||||
}
|
||||
|
||||
@@ -168,10 +168,10 @@ extern "C" {
|
||||
#define CONFIG_MESH_FRIEND_RECV_WIN_DEF (30)
|
||||
#define CONFIG_MESH_FRIEND_RECV_WIN_MAX (255)
|
||||
|
||||
// 低功耗节点的请求消息队列大小
|
||||
// 低功耗节点的请求消息队列大小(log2(N)),例配置为4,则大小为2^4=16
|
||||
#define CONFIG_MESH_LPN_REQ_QUEUE_SIZE_MIN (2)
|
||||
#define CONFIG_MESH_LPN_REQ_QUEUE_SIZE_DEF (2)
|
||||
#define CONFIG_MESH_LPN_REQ_QUEUE_SIZE_MAX (20)
|
||||
#define CONFIG_MESH_LPN_REQ_QUEUE_SIZE_MAX (4)
|
||||
|
||||
// 低功耗节点的请求消息间隔(100ms)
|
||||
#define CONFIG_MESH_LPN_POLLINTERVAL_MIN (1)
|
||||
|
||||
Reference in New Issue
Block a user