diff options
Diffstat (limited to 'Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/app_ble.c')
| -rw-r--r-- | Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/app_ble.c | 76 |
1 files changed, 66 insertions, 10 deletions
diff --git a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/app_ble.c b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/app_ble.c index a01d49863..de355d9ca 100644 --- a/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/app_ble.c +++ b/Projects/NUCLEO-WB15CC/Applications/BLE/BLE_p2pServer/STM32_WPAN/App/app_ble.c @@ -366,6 +366,12 @@ static void Connection_Interval_Update_Req( void ); /* USER CODE END PFP */ +/* External variables --------------------------------------------------------*/ + +/* USER CODE BEGIN EV */ + +/* USER CODE END EV */ + /* Functions Definition ------------------------------------------------------*/ void APP_BLE_Init( void ) { @@ -462,6 +468,10 @@ void APP_BLE_Init( void ) */ P2PS_APP_Init(); +/* USER CODE BEGIN APP_BLE_Init_3 */ + +/* USER CODE END APP_BLE_Init_3 */ + /** * Create timer to handle the Advertising Stop */ @@ -802,7 +812,6 @@ static void Ble_Hci_Gap_Gatt_Init(void){ uint8_t role; uint16_t gap_service_handle, gap_dev_name_char_handle, gap_appearance_char_handle; const uint8_t *bd_addr; - uint32_t srd_bd_addr[2]; uint16_t appearance[1] = { BLE_CFG_GAP_APPEARANCE }; /** @@ -820,6 +829,7 @@ static void Ble_Hci_Gap_Gatt_Init(void){ CONFIG_DATA_PUBADDR_LEN, (uint8_t*) bd_addr); +#if (CFG_BLE_ADDRESS_TYPE == PUBLIC_ADDR) /* BLE MAC in ADV Packet */ manuf_data[ sizeof(manuf_data)-6] = bd_addr[5]; manuf_data[ sizeof(manuf_data)-5] = bd_addr[4]; @@ -827,6 +837,7 @@ static void Ble_Hci_Gap_Gatt_Init(void){ manuf_data[ sizeof(manuf_data)-3] = bd_addr[2]; manuf_data[ sizeof(manuf_data)-2] = bd_addr[1]; manuf_data[ sizeof(manuf_data)-1] = bd_addr[0]; +#endif /** * Static random Address @@ -834,19 +845,57 @@ static void Ble_Hci_Gap_Gatt_Init(void){ * The lowest 32bits is read from the UDN to differentiate between devices * The RNG may be used to provide a random number on each power on */ - srd_bd_addr[1] = 0x0000ED6E; - srd_bd_addr[0] = LL_FLASH_GetUDN( ); +#if defined(CFG_STATIC_RANDOM_ADDRESS) + srd_bd_addr[0] = CFG_STATIC_RANDOM_ADDRESS & 0xFFFFFFFF; + srd_bd_addr[1] = (uint32_t)((uint64_t)CFG_STATIC_RANDOM_ADDRESS >> 32); + srd_bd_addr[1] |= 0xC000; /* The two upper bits shall be set to 1 */ +#elif (CFG_BLE_ADDRESS_TYPE == RANDOM_ADDR) + /* Get RNG semaphore */ + while( LL_HSEM_1StepLock( HSEM, CFG_HW_RNG_SEMID ) ); + + /* Enable RNG */ + __HAL_RNG_ENABLE(&hrng); + + if (HAL_RNG_GenerateRandomNumber(&hrng, &srd_bd_addr[1]) != HAL_OK) + { + /* Random number generation error */ + Error_Handler(); + } + if (HAL_RNG_GenerateRandomNumber(&hrng, &srd_bd_addr[0]) != HAL_OK) + { + /* Random number generation error */ + Error_Handler(); + } + srd_bd_addr[1] |= 0xC000; /* The two upper bits shall be set to 1 */ + + /* Disable RNG */ + __HAL_RNG_DISABLE(&hrng); + + /* Release RNG semaphore */ + LL_HSEM_ReleaseLock( HSEM, CFG_HW_RNG_SEMID, 0 ); +#endif + +#if (CFG_BLE_ADDRESS_TYPE == STATIC_RANDOM_ADDR) + /* BLE MAC in ADV Packet */ + manuf_data[ sizeof(manuf_data)-6] = srd_bd_addr[1] >> 8 ; + manuf_data[ sizeof(manuf_data)-5] = srd_bd_addr[1]; + manuf_data[ sizeof(manuf_data)-4] = srd_bd_addr[0] >> 24; + manuf_data[ sizeof(manuf_data)-3] = srd_bd_addr[0] >> 16; + manuf_data[ sizeof(manuf_data)-2] = srd_bd_addr[0] >> 8; + manuf_data[ sizeof(manuf_data)-1] = srd_bd_addr[0]; + aci_hal_write_config_data( CONFIG_DATA_RANDOM_ADDRESS_OFFSET, CONFIG_DATA_RANDOM_ADDRESS_LEN, (uint8_t*)srd_bd_addr ); +#endif /** * Write Identity root key used to derive LTK and CSRK */ - aci_hal_write_config_data( CONFIG_DATA_IR_OFFSET, CONFIG_DATA_IR_LEN, (uint8_t*)BLE_CFG_IR_VALUE ); + aci_hal_write_config_data( CONFIG_DATA_IR_OFFSET, CONFIG_DATA_IR_LEN, (uint8_t*)BLE_CFG_IR_VALUE ); - /** + /** * Write Encryption root key used to derive LTK and CSRK */ - aci_hal_write_config_data( CONFIG_DATA_ER_OFFSET, CONFIG_DATA_ER_LEN, (uint8_t*)BLE_CFG_ER_VALUE ); + aci_hal_write_config_data( CONFIG_DATA_ER_OFFSET, CONFIG_DATA_ER_LEN, (uint8_t*)BLE_CFG_ER_VALUE ); /** * Set TX Power to 0dBm. @@ -874,9 +923,16 @@ static void Ble_Hci_Gap_Gatt_Init(void){ if (role > 0) { const char *name = "P2PSRV1"; - aci_gap_init(role, 0, + aci_gap_init(role, +#if ((CFG_BLE_ADDRESS_TYPE == RESOLVABLE_PRIVATE_ADDR) || (CFG_BLE_ADDRESS_TYPE == NON_RESOLVABLE_PRIVATE_ADDR)) + 2, +#else + 0, +#endif APPBLE_GAP_DEVICE_NAME_LENGTH, - &gap_service_handle, &gap_dev_name_char_handle, &gap_appearance_char_handle); + &gap_service_handle, + &gap_dev_name_char_handle, + &gap_appearance_char_handle); if (aci_gatt_update_char_value(gap_service_handle, gap_dev_name_char_handle, 0, strlen(name), (uint8_t *) name)) { @@ -921,7 +977,7 @@ static void Ble_Hci_Gap_Gatt_Init(void){ BleApplicationContext.BleApplicationContext_legacy.bleSecurityParam.encryptionKeySizeMax, BleApplicationContext.BleApplicationContext_legacy.bleSecurityParam.Use_Fixed_Pin, BleApplicationContext.BleApplicationContext_legacy.bleSecurityParam.Fixed_Pin, - PUBLIC_ADDR + CFG_BLE_ADDRESS_TYPE ); /** @@ -979,7 +1035,7 @@ static void Adv_Request(APP_BLE_ConnStatus_t New_Status) ADV_IND, Min_Inter, Max_Inter, - PUBLIC_ADDR, + CFG_BLE_ADDRESS_TYPE, NO_WHITE_LIST_USE, /* use white list */ sizeof(local_name), (uint8_t*) &local_name, |