espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-09-16 22:19:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

nimble/phy: Allow 2M PHY on nRF52

Browse Source 
With nrfx we now have proper symbols defined for nRF52.

X-Original-Commit: 93d97dabe051472358c81e94fdfc9979a078c066
This commit is contained in:
Andrzej Kaczmarek
2018-02-14 17:48:01 +01:00
parent d62d1c24b5
commit 7bdacd3518
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/controller/include/controller/ble_phy.h
+2 -2
View File
@@ -26,8 +26,8 @@
extern "C" {
#endif
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_2M_PHY) && !MYNEWT_VAL(BSP_NRF52840)
#error LE 2M PHY can only be enabled on nRF52840
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_2M_PHY) && !(MYNEWT_VAL(BSP_NRF52) || MYNEWT_VAL(BSP_NRF52840))
#error LE 2M PHY can only be enabled on nRF52xxx
#endif
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CODED_PHY) && !MYNEWT_VAL(BSP_NRF52840)
nimble/drivers/nrf52/src/ble_phy.c
+4
View File
@@ -275,12 +275,14 @@ ble_phy_mode_set(int cur_phy_mode, int txtorx_phy_mode)
} else if (cur_phy_mode == BLE_PHY_MODE_2M) {
NRF_RADIO->MODE = RADIO_MODE_MODE_Ble_2Mbit;
NRF_RADIO->PCNF0 = NRF_PCNF0_2M;
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CODED_PHY)
} else if (cur_phy_mode == BLE_PHY_MODE_CODED_125KBPS) {
NRF_RADIO->MODE = RADIO_MODE_MODE_Ble_LR125Kbit;
NRF_RADIO->PCNF0 = NRF_PCNF0_CODED;
} else if (cur_phy_mode == BLE_PHY_MODE_CODED_500KBPS) {
NRF_RADIO->MODE = RADIO_MODE_MODE_Ble_LR500Kbit;
NRF_RADIO->PCNF0 = NRF_PCNF0_CODED;
#endif
} else {
assert(0);
}
@@ -578,10 +580,12 @@ ble_phy_get_ccm_datarate(void)
return CCM_MODE_DATARATE_1Mbit << CCM_MODE_DATARATE_Pos;
case BLE_PHY_MODE_2M:
return CCM_MODE_DATARATE_2Mbit << CCM_MODE_DATARATE_Pos;
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CODED_PHY)
case BLE_PHY_MODE_CODED_125KBPS:
return CCM_MODE_DATARATE_125Kbps << CCM_MODE_DATARATE_Pos;
case BLE_PHY_MODE_CODED_500KBPS:
return CCM_MODE_DATARATE_500Kbps << CCM_MODE_DATARATE_Pos;
#endif
}
assert(0);