Skip to content

Commit bb5186c

Browse files
maje-embrlubos
authored andcommitted
samples: peripheral: radio_test: Align Radio TX power levels
Adjusted the radio transmit power levels with nrfx-3.7.0 release. Ref: NCSDK-29120 Signed-off-by: Marcin Jelinski <[email protected]>
1 parent b76d274 commit bb5186c

File tree

2 files changed

+59
-11
lines changed

2 files changed

+59
-11
lines changed

samples/peripheral/radio_test/src/radio_cmd.c

Lines changed: 40 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -837,19 +837,35 @@ static void cmd_neg16dbm(const struct shell *shell, size_t argc, char **argv)
837837
shell_print(shell, "TX power : %d dBm", config.txpower);
838838
}
839839

840+
#if defined(RADIO_TXPOWER_TXPOWER_Neg18dBm)
841+
static void cmd_neg18dbm(const struct shell *shell, size_t argc, char **argv)
842+
{
843+
config.txpower = -18;
844+
shell_print(shell, "TX power : %d dBm", config.txpower);
845+
}
846+
#endif /* defined(RADIO_TXPOWER_TXPOWER_Neg18dBm) */
847+
840848
static void cmd_neg20dbm(const struct shell *shell, size_t argc, char **argv)
841849
{
842850
config.txpower = -20;
843851
shell_print(shell, "TX power : %d dBm", config.txpower);
844852
}
845853

846-
#if defined(RADIO_TXPOWER_TXPOWER_Neg26dBm)
847-
static void cmd_neg26dbm(const struct shell *shell, size_t argc, char **argv)
854+
#if defined(RADIO_TXPOWER_TXPOWER_Neg22dBm)
855+
static void cmd_neg22dbm(const struct shell *shell, size_t argc, char **argv)
856+
{
857+
config.txpower = -22;
858+
shell_print(shell, "TX power : %d dBm", config.txpower);
859+
}
860+
#endif /* defined(RADIO_TXPOWER_TXPOWER_Neg22dBm) */
861+
862+
#if defined(RADIO_TXPOWER_TXPOWER_Neg28dBm)
863+
static void cmd_neg28dbm(const struct shell *shell, size_t argc, char **argv)
848864
{
849-
config.txpower = -26;
865+
config.txpower = -28;
850866
shell_print(shell, "TX power : %d dBm", config.txpower);
851867
}
852-
#endif /* defined(RADIO_TXPOWER_TXPOWER_Neg26dBm) */
868+
#endif /* defined(RADIO_TXPOWER_TXPOWER_Neg28dBm) */
853869

854870
#if defined(RADIO_TXPOWER_TXPOWER_Neg30dBm)
855871
static void cmd_neg30dbm(const struct shell *shell, size_t argc, char **argv)
@@ -881,6 +897,14 @@ static void cmd_neg70dbm(const struct shell *shell, size_t argc, char **argv)
881897
}
882898
#endif /* defined(RADIO_TXPOWER_TXPOWER_Neg70dBm) */
883899

900+
#if defined(RADIO_TXPOWER_TXPOWER_Neg100dBm)
901+
static void cmd_neg100dbm(const struct shell *shell, size_t argc, char **argv)
902+
{
903+
config.txpower = -100;
904+
shell_print(shell, "TX power : %d dBm", config.txpower);
905+
}
906+
#endif /* defined(RADIO_TXPOWER_TXPOWER_Neg100dBm) */
907+
884908
static int cmd_nrf_1mbit(const struct shell *shell, size_t argc, char **argv)
885909
{
886910
config.mode = NRF_RADIO_MODE_NRF_1MBIT;
@@ -1254,10 +1278,16 @@ SHELL_STATIC_SUBCMD_SET_CREATE(sub_output_power,
12541278
SHELL_CMD(neg14dBm, NULL, "TX power: -14 dBm", cmd_neg14dbm),
12551279
#endif /* defined(RADIO_TXPOWER_TXPOWER_Neg14dBm) */
12561280
SHELL_CMD(neg16dBm, NULL, "TX power: -16 dBm", cmd_neg16dbm),
1281+
#if defined(RADIO_TXPOWER_TXPOWER_Neg18dBm)
1282+
SHELL_CMD(neg18dBm, NULL, "TX power: -18 dBm", cmd_neg18dbm),
1283+
#endif /* defined(RADIO_TXPOWER_TXPOWER_Neg18dBm) */
12571284
SHELL_CMD(neg20dBm, NULL, "TX power: -20 dBm", cmd_neg20dbm),
1258-
#if defined(RADIO_TXPOWER_TXPOWER_Neg26dBm)
1259-
SHELL_CMD(neg26dBm, NULL, "TX power: -26 dBm", cmd_neg26dbm),
1260-
#endif /* defined(RADIO_TXPOWER_TXPOWER_Neg26dBm) */
1285+
#if defined(RADIO_TXPOWER_TXPOWER_Neg22dBm)
1286+
SHELL_CMD(neg22dBm, NULL, "TX power: -22 dBm", cmd_neg22dbm),
1287+
#endif /* defined(RADIO_TXPOWER_TXPOWER_Neg22dBm) */
1288+
#if defined(RADIO_TXPOWER_TXPOWER_Neg28dBm)
1289+
SHELL_CMD(neg28dBm, NULL, "TX power: -28 dBm", cmd_neg28dbm),
1290+
#endif /* defined(RADIO_TXPOWER_TXPOWER_Neg28dBm) */
12611291
#if defined(RADIO_TXPOWER_TXPOWER_Neg30dBm)
12621292
SHELL_CMD(neg30dBm, NULL, "TX power: -30 dBm", cmd_neg30dbm),
12631293
#endif /* defined(RADIO_TXPOWER_TXPOWER_Neg30dBm) */
@@ -1268,6 +1298,9 @@ SHELL_STATIC_SUBCMD_SET_CREATE(sub_output_power,
12681298
#if defined(RADIO_TXPOWER_TXPOWER_Neg70dBm)
12691299
SHELL_CMD(neg70dBm, NULL, "TX power: -70 dBm", cmd_neg70dbm),
12701300
#endif /* defined(RADIO_TXPOWER_TXPOWER_Neg70dBm) */
1301+
#if defined(RADIO_TXPOWER_TXPOWER_Neg100dBm)
1302+
SHELL_CMD(neg100dBm, NULL, "TX power: -100 dBm", cmd_neg100dbm),
1303+
#endif /* defined(RADIO_TXPOWER_TXPOWER_Neg100dBm) */
12711304
SHELL_SUBCMD_SET_END
12721305
);
12731306

samples/peripheral/radio_test/src/radio_test.c

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,11 @@ static uint16_t channel_to_frequency(nrf_radio_mode_t mode, uint8_t channel)
138138
static nrf_radio_txpower_t dbm_to_nrf_radio_txpower(int8_t tx_power)
139139
{
140140
switch (tx_power) {
141+
#if defined(RADIO_TXPOWER_TXPOWER_Neg100dBm)
142+
case -100:
143+
return RADIO_TXPOWER_TXPOWER_Neg100dBm;
144+
#endif /* defined(RADIO_TXPOWER_TXPOWER_Neg100dBm) */
145+
141146
#if defined(RADIO_TXPOWER_TXPOWER_Neg70dBm)
142147
case -70:
143148
return RADIO_TXPOWER_TXPOWER_Neg70dBm;
@@ -156,14 +161,24 @@ static nrf_radio_txpower_t dbm_to_nrf_radio_txpower(int8_t tx_power)
156161
return RADIO_TXPOWER_TXPOWER_Neg30dBm;
157162
#endif /* defined(RADIO_TXPOWER_TXPOWER_Neg30dBm) */
158163

159-
#if defined(RADIO_TXPOWER_TXPOWER_Neg26dBm)
160-
case -26:
161-
return RADIO_TXPOWER_TXPOWER_Neg26dBm;
162-
#endif /* defined(RADIO_TXPOWER_TXPOWER_Neg26dBm) */
164+
#if defined(RADIO_TXPOWER_TXPOWER_Neg28dBm)
165+
case -28:
166+
return RADIO_TXPOWER_TXPOWER_Neg28dBm;
167+
#endif /* defined(RADIO_TXPOWER_TXPOWER_Neg28dBm) */
168+
169+
#if defined(RADIO_TXPOWER_TXPOWER_Neg22dBm)
170+
case -22:
171+
return RADIO_TXPOWER_TXPOWER_Neg22dBm;
172+
#endif /* defined(RADIO_TXPOWER_TXPOWER_Neg22dBm) */
163173

164174
case -20:
165175
return RADIO_TXPOWER_TXPOWER_Neg20dBm;
166176

177+
#if defined(RADIO_TXPOWER_TXPOWER_Neg18dBm)
178+
case -18:
179+
return RADIO_TXPOWER_TXPOWER_Neg18dBm;
180+
#endif /* defined(RADIO_TXPOWER_TXPOWER_Neg18dBm) */
181+
167182
case -16:
168183
return RADIO_TXPOWER_TXPOWER_Neg16dBm;
169184

0 commit comments

Comments
 (0)