Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bluetooth: Controller: Add tx power defines nrf54LX and nrf54HX #68746

Closed
wants to merge 1 commit into from
Closed

Bluetooth: Controller: Add tx power defines nrf54LX and nrf54HX #68746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 56 additions & 16 deletions subsys/bluetooth/controller/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,92 +255,126 @@ choice BT_CTLR_TX_PWR
The value set here represents the actual default power level fed
to the antenna.

config BT_CTLR_TX_PWR_PLUS_10
bool "+10 dBm"
depends on SOC_SERIES_NRF54HX

config BT_CTLR_TX_PWR_PLUS_9
bool "+9 dBm"
depends on SOC_SERIES_NRF54HX

config BT_CTLR_TX_PWR_PLUS_8
bool "+8 dBm"
depends on HAS_HW_NRF_RADIO_TX_PWR_HIGH
depends on HAS_HW_NRF_RADIO_TX_PWR_HIGH || SOC_SERIES_NRF54HX || SOC_SERIES_NRF54LX

config BT_CTLR_TX_PWR_PLUS_7
bool "+7 dBm"
depends on HAS_HW_NRF_RADIO_TX_PWR_HIGH
depends on HAS_HW_NRF_RADIO_TX_PWR_HIGH || SOC_SERIES_NRF54HX || SOC_SERIES_NRF54LX

config BT_CTLR_TX_PWR_PLUS_6
bool "+6 dBm"
depends on HAS_HW_NRF_RADIO_TX_PWR_HIGH
depends on HAS_HW_NRF_RADIO_TX_PWR_HIGH || SOC_SERIES_NRF54HX || SOC_SERIES_NRF54LX

config BT_CTLR_TX_PWR_PLUS_5
bool "+5 dBm"
depends on HAS_HW_NRF_RADIO_TX_PWR_HIGH
depends on HAS_HW_NRF_RADIO_TX_PWR_HIGH || SOC_SERIES_NRF54HX || SOC_SERIES_NRF54LX

config BT_CTLR_TX_PWR_PLUS_4
bool "+4 dBm"
depends on SOC_SERIES_NRF51X || SOC_COMPATIBLE_NRF52X
depends on SOC_SERIES_NRF51X || SOC_COMPATIBLE_NRF52X || SOC_SERIES_NRF54HX || SOC_SERIES_NRF54LX

config BT_CTLR_TX_PWR_PLUS_3
bool "+3 dBm"
depends on SOC_COMPATIBLE_NRF52X || SOC_SERIES_NRF53X
depends on SOC_COMPATIBLE_NRF52X || SOC_SERIES_NRF53X || SOC_SERIES_NRF54HX || SOC_SERIES_NRF54LX

config BT_CTLR_TX_PWR_PLUS_2
bool "+2 dBm"
depends on HAS_HW_NRF_RADIO_TX_PWR_HIGH || SOC_SERIES_NRF53X
depends on HAS_HW_NRF_RADIO_TX_PWR_HIGH || SOC_SERIES_NRF53X || SOC_SERIES_NRF54HX || SOC_SERIES_NRF54LX

config BT_CTLR_TX_PWR_PLUS_1
bool "+1 dBm"
depends on SOC_SERIES_NRF53X
depends on SOC_SERIES_NRF53X || SOC_SERIES_NRF54HX || SOC_SERIES_NRF54LX

config BT_CTLR_TX_PWR_0
bool "0 dBm"

config BT_CTLR_TX_PWR_MINUS_1
bool "-1 dBm"
depends on SOC_SERIES_NRF53X
depends on SOC_SERIES_NRF53X || SOC_SERIES_NRF54HX || SOC_SERIES_NRF54LX

config BT_CTLR_TX_PWR_MINUS_2
bool "-2 dBm"
depends on SOC_SERIES_NRF53X
depends on SOC_SERIES_NRF53X || SOC_SERIES_NRF54HX || SOC_SERIES_NRF54LX

config BT_CTLR_TX_PWR_MINUS_3
bool "-3 dBm"
depends on SOC_SERIES_NRF53X
depends on SOC_SERIES_NRF53X || SOC_SERIES_NRF54LX

config BT_CTLR_TX_PWR_MINUS_4
bool "-4 dBm"

config BT_CTLR_TX_PWR_MINUS_5
bool "-5 dBm"
depends on SOC_SERIES_NRF53X
depends on SOC_SERIES_NRF53X || SOC_SERIES_NRF54LX

config BT_CTLR_TX_PWR_MINUS_6
bool "-6 dBm"
depends on SOC_SERIES_NRF53X
depends on SOC_SERIES_NRF53X || SOC_SERIES_NRF54LX

config BT_CTLR_TX_PWR_MINUS_7
bool "-7 dBm"
depends on SOC_SERIES_NRF53X
depends on SOC_SERIES_NRF53X || SOC_SERIES_NRF54LX

config BT_CTLR_TX_PWR_MINUS_8
bool "-8 dBm"

config BT_CTLR_TX_PWR_MINUS_9
bool "-9 dBm"
depends on SOC_SERIES_NRF54LX

config BT_CTLR_TX_PWR_MINUS_10
bool "-10 dBm"
depends on SOC_SERIES_NRF54LX

config BT_CTLR_TX_PWR_MINUS_12
bool "-12 dBm"

config BT_CTLR_TX_PWR_MINUS_14
bool "-14 dBm"
depends on SOC_SERIES_NRF54LX

config BT_CTLR_TX_PWR_MINUS_16
bool "-16 dBm"

config BT_CTLR_TX_PWR_MINUS_20
bool "-20 dBm"

config BT_CTLR_TX_PWR_MINUS_26
bool "-260 dBm"
depends on SOC_SERIES_NRF54LX

config BT_CTLR_TX_PWR_MINUS_30
bool "-30 dBm"
depends on SOC_SERIES_NRF51X
depends on SOC_SERIES_NRF51X || SOC_SERIES_NRF54HX

config BT_CTLR_TX_PWR_MINUS_40
bool "-40 dBm"
depends on SOC_COMPATIBLE_NRF52X || SOC_SERIES_NRF53X
depends on SOC_COMPATIBLE_NRF52X || SOC_SERIES_NRF53X || SOC_SERIES_NRF54HX || SOC_SERIES_NRF54LX

config BT_CTLR_TX_PWR_MINUS_46
bool "-46 dBm"
depends on SOC_SERIES_NRF54LX

config BT_CTLR_TX_PWR_MINUS_70
bool "-70 dBm"
depends on SOC_SERIES_NRF54HX

endchoice

config BT_CTLR_TX_PWR_DBM
int
default 10 if BT_CTLR_TX_PWR_PLUS_10
default 9 if BT_CTLR_TX_PWR_PLUS_9
default 8 if BT_CTLR_TX_PWR_PLUS_8
default 7 if BT_CTLR_TX_PWR_PLUS_7
default 6 if BT_CTLR_TX_PWR_PLUS_6
Expand All @@ -358,11 +392,17 @@ config BT_CTLR_TX_PWR_DBM
default -6 if BT_CTLR_TX_PWR_MINUS_6
default -7 if BT_CTLR_TX_PWR_MINUS_7
default -8 if BT_CTLR_TX_PWR_MINUS_8
default -9 if BT_CTLR_TX_PWR_MINUS_9
default -10 if BT_CTLR_TX_PWR_MINUS_10
default -12 if BT_CTLR_TX_PWR_MINUS_12
default -14 if BT_CTLR_TX_PWR_MINUS_14
default -16 if BT_CTLR_TX_PWR_MINUS_16
default -20 if BT_CTLR_TX_PWR_MINUS_20
default -26 if BT_CTLR_TX_PWR_MINUS_26
default -30 if BT_CTLR_TX_PWR_MINUS_30
default -40 if BT_CTLR_TX_PWR_MINUS_40
default -46 if BT_CTLR_TX_PWR_MINUS_46
default -70 if BT_CTLR_TX_PWR_MINUS_70

config BT_CTLR_TX_PWR_ANTENNA
int "Set TX power (dBm)"
Expand Down
18 changes: 17 additions & 1 deletion subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_txp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@
* SPDX-License-Identifier: Apache-2.0
*/

#if defined(CONFIG_BT_CTLR_TX_PWR_PLUS_8)
#if defined(CONFIG_BT_CTLR_TX_PWR_PLUS_10)
#define RADIO_TXP_DEFAULT RADIO_TXPOWER_TXPOWER_Pos10dBm
#elif defined(CONFIG_BT_CTLR_TX_PWR_PLUS_9)
#define RADIO_TXP_DEFAULT RADIO_TXPOWER_TXPOWER_Pos9dBm
#elif defined(CONFIG_BT_CTLR_TX_PWR_PLUS_8)
#define RADIO_TXP_DEFAULT RADIO_TXPOWER_TXPOWER_Pos8dBm
#elif defined(CONFIG_BT_CTLR_TX_PWR_PLUS_7)
#define RADIO_TXP_DEFAULT RADIO_TXPOWER_TXPOWER_Pos7dBm
Expand Down Expand Up @@ -38,14 +42,26 @@
#define RADIO_TXP_DEFAULT RADIO_TXPOWER_TXPOWER_Neg7dBm
#elif defined(CONFIG_BT_CTLR_TX_PWR_MINUS_8)
#define RADIO_TXP_DEFAULT RADIO_TXPOWER_TXPOWER_Neg8dBm
#elif defined(CONFIG_BT_CTLR_TX_PWR_MINUS_9)
#define RADIO_TXP_DEFAULT RADIO_TXPOWER_TXPOWER_Neg9dBm
#elif defined(CONFIG_BT_CTLR_TX_PWR_MINUS_10)
#define RADIO_TXP_DEFAULT RADIO_TXPOWER_TXPOWER_Neg10dBm
#elif defined(CONFIG_BT_CTLR_TX_PWR_MINUS_12)
#define RADIO_TXP_DEFAULT RADIO_TXPOWER_TXPOWER_Neg12dBm
#elif defined(CONFIG_BT_CTLR_TX_PWR_MINUS_14)
#define RADIO_TXP_DEFAULT RADIO_TXPOWER_TXPOWER_Neg14dBm
#elif defined(CONFIG_BT_CTLR_TX_PWR_MINUS_16)
#define RADIO_TXP_DEFAULT RADIO_TXPOWER_TXPOWER_Neg16dBm
#elif defined(CONFIG_BT_CTLR_TX_PWR_MINUS_20)
#define RADIO_TXP_DEFAULT RADIO_TXPOWER_TXPOWER_Neg20dBm
#elif defined(CONFIG_BT_CTLR_TX_PWR_MINUS_26)
#define RADIO_TXP_DEFAULT RADIO_TXPOWER_TXPOWER_Neg26dBm
#elif defined(CONFIG_BT_CTLR_TX_PWR_MINUS_30)
#define RADIO_TXP_DEFAULT RADIO_TXPOWER_TXPOWER_Neg30dBm
#elif defined(CONFIG_BT_CTLR_TX_PWR_MINUS_40)
#define RADIO_TXP_DEFAULT RADIO_TXPOWER_TXPOWER_Neg40dBm
#elif defined(CONFIG_BT_CTLR_TX_PWR_MINUS_46)
#define RADIO_TXP_DEFAULT RADIO_TXPOWER_TXPOWER_Neg46dBm
#elif defined(CONFIG_BT_CTLR_TX_PWR_MINUS_70)
#define RADIO_TXP_DEFAULT RADIO_TXPOWER_TXPOWER_Neg70dBm
#endif
Loading