Elektr0Vodka · Oct 16, 2026 · Oct 16, 2026
diff --git a/AGENTS.md b/AGENTS.md
@@ -31,7 +31,7 @@ upstream project and are wrong here on three points:
 | "Reference any related issue (`Fixes #123`)" | Not possible while issues are disabled. |
 
 **In practice this fork is a set of repeater airtime-control features** layered on the upstream
-base (currently synced to `mc/dev`, embedded firmware version `v1.17.1.01`):
+base (currently synced to upstream `v1.18.0`, embedded firmware version `v1.18.0.01`):
 
 - the **repeater packet filter** — `examples/simple_repeater/Filter.{cpp,h}` plus header-only
   `FilterStats.h` / `Limiter.h` (drop statistics + probabilistic soft cutoff);

diff --git a/dmc-docs/custom-cli.de.md b/dmc-docs/custom-cli.de.md
@@ -88,6 +88,13 @@ Nur auf ESP32-Observer-Builds.
   `config`-Topic, gespeichert in `/mqtt.json`), `set mqtt.filter.interval <60-600>`,
   `set mqtt.neighbors <on|off>` + `set mqtt.neighbors.interval <Stunden>` (nur mit PSRAM)
 - **NTP**: `set mqtt.ntp <host|none>`, `get mqtt.ntp.diag`
+- **Netzwerkverbindung**: `get link.status` (Medium, Verbindung, IP, Signal und Uptime;
+  ersetzt `get wifi.status`), `get link.diag` (warum Ethernet oder WiFi gewählt wurde,
+  ThinkNode-M7-Ethernet-Builds), `get link.dns` (aktive DNS-Resolver und Gateway)
+- **Advert-Prüfung**: `set mqtt.advert.verify <on|off>` / `get mqtt.advert.verify`
+  (Adverts mit ungültiger Signatur nicht veröffentlichen; Standard `off`)
+- **Manuelles OTA**: `stop ota` (stoppt einen untätigen `start ota`-Webserver und gibt
+  Port 80 frei; verweigert während eines Uploads)
 
 Veröffentlichte Topics (Suffixe an einem gemeinsamen Prefix): `status`, `packets`,
 `filter`, `neighbors`, `config`.
diff --git a/dmc-docs/custom-cli.en.md b/dmc-docs/custom-cli.en.md
@@ -86,6 +86,13 @@ ESP32 observer builds only.
   `config` topic, stored in `/mqtt.json`), `set mqtt.filter.interval <60-600>`,
   `set mqtt.neighbors <on|off>` + `set mqtt.neighbors.interval <hours>` (PSRAM only)
 - **NTP**: `set mqtt.ntp <host|none>`, `get mqtt.ntp.diag`
+- **Network link**: `get link.status` (medium, connection, IP, signal and uptime;
+  replaces `get wifi.status`), `get link.diag` (why Ethernet or WiFi was chosen,
+  ThinkNode M7 Ethernet builds), `get link.dns` (live DNS resolvers and gateway)
+- **Advert check**: `set mqtt.advert.verify <on|off>` / `get mqtt.advert.verify`
+  (skip publishing adverts whose signature fails; default `off`)
+- **Manual OTA**: `stop ota` (stops an idle `start ota` web server and frees port 80;
+  refuses during an upload)
 
 Published topics (suffixes off a common prefix): `status`, `packets`, `filter`,
 `neighbors`, `config`.
diff --git a/dmc-docs/custom-cli.md b/dmc-docs/custom-cli.md
@@ -88,6 +88,13 @@ Alleen op ESP32 observer-builds.
   `config`-topic, opgeslagen in `/mqtt.json`), `set mqtt.filter.interval <60-600>`,
   `set mqtt.neighbors <on|off>` + `set mqtt.neighbors.interval <uren>` (alleen met PSRAM)
 - **NTP**: `set mqtt.ntp <host|none>`, `get mqtt.ntp.diag`
+- **Netwerkverbinding**: `get link.status` (medium, verbinding, IP, signaal en uptime;
+  vervangt `get wifi.status`), `get link.diag` (waarom Ethernet of wifi is gekozen,
+  ThinkNode M7-Ethernet-builds), `get link.dns` (actieve DNS-resolvers en gateway)
+- **Advertcontrole**: `set mqtt.advert.verify <on|off>` / `get mqtt.advert.verify`
+  (publiceer geen adverts waarvan de handtekening niet klopt; standaard `off`)
+- **Handmatige OTA**: `stop ota` (stopt een inactieve `start ota`-webserver en geeft
+  poort 80 vrij; weigert tijdens een upload)
 
 Gepubliceerde topics (suffixen op een gemeenschappelijk prefix): `status`, `packets`,
 `filter`, `neighbors`, `config`.
diff --git a/dmc-docs/index.de.md b/dmc-docs/index.de.md
@@ -30,8 +30,9 @@ die DMC zusätzlich zu Upstream bereitstellt, stehen in [Custom CLI](custom-cli.
 DutchMeshCore ist ein reiner Downstream-Fork von
 [meshcore-dev/MeshCore](https://github.com/meshcore-dev/MeshCore). Änderungen fließen von
 Upstream ein, nie umgekehrt. Der Basis-Branch ist `dmc-dev`, aktuell mit der
-Upstream-Firmware `v1.17.1` und DMC-Patchstand `.01` synchronisiert (Builds tragen die
-Kennung `v1.17.1.01-dutchmeshcore.nl-<hash>`). Diese Seite dokumentiert die
+Upstream-Firmware `v1.18.0` synchronisiert (Quellversion `v1.18.0.01`). Builds melden
+zum Beispiel `v1.18.0-dutchmeshcore.nl-<hash>`; Dev-Builds tragen eine Kanalmarkierung:
+`v1.18.0-dev-dutchmeshcore.nl-<hash>`. Diese Seite dokumentiert die
 DMC-Ergänzungen; allgemeine MeshCore-Konzepte findest du im Upstream-Projekt.
 
 ## DutchMeshCore-Verweise

diff --git a/dmc-docs/index.en.md b/dmc-docs/index.en.md
@@ -30,8 +30,9 @@ commands DMC adds on top of upstream are in [Custom CLI](custom-cli.md).
 DutchMeshCore is a downstream-only fork of
 [meshcore-dev/MeshCore](https://github.com/meshcore-dev/MeshCore). Changes flow in from
 upstream, never the other way. The base branch is `dmc-dev`, currently synced to upstream
-firmware `v1.17.1` with DMC patch revision `.01` (builds carry the brand
-`v1.17.1.01-dutchmeshcore.nl-<hash>`). This site documents the DMC additions; for general
+firmware `v1.18.0` (source version `v1.18.0.01`). Builds report for example
+`v1.18.0-dutchmeshcore.nl-<hash>`; dev builds carry a channel marker:
+`v1.18.0-dev-dutchmeshcore.nl-<hash>`. This site documents the DMC additions; for general
 MeshCore concepts, see the upstream project.
 
 ## DutchMeshCore references

diff --git a/dmc-docs/index.md b/dmc-docs/index.md
@@ -30,8 +30,9 @@ commando's die DMC bovenop upstream toevoegt staan in [Custom CLI](custom-cli.md
 DutchMeshCore is een downstream-only fork van
 [meshcore-dev/MeshCore](https://github.com/meshcore-dev/MeshCore). Wijzigingen komen
 vanuit upstream binnen, nooit andersom. De basisbranch is `dmc-dev`, momenteel
-gesynchroniseerd met upstream firmware `v1.17.1` met DMC-patchrevisie `.01` (builds
-dragen het merk `v1.17.1.01-dutchmeshcore.nl-<hash>`). Deze site documenteert de
+gesynchroniseerd met upstream firmware `v1.18.0` (bronversie `v1.18.0.01`). Builds
+melden bijvoorbeeld `v1.18.0-dutchmeshcore.nl-<hash>`; dev-builds dragen een
+kanaalmarkering: `v1.18.0-dev-dutchmeshcore.nl-<hash>`. Deze site documenteert de
 DMC-toevoegingen; voor algemene MeshCore-concepten verwijzen we naar het
 upstream-project.
 

diff --git a/dmc-docs/local-builds.de.md b/dmc-docs/local-builds.de.md
@@ -45,8 +45,9 @@ pio device monitor --port <PORT> --baud 115200
 
 ## Release-artige Builds
 
-`build.sh` erzeugt gekennzeichnete Artefakte mit der markanten Versionskennung
-`v1.17.1.01-dutchmeshcore.nl-<hash>`.
+`build.sh` erzeugt gekennzeichnete Artefakte. Mit `FIRMWARE_VERSION=v1.18.0` meldet der Node
+`v1.18.0-dutchmeshcore.nl-<hash>` in `ver`, mit `DMC_CHANNEL=dev`
+`v1.18.0-dev-dutchmeshcore.nl-<hash>`. Der Dateiname bleibt `<env>-v1.18.0-<hash>.bin`.
 
 ## Funk-Standardwerte
 

diff --git a/dmc-docs/local-builds.en.md b/dmc-docs/local-builds.en.md
@@ -44,8 +44,9 @@ pio device monitor --port <PORT> --baud 115200
 
 ## Release-style builds
 
-`build.sh` produces branded artifacts with the distinctive version string
-`v1.17.1.01-dutchmeshcore.nl-<hash>`.
+`build.sh` produces branded artifacts. With `FIRMWARE_VERSION=v1.18.0` the node reports
+`v1.18.0-dutchmeshcore.nl-<hash>` in `ver`, or `v1.18.0-dev-dutchmeshcore.nl-<hash>` with
+`DMC_CHANNEL=dev`. The file name stays `<env>-v1.18.0-<hash>.bin`.
 
 ## Radio defaults
 

diff --git a/dmc-docs/local-builds.md b/dmc-docs/local-builds.md
@@ -45,8 +45,9 @@ pio device monitor --port <PORT> --baud 115200
 
 ## Release-achtige builds
 
-`build.sh` maakt gemerkte artefacten met de kenmerkende versienaam
-`v1.17.1.01-dutchmeshcore.nl-<hash>`.
+`build.sh` maakt gemerkte artefacten. Met `FIRMWARE_VERSION=v1.18.0` meldt de node
+`v1.18.0-dutchmeshcore.nl-<hash>` in `ver`, of `v1.18.0-dev-dutchmeshcore.nl-<hash>` met
+`DMC_CHANNEL=dev`. De bestandsnaam blijft `<env>-v1.18.0-<hash>.bin`.
 
 ## Radio-standaarden
 

diff --git a/dmc-docs/releases.de.md b/dmc-docs/releases.de.md
@@ -15,7 +15,8 @@ flasht du mit dem Web-Flasher.
 ## Firmware-Tracks
 
 DMC hat drei Tracks, jeweils auf einem Branch basierend. Alle drei sind Repeater-Firmware;
-DMC liefert keine Companion-Firmware.
+DMC liefert keine Companion-Firmware. Für einen Companion mit Empfangsfilter, SNMP und OTA
+siehe [Meshcomod (EV Fork)](https://github.com/Elektr0Vodka/meshcomod) (Pre-Release, auch im Toolbox-Flasher).
 
 | Track (Branch) | Was es ist | Enthält |
 | --- | --- | --- |
@@ -26,6 +27,15 @@ DMC liefert keine Companion-Firmware.
 Im Observer-Track bekommen Repeater alles; Room Server bekommen MQTT und OTA, aber keinen
 Filter, da ein Room Server per Definition nicht repeatet.
 
+## Stabile und Dev-Releases
+
+- **Stabil**: ein Release pro Version, zum Beispiel `dmc-repeater-v1.17.1`.
+- **Dev**: rollierende Pre-Releases, die vom Branch an Ort und Stelle neu gebaut werden:
+  `dmc-repeater-dev`, `dmc-repeater-packetlog-dev` und `observer-mqtt-dev`. Sie laufen jetzt
+  auf `v1.18.0` (Upstream-MeshCore v1.18.0, zusammengeführt am 2026-10-15). Ein Dev-Build
+  meldet `v1.18.0-dev-dutchmeshcore.nl-<hash>` in `ver`; der Dateiname hat kein `-dev`.
+  Der Toolbox-Flasher zeigt sie als `1.18.0-dev`.
+
 ## Dateiauswahl
 
 - `*.bin`: inkrementelles Update für ein Gerät, das bereits DMC-Firmware ausführt.

diff --git a/dmc-docs/releases.en.md b/dmc-docs/releases.en.md
@@ -14,7 +14,8 @@ flash is the web flasher.
 ## Firmware tracks
 
 DMC has three tracks, each based on a branch. All three are repeater firmware; DMC does
-not ship companion firmware.
+not ship companion firmware. For a companion with a receive filter, SNMP and OTA, see
+[Meshcomod (EV Fork)](https://github.com/Elektr0Vodka/meshcomod) (pre-release, also in the Toolbox flasher).
 
 | Track (branch) | What it is | Includes |
 | --- | --- | --- |
@@ -25,6 +26,15 @@ not ship companion firmware.
 In the observer track, repeaters get everything; room servers get MQTT and OTA but no
 filter, because a room server does not repeat by definition.
 
+## Stable and dev releases
+
+- **Stable**: one release per version, for example `dmc-repeater-v1.17.1`.
+- **Dev**: rolling pre-releases rebuilt in place from the branch: `dmc-repeater-dev`,
+  `dmc-repeater-packetlog-dev` and `observer-mqtt-dev`. They now run `v1.18.0` (upstream
+  MeshCore v1.18.0, merged on 2026-10-15). A dev build reports
+  `v1.18.0-dev-dutchmeshcore.nl-<hash>` in `ver`; the file name has no `-dev`. The
+  Toolbox flasher lists them as `1.18.0-dev`.
+
 ## File selection
 
 - `*.bin`: incremental update for a device already running DMC firmware.

diff --git a/dmc-docs/releases.md b/dmc-docs/releases.md
@@ -15,7 +15,8 @@ eenvoudigste manier om te flashen is de webflasher.
 ## Firmware-tracks
 
 DMC kent drie tracks, elk gebaseerd op een branch. Alle drie zijn repeater-firmware; DMC
-levert geen companion-firmware.
+levert geen companion-firmware. Zoek je een companion met ontvangstfilter, SNMP en OTA, kijk
+dan naar [Meshcomod (EV Fork)](https://github.com/Elektr0Vodka/meshcomod) (pre-release, staat ook in de Toolbox-flasher).
 
 | Track (branch) | Wat het is | Bevat |
 | --- | --- | --- |
@@ -26,6 +27,15 @@ levert geen companion-firmware.
 In de observer-track krijgen repeaters alles; room servers krijgen wel MQTT en OTA maar
 geen filter, omdat een room server per definitie niet repeat.
 
+## Stabiele en dev-releases
+
+- **Stabiel**: een release per versie, bijvoorbeeld `dmc-repeater-v1.17.1`.
+- **Dev**: doorlopende pre-releases die vanaf de branch ter plekke opnieuw worden gebouwd:
+  `dmc-repeater-dev`, `dmc-repeater-packetlog-dev` en `observer-mqtt-dev`. Ze draaien nu op
+  `v1.18.0` (upstream MeshCore v1.18.0, samengevoegd op 2026-10-15). Een dev-build meldt
+  `v1.18.0-dev-dutchmeshcore.nl-<hash>` in `ver`; de bestandsnaam heeft geen `-dev`. De
+  Toolbox-flasher toont ze als `1.18.0-dev`.
+
 ## Bestandskeuze
 
 - `*.bin`: incrementele update voor een apparaat dat al DMC-firmware draait.

diff --git a/dmc-docs/web-panel.de.md b/dmc-docs/web-panel.de.md
@@ -50,6 +50,8 @@ ohne manuellen Upload:
 - `ota branch default`: Kanal-Override löschen.
 - `ota update`: verfügbare Build herunterladen und flashen.
 
+Der Node meldet die Kanäle als `beta` (= `dev`) und `prod` (= `stable`); `ota branch beta` und `ota branch prod` funktionieren ebenfalls.
+
 Diese `ota`-Befehle sind nur auf Observer-Builds verfügbar.
 
 ## Hinweise

diff --git a/dmc-docs/web-panel.en.md b/dmc-docs/web-panel.en.md
@@ -49,6 +49,8 @@ a manual upload:
 - `ota branch default`: clear the channel override.
 - `ota update`: download the available build and flash it.
 
+The node reports the channels as `beta` (= `dev`) and `prod` (= `stable`); `ota branch beta` and `ota branch prod` work too.
+
 These `ota` commands are available on observer builds only.
 
 ## Notes

diff --git a/dmc-docs/web-panel.md b/dmc-docs/web-panel.md
@@ -50,6 +50,8 @@ zonder handmatige upload:
 - `ota branch default`: wis de kanaaloverride.
 - `ota update`: download de beschikbare build en flash die.
 
+De node meldt de kanalen als `beta` (= `dev`) en `prod` (= `stable`); `ota branch beta` en `ota branch prod` werken ook.
+
 Deze `ota`-commando's zijn alleen beschikbaar op observer-builds.
 
 ## Opmerkingen