samples: direct_test_mode: align to DFE GPIO equal to 7

Some devices has `7` DFE GPIOs rather than `8`.

Signed-off-by: Nikodem Kastelik <[email protected]>

Author: nika-nordic

samples/bluetooth/direct_test_mode/src/dtm_hw.c

@@ -112,8 +112,13 @@ const int8_t nrf_power_value[] = {
 /* Run a macro 'fn' on each available DFE GPIO index, from 0 to
  * MAX_DFE_GPIO-1, with the given parenthesized separator.
  */
-#define FOR_EACH_DFE_GPIO(fn, sep) \
-	FOR_EACH(fn, sep, 0, 1, 2, 3, 4, 5, 6, 7)
+#if DTM_HW_MAX_DFE_GPIO == 8
+#define FOR_EACH_DFE_GPIO(fn, sep) FOR_EACH(fn, sep, 0, 1, 2, 3, 4, 5, 6, 7)
+#elif DTM_HW_MAX_DFE_GPIO == 7
+#define FOR_EACH_DFE_GPIO(fn, sep) FOR_EACH(fn, sep, 0, 1, 2, 3, 4, 5, 6)
+#else
+#error "Unsupported DFE GPIO count"
+#endif
 
 /* The number of dfegpio[n]-gpios properties which are set. */
 #define DFE_GPIO_NUM (FOR_EACH_DFE_GPIO(HAS_DFE_GPIO, (+)))

samples/bluetooth/direct_test_mode/src/dtm_hw.h

@@ -17,7 +17,11 @@ extern "C" {
 #endif
 
 /* Number of PSEL_DFEGPIO[n] registers in the radio peripheral. */
+#if defined(RADIO_PSEL_DFEGPIO_MaxCount)
+#define DTM_HW_MAX_DFE_GPIO RADIO_PSEL_DFEGPIO_MaxCount
+#else
 #define DTM_HW_MAX_DFE_GPIO 8
+#endif
 
 /* Indicates that GPIO pin is not connected to the radio */
 #define DTM_HW_DFE_PSEL_NOT_SET 0xFF

west.yml

@@ -65,7 +65,7 @@ manifest:
     # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
     - name: zephyr
       repo-path: sdk-zephyr
-      revision: pull/2930/head
+      revision: 63b28baebfc909e707d34c9d41f5fd4ef7aa47c7
       import:
         # In addition to the zephyr repository itself, NCS also
         # imports the contents of zephyr/west.yml at the above