Resolve some compile-warnings:

Refactor GPIO signal compatibility and update device tree bindings

Author: 13Bytes

fw/nRF/us_probe/boards/nrf52dk_nrf52832.overlay

@@ -25,7 +25,7 @@
     };
 
     spi_ss_pin: spi_ss_pin {
-        compatible = "wulpus,spi-ss";
+        compatible = "wulpus,gpio-signal";
         gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;
         label = "SPI SS Pin";
     };

fw/nRF/us_probe/boards/nrf54l15dk_nrf54l15_cpuapp.overlay

@@ -1,6 +1,5 @@
 / {
     aliases {
-        led0 = &led_nrf54;
         data-ready = &data_ready_pin;
         ble-cnfg-ready = &ble_cnfg_ready_pin;
         spi-conn = &spi20;
@@ -18,17 +17,10 @@
         nordic,nus-uart = &uart30;
     };
 
-    leds {
-        compatible = "gpio-leds";
-        led_nrf54: led_nrf54 {
-            gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
-            label = "NRF54 LED";
-        };
-
-        ble_cnfg_ready_pin: ble_cnfg_ready_pin {
-            gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
-            label = "BLE Configuration Ready Pin";
-        };
+    ble_cnfg_ready_pin: ble_cnfg_ready_pin {
+        compatible = "wulpus,gpio-signal";
+        gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
+        label = "BLE Configuration Ready Pin";
     };
 
     buttons {
@@ -37,18 +29,10 @@
             gpios = <&gpio1 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>;
             label = "Data Ready Pin";
         };
-        dbg_button_2: dbg_button_2 {
-            gpios = <&gpio1 8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
-            label = "Debug Button 2";
-        };
-        dbg_button_3: dbg_button_3 {
-            gpios = <&gpio0 4 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
-            label = "Debug Button 3";
-        };
     };
 
     spi_ss_pin: spi_ss_pin {
-        compatible = "wulpus,spi-ss";
+        compatible = "wulpus,gpio-signal";
         gpios = <&gpio2 5 GPIO_ACTIVE_LOW>;
         label = "SPI SS Pin";
     };

fw/nRF/us_probe/dts/bindings/wulpus,gpio-signal.yaml

@@ -0,0 +1,17 @@
+# Devicetree binding for simple GPIO signals used by the Wulpus probe firmware
+
+compatible: "wulpus,gpio-signal"
+
+description: |
+  Helper node used by the Wulpus probe firmware to locate a GPIO signal via
+  devicetree aliases.
+
+properties:
+  gpios:
+    type: phandle-array
+    required: true
+    description: GPIO specifier for the signal.
+
+  label:
+    type: string
+    required: false

fw/nRF/us_probe/dts/bindings/wulpus,spi-ss.yaml

@@ -1,4 +1,11 @@
+#ifndef HELPER_H
+#define HELPER_H
+
 #include <bluetooth/mesh/models.h>
+#include <stdint.h>
+
+bool own_message(const struct bt_mesh_model *model,
+				 const struct bt_mesh_msg_ctx *ctx);
+void apply_config(const uint8_t *data, uint16_t len);
 
-bool own_message(const struct bt_mesh_model *model, const struct bt_mesh_msg_ctx *ctx);
-void apply_config(uint8_t *const data, uint16_t len);
+#endif // HELPER_H

fw/nRF/us_probe/include/helper.h

@@ -11,9 +11,9 @@
 #define LED_NODE DT_ALIAS(led0)
 #define DATA_READY_NODE DT_ALIAS(data_ready)
 #define BLE_CNFG_READY_NODE DT_ALIAS(ble_cnfg_ready)
-#define DEBUG_LED_NODE DT_ALIAS(debug_led)
-#define DBG_BUTTON_2_NODE DT_NODELABEL(dbg_button_2)
-#define DBG_BUTTON_3_NODE DT_NODELABEL(dbg_button_3)
+#define DEBUG_LED_NODE DT_ALIAS(led1)
+#define DBG_BUTTON_2_NODE DT_ALIAS(sw2)
+#define DBG_BUTTON_3_NODE DT_ALIAS(sw3)
 
 // --- Bluetooth Definitions --------------------
 #define DEVICE_NAME_BASE "WULPUS_PROBE"

fw/nRF/us_probe/include/main.h

@@ -2,6 +2,7 @@
 #define MESH_H
 
 #include "ble.h"
+#include <stdint.h>
 #include <bluetooth/mesh/models.h>
 #include <zephyr/bluetooth/mesh.h>
 #include <zephyr/kernel.h>
@@ -83,4 +84,6 @@ uint32_t mesh_get_network_timestamp(void);
 extern const struct bt_mesh_comp comp;
 extern uint8_t dev_uuid[16];
 
+uint16_t bt_mesh_primary_addr(void);
+
 #endif // MESH_H

fw/nRF/us_probe/include/mesh.h

@@ -14,7 +14,7 @@ bool own_message(const struct bt_mesh_model *model, const struct bt_mesh_msg_ctx
   return elem->rt->addr == ctx->addr;
 }
 
-void apply_config(uint8_t *const data, uint16_t len)
+void apply_config(const uint8_t *data, uint16_t len)
 {
   LOG_INF("Applying new configuration. Len: %d", len);
 

fw/nRF/us_probe/src/helper.c

@@ -19,20 +19,31 @@
 
 LOG_MODULE_REGISTER(main);
 
+#define HAS_DBG_BUTTON_2 DT_NODE_EXISTS(DBG_BUTTON_2_NODE)
+#define HAS_DBG_BUTTON_3 DT_NODE_EXISTS(DBG_BUTTON_3_NODE)
+
 // --- GPIOs ---
 const struct gpio_dt_spec ble_cnfg_ready =
     GPIO_DT_SPEC_GET(BLE_CNFG_READY_NODE, gpios);
 const struct gpio_dt_spec led = GPIO_DT_SPEC_GET(LED_NODE, gpios);
 const struct gpio_dt_spec data_ready = GPIO_DT_SPEC_GET(DATA_READY_NODE, gpios);
+#if HAS_DBG_BUTTON_2
 const struct gpio_dt_spec dbg_button_2 =
     GPIO_DT_SPEC_GET(DBG_BUTTON_2_NODE, gpios);
+#endif
+#if HAS_DBG_BUTTON_3
 const struct gpio_dt_spec dbg_button_3 =
     GPIO_DT_SPEC_GET(DBG_BUTTON_3_NODE, gpios);
+#endif
 
 // callback for data-ready GPIO interrupt, triggering SPIM transfer
 struct gpio_callback data_ready_cb;
+#if HAS_DBG_BUTTON_2
 struct gpio_callback dbg_button_2_cb;
+#endif
+#if HAS_DBG_BUTTON_3
 struct gpio_callback dbg_button_3_cb;
+#endif
 
 int64_t last_gpio_interrupt_time = 0;
 static void gpio_interrupt_handler(const struct device *dev,
@@ -120,17 +131,28 @@ int main(void)
 
     LOG_INF("Initializing GPIOs...");
     if (!gpio_is_ready_dt(&led) || !gpio_is_ready_dt(&data_ready) ||
-        !gpio_is_ready_dt(&ble_cnfg_ready) || !gpio_is_ready_dt(&dbg_button_2) ||
-        !gpio_is_ready_dt(&dbg_button_3))
+        !gpio_is_ready_dt(&ble_cnfg_ready)
+    #if HAS_DBG_BUTTON_2
+        || !gpio_is_ready_dt(&dbg_button_2)
+    #endif
+    #if HAS_DBG_BUTTON_3
+        || !gpio_is_ready_dt(&dbg_button_3)
+    #endif
+        )
     {
         LOG_ERR("GPIO devices not ready.");
         return 0;
     }
     err = gpio_pin_configure_dt(&led, GPIO_OUTPUT_LOW) |
           gpio_pin_configure_dt(&ble_cnfg_ready, GPIO_OUTPUT_LOW) |
-          gpio_pin_configure_dt(&data_ready, GPIO_INPUT) |
-          gpio_pin_configure_dt(&dbg_button_2, GPIO_INPUT) |
-          gpio_pin_configure_dt(&dbg_button_3, GPIO_INPUT);
+          gpio_pin_configure_dt(&data_ready, GPIO_INPUT)
+    #if HAS_DBG_BUTTON_2
+          | gpio_pin_configure_dt(&dbg_button_2, GPIO_INPUT)
+    #endif
+    #if HAS_DBG_BUTTON_3
+          | gpio_pin_configure_dt(&dbg_button_3, GPIO_INPUT)
+    #endif
+          ;
     if (err < 0)
     {
         LOG_ERR("Error configuring GPIO pins");
@@ -149,15 +171,19 @@ int main(void)
         return err;
     }
 
+#if HAS_DBG_BUTTON_2
     gpio_init_callback(&dbg_button_2_cb, dbg_button_2_handler,
                        BIT(dbg_button_2.pin));
     gpio_add_callback_dt(&dbg_button_2, &dbg_button_2_cb);
     gpio_pin_interrupt_configure_dt(&dbg_button_2, GPIO_INT_EDGE_TO_ACTIVE);
+#endif
 
+#if HAS_DBG_BUTTON_3
     gpio_init_callback(&dbg_button_3_cb, dbg_button_3_handler,
                        BIT(dbg_button_3.pin));
     gpio_add_callback_dt(&dbg_button_3, &dbg_button_3_cb);
     gpio_pin_interrupt_configure_dt(&dbg_button_3, GPIO_INT_EDGE_TO_ACTIVE);
+#endif
 
     LOG_INF("Initializing settings subsystem");
     err = settings_subsys_init();

fw/nRF/us_probe/src/main.c

@@ -55,10 +55,12 @@ static uint32_t get_spim_ss_pin(void)
     return NRF_GPIO_PIN_MAP(0, spi_ss_gpio.pin);
   }
 
+#if DT_NODE_EXISTS(DT_NODELABEL(gpio1))
   if (spi_ss_gpio.port == DEVICE_DT_GET(DT_NODELABEL(gpio1)))
   {
     return NRF_GPIO_PIN_MAP(1, spi_ss_gpio.pin);
   }
+#endif
 
 #if DT_NODE_EXISTS(DT_NODELABEL(gpio2))
   if (spi_ss_gpio.port == DEVICE_DT_GET(DT_NODELABEL(gpio2)))