Skip to content

Commit

Permalink
samples: peripheral: radio_test: Align Radio TX power levels
Browse files Browse the repository at this point in the history 
Adjusted the radio transmit power levels with nrfx-3.7.0 release.

Ref: NCSDK-29120

Signed-off-by: Marcin Jelinski <[email protected]>
  • Loading branch information
@maje-emb @rlubos
maje-emb authored and rlubos committed Oct 14, 2024
1 parent b76d274 commit bb5186c
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 11 deletions.
47 changes: 40 additions & 7 deletions samples/peripheral/radio_test/src/radio_cmd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -837,19 +837,35 @@ static void cmd_neg16dbm(const struct shell *shell, size_t argc, char **argv)
shell_print(shell, "TX power : %d dBm", config.txpower);
}

#if defined(RADIO_TXPOWER_TXPOWER_Neg18dBm)
static void cmd_neg18dbm(const struct shell *shell, size_t argc, char **argv)
{
config.txpower = -18;
shell_print(shell, "TX power : %d dBm", config.txpower);
}
#endif /* defined(RADIO_TXPOWER_TXPOWER_Neg18dBm) */

static void cmd_neg20dbm(const struct shell *shell, size_t argc, char **argv)
{
config.txpower = -20;
shell_print(shell, "TX power : %d dBm", config.txpower);
}

#if defined(RADIO_TXPOWER_TXPOWER_Neg26dBm)
static void cmd_neg26dbm(const struct shell *shell, size_t argc, char **argv)
#if defined(RADIO_TXPOWER_TXPOWER_Neg22dBm)
static void cmd_neg22dbm(const struct shell *shell, size_t argc, char **argv)
{
config.txpower = -22;
shell_print(shell, "TX power : %d dBm", config.txpower);
}
#endif /* defined(RADIO_TXPOWER_TXPOWER_Neg22dBm) */

#if defined(RADIO_TXPOWER_TXPOWER_Neg28dBm)
static void cmd_neg28dbm(const struct shell *shell, size_t argc, char **argv)
{
config.txpower = -26;
config.txpower = -28;
shell_print(shell, "TX power : %d dBm", config.txpower);
}
#endif /* defined(RADIO_TXPOWER_TXPOWER_Neg26dBm) */
#endif /* defined(RADIO_TXPOWER_TXPOWER_Neg28dBm) */

#if defined(RADIO_TXPOWER_TXPOWER_Neg30dBm)
static void cmd_neg30dbm(const struct shell *shell, size_t argc, char **argv)
Expand Down Expand Up @@ -881,6 +897,14 @@ static void cmd_neg70dbm(const struct shell *shell, size_t argc, char **argv)
}
#endif /* defined(RADIO_TXPOWER_TXPOWER_Neg70dBm) */

#if defined(RADIO_TXPOWER_TXPOWER_Neg100dBm)
static void cmd_neg100dbm(const struct shell *shell, size_t argc, char **argv)
{
config.txpower = -100;
shell_print(shell, "TX power : %d dBm", config.txpower);
}
#endif /* defined(RADIO_TXPOWER_TXPOWER_Neg100dBm) */

static int cmd_nrf_1mbit(const struct shell *shell, size_t argc, char **argv)
{
config.mode = NRF_RADIO_MODE_NRF_1MBIT;
Expand Down Expand Up @@ -1254,10 +1278,16 @@ SHELL_STATIC_SUBCMD_SET_CREATE(sub_output_power,
SHELL_CMD(neg14dBm, NULL, "TX power: -14 dBm", cmd_neg14dbm),
#endif /* defined(RADIO_TXPOWER_TXPOWER_Neg14dBm) */
SHELL_CMD(neg16dBm, NULL, "TX power: -16 dBm", cmd_neg16dbm),
#if defined(RADIO_TXPOWER_TXPOWER_Neg18dBm)
SHELL_CMD(neg18dBm, NULL, "TX power: -18 dBm", cmd_neg18dbm),
#endif /* defined(RADIO_TXPOWER_TXPOWER_Neg18dBm) */
SHELL_CMD(neg20dBm, NULL, "TX power: -20 dBm", cmd_neg20dbm),
#if defined(RADIO_TXPOWER_TXPOWER_Neg26dBm)
SHELL_CMD(neg26dBm, NULL, "TX power: -26 dBm", cmd_neg26dbm),
#endif /* defined(RADIO_TXPOWER_TXPOWER_Neg26dBm) */
#if defined(RADIO_TXPOWER_TXPOWER_Neg22dBm)
SHELL_CMD(neg22dBm, NULL, "TX power: -22 dBm", cmd_neg22dbm),
#endif /* defined(RADIO_TXPOWER_TXPOWER_Neg22dBm) */
#if defined(RADIO_TXPOWER_TXPOWER_Neg28dBm)
SHELL_CMD(neg28dBm, NULL, "TX power: -28 dBm", cmd_neg28dbm),
#endif /* defined(RADIO_TXPOWER_TXPOWER_Neg28dBm) */
#if defined(RADIO_TXPOWER_TXPOWER_Neg30dBm)
SHELL_CMD(neg30dBm, NULL, "TX power: -30 dBm", cmd_neg30dbm),
#endif /* defined(RADIO_TXPOWER_TXPOWER_Neg30dBm) */
Expand All @@ -1268,6 +1298,9 @@ SHELL_STATIC_SUBCMD_SET_CREATE(sub_output_power,
#if defined(RADIO_TXPOWER_TXPOWER_Neg70dBm)
SHELL_CMD(neg70dBm, NULL, "TX power: -70 dBm", cmd_neg70dbm),
#endif /* defined(RADIO_TXPOWER_TXPOWER_Neg70dBm) */
#if defined(RADIO_TXPOWER_TXPOWER_Neg100dBm)
SHELL_CMD(neg100dBm, NULL, "TX power: -100 dBm", cmd_neg100dbm),
#endif /* defined(RADIO_TXPOWER_TXPOWER_Neg100dBm) */
SHELL_SUBCMD_SET_END
);

Expand Down
23 changes: 19 additions & 4 deletions samples/peripheral/radio_test/src/radio_test.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,11 @@ static uint16_t channel_to_frequency(nrf_radio_mode_t mode, uint8_t channel)
static nrf_radio_txpower_t dbm_to_nrf_radio_txpower(int8_t tx_power)
{
switch (tx_power) {
#if defined(RADIO_TXPOWER_TXPOWER_Neg100dBm)
case -100:
return RADIO_TXPOWER_TXPOWER_Neg100dBm;
#endif /* defined(RADIO_TXPOWER_TXPOWER_Neg100dBm) */

#if defined(RADIO_TXPOWER_TXPOWER_Neg70dBm)
case -70:
return RADIO_TXPOWER_TXPOWER_Neg70dBm;
Expand All @@ -156,14 +161,24 @@ static nrf_radio_txpower_t dbm_to_nrf_radio_txpower(int8_t tx_power)
return RADIO_TXPOWER_TXPOWER_Neg30dBm;
#endif /* defined(RADIO_TXPOWER_TXPOWER_Neg30dBm) */

#if defined(RADIO_TXPOWER_TXPOWER_Neg26dBm)
case -26:
return RADIO_TXPOWER_TXPOWER_Neg26dBm;
#endif /* defined(RADIO_TXPOWER_TXPOWER_Neg26dBm) */
#if defined(RADIO_TXPOWER_TXPOWER_Neg28dBm)
case -28:
return RADIO_TXPOWER_TXPOWER_Neg28dBm;
#endif /* defined(RADIO_TXPOWER_TXPOWER_Neg28dBm) */

#if defined(RADIO_TXPOWER_TXPOWER_Neg22dBm)
case -22:
return RADIO_TXPOWER_TXPOWER_Neg22dBm;
#endif /* defined(RADIO_TXPOWER_TXPOWER_Neg22dBm) */

case -20:
return RADIO_TXPOWER_TXPOWER_Neg20dBm;

#if defined(RADIO_TXPOWER_TXPOWER_Neg18dBm)
case -18:
return RADIO_TXPOWER_TXPOWER_Neg18dBm;
#endif /* defined(RADIO_TXPOWER_TXPOWER_Neg18dBm) */

case -16:
return RADIO_TXPOWER_TXPOWER_Neg16dBm;

Expand Down

0 comments on commit bb5186c

Please sign in to comment.