From 9d104e8a10393e51725d02e083caa50f90bb87f5 Mon Sep 17 00:00:00 2001 From: Nordic Builder Date: Tue, 8 Oct 2024 08:03:12 +0000 Subject: [PATCH 1/2] manifest: Update sdk-zephyr revision (auto-manifest PR) Automatically created by Github Action Signed-off-by: Nordic Builder --- west.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/west.yml b/west.yml index 6ccae13f46c2..f33e6e6dc9dd 100644 --- a/west.yml +++ b/west.yml @@ -72,7 +72,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: d3d3f66845737630687c9018cdb687319b74ec17 + revision: pull/2076/head import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above From 021a82d75f03edfc447eda33933b65c808e78aae Mon Sep 17 00:00:00 2001 From: Robert Lubos Date: Mon, 14 Oct 2024 21:37:11 +0200 Subject: [PATCH 2/2] samples: bluetooth: Fix RADIO_TXPOWER_* symbols typo Fix typos in RADIO_TXPOWER_* symbols. Signed-off-by: Robert Lubos --- samples/bluetooth/direct_test_mode/src/dtm.c | 4 ++-- west.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/samples/bluetooth/direct_test_mode/src/dtm.c b/samples/bluetooth/direct_test_mode/src/dtm.c index 4b7ec8585dc6..f79ed1c7f8c5 100644 --- a/samples/bluetooth/direct_test_mode/src/dtm.c +++ b/samples/bluetooth/direct_test_mode/src/dtm.c @@ -778,7 +778,7 @@ static nrf_radio_txpower_t dbm_to_nrf_radio_txpower(int8_t tx_power) #if defined(RADIO_TXPOWER_TXPOWER_Neg22dBm) case -22: - return RADIO_TXPOWER_TXPOWER_Neg22Bm; + return RADIO_TXPOWER_TXPOWER_Neg22dBm; #endif /* defined(RADIO_TXPOWER_TXPOWER_Neg22dBm) */ case -20: @@ -786,7 +786,7 @@ static nrf_radio_txpower_t dbm_to_nrf_radio_txpower(int8_t tx_power) #if defined(RADIO_TXPOWER_TXPOWER_Neg18dBm) case -18: - return RADIO_TXPOWER_TXPOWER_Neg18Bm; + return RADIO_TXPOWER_TXPOWER_Neg18dBm; #endif /* defined(RADIO_TXPOWER_TXPOWER_Neg18dBm) */ case -16: diff --git a/west.yml b/west.yml index f33e6e6dc9dd..288a260fbd22 100644 --- a/west.yml +++ b/west.yml @@ -72,7 +72,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: pull/2076/head + revision: 2a679b95faef5dd1e5a46d6710d7059b6042758c import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above