diff options
Diffstat (limited to 'Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32_WPAN/App/app_ble.c')
| -rw-r--r-- | Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32_WPAN/App/app_ble.c | 78 |
1 files changed, 66 insertions, 12 deletions
diff --git a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32_WPAN/App/app_ble.c b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32_WPAN/App/app_ble.c index f14b6346a..a616b9e01 100644 --- a/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32_WPAN/App/app_ble.c +++ b/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_Custom/STM32_WPAN/App/app_ble.c @@ -246,6 +246,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 ) { @@ -336,6 +342,10 @@ void APP_BLE_Init( void ) */ Custom_APP_Init(); +/* USER CODE BEGIN APP_BLE_Init_3 */ + +/* USER CODE END APP_BLE_Init_3 */ + /** * Make device discoverable */ @@ -510,7 +520,7 @@ SVCCTL_UserEvtFlowStatus_t SVCCTL_App_Notification( void *pckt ) case ACI_GAP_NUMERIC_COMPARISON_VALUE_VSEVT_CODE: evt_numeric_value = (aci_gap_numeric_comparison_value_event_rp0 *)blecore_evt->data; numeric_value = evt_numeric_value->Numeric_Value; - APP_DBG_MSG("numeric_value = %lx\n", numeric_value); + APP_DBG_MSG("numeric_value = %ld\n", numeric_value); aci_gap_numeric_comparison_value_confirm_yesno(BleApplicationContext.BleApplicationContext_legacy.connectionHandle, YES); break; @@ -569,7 +579,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 }; /** @@ -593,19 +602,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); + + /* Enable HSI48 oscillator */ + LL_RCC_HSI48_Enable(); + /* Wait until HSI48 is ready */ + while( ! LL_RCC_HSI48_IsReady( ) ); + + 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 HSI48 oscillator */ + LL_RCC_HSI48_Disable(); + + /* 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) 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. @@ -633,9 +680,16 @@ static void Ble_Hci_Gap_Gatt_Init(void){ if (role > 0) { const char *name = CFG_GAP_DEVICE_NAME; - aci_gap_init(role, 0, - CFG_GAP_DEVICE_NAME_LENGTH, - &gap_service_handle, &gap_dev_name_char_handle, &gap_appearance_char_handle); + aci_gap_init(role, +#if ((CFG_BLE_ADDRESS_TYPE == RESOLVABLE_PRIVATE_ADDR) || (CFG_BLE_ADDRESS_TYPE == NON_RESOLVABLE_PRIVATE_ADDR)) + 2, +#else + 0, +#endif + CFG_GAP_DEVICE_NAME_LENGTH, + &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)) { @@ -680,7 +734,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 ); /** @@ -702,7 +756,7 @@ static void Adv_Request(APP_BLE_ConnStatus_t New_Status) ADV_TYPE, CFG_FAST_CONN_ADV_INTERVAL_MIN, CFG_FAST_CONN_ADV_INTERVAL_MAX, - BLE_ADDR_TYPE, + CFG_BLE_ADDRESS_TYPE, ADV_FILTER, 0, 0, |