Add DutchMeshCore ingestor server presets

.github/workflows/build-repeater-mqtt-firmwares.yml

@@ -0,0 +1,43 @@
+name: Build Repeater MQTT Firmwares
+
+permissions:
+  contents: write
+
+on:
+  workflow_dispatch:
+  push:
+    tags:
+      - 'repeater-mqtt-*'
+
+jobs:
+
+  build:
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Clone Repo
+        uses: actions/checkout@v4
+
+      - name: Setup Build Environment
+        uses: ./.github/actions/setup-build-environment
+
+      - name: Build Firmwares
+        env:
+          FIRMWARE_VERSION: ${{ env.GIT_TAG_VERSION }}
+          OUT_DIR: .prebuilt
+        run: /usr/bin/env bash build.sh build-repeater-mqtt-firmwares
+
+      - name: Upload Workflow Artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: repeater-mqtt-firmwares
+          path: .prebuilt
+
+      - name: Create Release
+        uses: softprops/action-gh-release@v2
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          name: Repeater MQTT Firmware ${{ env.GIT_TAG_VERSION }}
+          body: ""
+          draft: true
+          files: .prebuilt/*

.github/workflows/build-roomserver-mqtt-firmwares.yml

@@ -0,0 +1,43 @@
+name: Build Room Server MQTT Firmwares
+
+permissions:
+  contents: write
+
+on:
+  workflow_dispatch:
+  push:
+    tags:
+      - 'room-server-mqtt-*'
+
+jobs:
+
+  build:
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Clone Repo
+        uses: actions/checkout@v4
+
+      - name: Setup Build Environment
+        uses: ./.github/actions/setup-build-environment
+
+      - name: Build Firmwares
+        env:
+          FIRMWARE_VERSION: ${{ env.GIT_TAG_VERSION }}
+          OUT_DIR: .prebuilt
+        run: /usr/bin/env bash build.sh build-room-server-mqtt-firmwares
+
+      - name: Upload Workflow Artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: room-server-mqtt-firmwares
+          path: .prebuilt
+
+      - name: Create Release
+        uses: softprops/action-gh-release@v2
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          name: Room Server MQTT Firmware ${{ env.GIT_TAG_VERSION }}
+          body: ""
+          draft: true
+          files: .prebuilt/*

MQTT_IMPLEMENTATION.md

@@ -68,7 +68,7 @@ get mqtt.status
 **That's it!** The device will now:
 - Connect to WiFi automatically
 - Start uplinking mesh packets to configured MQTT brokers
-- By default, publish to Let's Mesh Analyzer US (slot 1) and EU (slot 2)
+- By default, publish to the DutchMeshCore presets: `dutchmeshcore-1` in slot 1 and `dutchmeshcore-2` in slot 2
 - Use device name as MQTT origin (set automatically)
 
 ---
@@ -108,13 +108,15 @@ The MQTT bridge uses a slot-based architecture with up to 6 concurrent connectio
 | `chimesh` | wss://mqtt.chimesh.org:443 | JWT (Ed25519) | WSS |
 | `meshat.se` | mqtts://mqtt.meshat.se:8883 | Username/password (fixed in firmware) | MQTT over TLS |
 | `eastidahomesh` | wss://broker.eastidahomesh.net:443 | None | WSS |
+| `dutchmeshcore-1` | wss://collector1.dutchmeshcore.nl:443 | JWT (Ed25519) | WSS |
+| `dutchmeshcore-2` | wss://collector2.dutchmeshcore.nl:443 | JWT (Ed25519) | WSS |
 | `coloradomesh` | wss://mqtt.meshcore.coloradomesh.org:1883 | JWT (Ed25519) | WSS |
 | `custom` | User-configured | Username/Password | MQTT or WSS |
 | `none` | (disabled) | — | — |
 
 **Default Configuration:**
-- Slot 1: `analyzer-us`
-- Slot 2: `analyzer-eu`
+- Slot 1: `dutchmeshcore-1` (DutchMeshCore preset)
+- Slot 2: `dutchmeshcore-2` (DutchMeshCore preset)
 - Slots 3-6: `none`
 
 **Memory Limits:**
@@ -214,8 +216,8 @@ The MQTT bridge comes with the following defaults for fresh installs:
 - **RX Packets**: Enabled (uplink received packets)
 - **TX Packets**: `advert` by default (uplink this node's own adverts; set to `on` for all TX or `off` to disable)
 - **Status Interval**: 5 minutes (300000 ms)
-- **Slot 1**: `analyzer-us`
-- **Slot 2**: `analyzer-eu`
+- **Slot 1**: `dutchmeshcore-1` (DutchMeshCore preset)
+- **Slot 2**: `dutchmeshcore-2` (DutchMeshCore preset)
 - **Slots 3-6**: `none` (disabled)
 - **WiFi SSID**: (blank — must be configured)
 - **WiFi Password**: (blank — must be configured)
@@ -255,6 +257,8 @@ Each slot (1-6) supports the following commands:
 - `set mqttN.preset chimesh` - Set slot N to ChicagolandMesh
 - `set mqttN.preset meshat.se` - Set slot N to Meshat.se
 - `set mqttN.preset eastidahomesh` - Set slot N to EastIdahoMesh (WSS/TLS, no auth; packets on `meshcore/{IATA}/{PUBLIC_KEY}/packets`)
+- `set mqttN.preset dutchmeshcore-1` - Set slot N to DutchMeshcore-1
+- `set mqttN.preset dutchmeshcore-2` - Set slot N to DutchMeshcore-2
 - `set mqttN.preset coloradomesh` - Set slot N to ColoradoMesh
 - `set mqttN.preset custom` - Set slot N to custom broker (configure server/port/username/password)
 - `set mqttN.preset none` - Disable slot N
@@ -627,8 +631,8 @@ set repeat off
 
 ### Step 6: Verify Slot Configuration
 ```
-get mqtt1.preset    # Should show: analyzer-us
-get mqtt2.preset    # Should show: analyzer-eu
+get mqtt1.preset    # Should show: dutchmeshcore-1
+get mqtt2.preset    # Should show: dutchmeshcore-2
 get mqtt3.preset    # Should show: none
 ```
 

boards/heltec_t1.json

@@ -0,0 +1,61 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "nrf52840_s140_v6.ld"
+    },
+    "core": "nRF5",
+    "cpu": "cortex-m4",
+    "extra_flags": "-DNRF52840_XXAA",
+    "f_cpu": "64000000L",
+    "hwids": [
+      ["0x239A","0x8029"],
+      ["0x239A","0x0029"],
+      ["0x239A","0x002A"],
+      ["0x239A","0x802A"]
+    ],
+    "usb_product": "HT-n5262T1",
+    "mcu": "nrf52840",
+    "variant": "heltec_t1",
+    "bsp": {
+      "name": "adafruit"
+    },
+    "softdevice": {
+      "sd_flags": "-DS140",
+      "sd_name": "s140",
+      "sd_version": "6.1.1",
+      "sd_fwid": "0x00B6"
+    },
+    "bootloader": {
+      "settings_addr": "0xFF000"
+    }
+  },
+  "connectivity": [
+    "bluetooth"
+  ],
+  "debug": {
+    "jlink_device": "nRF52840_xxAA",
+    "svd_path": "nrf52840.svd",
+    "openocd_target": "nrf52.cfg"
+  },
+  "frameworks": [
+    "arduino"
+  ],
+  "name": "Heltec Mesh Node T1 Board",
+  "upload": {
+    "maximum_ram_size": 235520,
+    "maximum_size": 815104,
+    "speed": 115200,
+    "protocol": "nrfutil",
+    "protocols": [
+      "jlink",
+      "nrfjprog",
+      "nrfutil",
+      "stlink"
+    ],
+    "use_1200bps_touch": true,
+    "require_upload_port": true,
+    "wait_for_upload_port": true
+  },
+  "url": "https://heltec.org/",
+  "vendor": "Heltec"
+}

boards/lilygo_t_impulse_plus_nrf52840.json

@@ -0,0 +1,64 @@
+{
+  "build": {
+    "arduino":{
+      "ldscript": "nrf52840_s140_v6.ld"
+    },
+    "core": "nRF5",
+    "cpu": "cortex-m4",
+    "extra_flags": "-DARDUINO_NRF52840_T_IMPULSE_PLUS -DNRF52840_XXAA",
+    "f_cpu": "64000000L",
+    "hwids": [
+      [
+        "0x239A",
+        "0x8029"
+      ]
+    ],
+    "usb_product": "T-Impulse-Plus-nRF52840",
+    "mcu": "nrf52840",
+    "variant": "t_impulse_plus_nrf52840",
+    "bsp": {
+      "name": "adafruit"
+    },
+    "softdevice": {
+      "sd_flags": "-DS140",
+      "sd_name": "s140",
+      "sd_version": "6.1.1",
+      "sd_fwid": "0x00B6"
+    },
+    "bootloader": {
+      "settings_addr": "0xFF000"
+    }
+  },
+  "connectivity": [
+    "bluetooth"
+  ],
+  "debug": {
+    "jlink_device": "nRF52840_xxAA",
+    "onboard_tools": [
+      "jlink"
+    ],
+    "svd_path": "nrf52840.svd"
+  },
+  "frameworks": [
+    "arduino"
+  ],
+  "name": "Lilygo T-Impulse-Plus-nRF52840",
+  "upload": {
+    "maximum_ram_size": 248832,
+    "maximum_size": 815104,
+    "require_upload_port": true,
+    "speed": 115200,
+    "protocol": "nrfutil",
+    "protocols": [
+      "jlink",
+      "nrfjprog",
+      "stlink",
+      "cmsis-dap",
+      "blackmagic"
+    ],
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": true
+  },
+  "url": "https://www.lilygo.cc/",
+  "vendor": "Lilygo"
+}

boards/station-g3-esp32.json

@@ -0,0 +1,43 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "esp32s3_out.ld",
+      "memory_type": "qio_opi"
+    },
+    "core": "esp32",
+    "extra_flags": [
+      "-DBOARD_HAS_PSRAM",
+      "-DARDUINO_USB_CDC_ON_BOOT=1",
+      "-DARDUINO_USB_MODE=0",
+      "-DARDUINO_RUNNING_CORE=1",
+      "-DARDUINO_EVENT_RUNNING_CORE=0"
+    ],
+    "f_cpu": "240000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "qio",
+    "hwids": [["0x303A", "0x1001"]],
+    "mcu": "esp32s3",
+    "variant": "esp32s3"
+  },
+  "connectivity": [
+    "wifi"
+  ],
+  "debug": {
+    "default_tool": "esp-builtin",
+    "onboard_tools": ["esp-builtin"],
+    "openocd_target": "esp32s3.cfg"
+  },
+  "frameworks": ["arduino", "espidf"],
+  "name": "Station G3 ESP32",
+  "upload": {
+    "flash_size": "16MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 16777216,
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": true,
+    "require_upload_port": true,
+    "speed": 921600
+  },
+  "url": "https://wiki.bqvoy.com/en/devkits/station-g3",
+  "vendor": "BQ Consulting"
+}

build.sh

@@ -17,6 +17,8 @@ Commands:
   build-companion-firmwares: Build all companion firmwares for all build targets.
   build-repeater-firmwares: Build all repeater firmwares for all build targets.
   build-room-server-firmwares: Build all chat room server firmwares for all build targets.
+  build-repeater-mqtt-firmwares: Build all MQTT repeater observer firmwares for all build targets.
+  build-room-server-mqtt-firmwares: Build all MQTT room server observer firmwares for all build targets.
 
 Examples:
 Build firmware for the "RAK_4631_repeater" device target
@@ -158,12 +160,12 @@ build_firmware() {
     python3 bin/uf2conv/uf2conv.py .pio/build/$1/firmware.hex -c -o .pio/build/$1/firmware.uf2 -f 0xADA52840 >/dev/null 2>&1 || true
   fi
 
-  # Copy any produced artifacts to out folder.
-  cp .pio/build/$1/firmware.bin out/${FIRMWARE_FILENAME}.bin 2>/dev/null || true
-  cp .pio/build/$1/firmware-merged.bin out/${FIRMWARE_FILENAME}-merged.bin 2>/dev/null || true
-  cp .pio/build/$1/firmware.hex out/${FIRMWARE_FILENAME}.hex 2>/dev/null || true
-  cp .pio/build/$1/firmware.uf2 out/${FIRMWARE_FILENAME}.uf2 2>/dev/null || true
-  cp .pio/build/$1/firmware.zip out/${FIRMWARE_FILENAME}.zip 2>/dev/null || true
+  # Copy any produced artifacts to output folder.
+  cp .pio/build/$1/firmware.bin "$OUT_DIR/${FIRMWARE_FILENAME}.bin" 2>/dev/null || true
+  cp .pio/build/$1/firmware-merged.bin "$OUT_DIR/${FIRMWARE_FILENAME}-merged.bin" 2>/dev/null || true
+  cp .pio/build/$1/firmware.hex "$OUT_DIR/${FIRMWARE_FILENAME}.hex" 2>/dev/null || true
+  cp .pio/build/$1/firmware.uf2 "$OUT_DIR/${FIRMWARE_FILENAME}.uf2" 2>/dev/null || true
+  cp .pio/build/$1/firmware.zip "$OUT_DIR/${FIRMWARE_FILENAME}.zip" 2>/dev/null || true
 
 }
 
@@ -229,15 +231,28 @@ build_room_server_firmwares() {
 
 }
 
+build_repeater_mqtt_firmwares() {
+  # build all MQTT repeater observer firmwares
+  build_all_firmwares_by_suffix "_repeater_observer_mqtt"
+}
+
+build_room_server_mqtt_firmwares() {
+  # build all MQTT room server observer firmwares
+  build_all_firmwares_by_suffix "_room_server_observer_mqtt"
+}
+
 build_firmwares() {
   build_companion_firmwares
   build_repeater_firmwares
   build_room_server_firmwares
 }
 
+# output directory — override with OUT_DIR env var (e.g. OUT_DIR=.prebuilt)
+OUT_DIR="${OUT_DIR:-out}"
+
 # clean build dir
-rm -rf out
-mkdir -p out
+rm -rf "$OUT_DIR"
+mkdir -p "$OUT_DIR"
 
 # handle script args
 if [[ $1 == "build-firmware" ]]; then
@@ -265,4 +280,8 @@ elif [[ $1 == "build-repeater-firmwares" ]]; then
   build_repeater_firmwares
 elif [[ $1 == "build-room-server-firmwares" ]]; then
   build_room_server_firmwares
+elif [[ $1 == "build-repeater-mqtt-firmwares" ]]; then
+  build_repeater_mqtt_firmwares
+elif [[ $1 == "build-room-server-mqtt-firmwares" ]]; then
+  build_room_server_mqtt_firmwares
 fi