diff --git a/.github/actions/setup-build-environment/action.yml b/.github/actions/setup-build-environment/action.yml index cc9097d4..3354c260 100644 --- a/.github/actions/setup-build-environment/action.yml +++ b/.github/actions/setup-build-environment/action.yml @@ -43,14 +43,14 @@ runs: # Active release tag formats: # companion-wifi-v1.15.0 # repeater-bridge-espnow-v1.15.0 - # observer-bridge-espnow-eastmesh-v2026.5.1 + # observer-eastmesh-bridge-espnow-v2026.5.1 # observer-eastmesh-v2026.5.1 # with OFFICIAL_MESHCORE_VERSION=v1.15.0 configured as a GitHub variable. # # This exports: # companion-wifi-v1.15.0 -> FIRMWARE_VERSION=v1.15.0, RELEASE_VERSION=v1.15.0 # repeater-bridge-espnow-v1.15.0 -> FIRMWARE_VERSION=v1.15.0, RELEASE_VERSION=v1.15.0 - # observer-bridge-espnow-eastmesh-v2026.5.1 -> FIRMWARE_VERSION=v1.15.0, EASTMESH_VERSION=v2026.5.1, + # observer-eastmesh-bridge-espnow-v2026.5.1 -> FIRMWARE_VERSION=v1.15.0, EASTMESH_VERSION=v2026.5.1, # RELEASE_VERSION=v1.15.0-eastmesh-v2026.5.1 # observer-eastmesh-v2026.5.1 -> FIRMWARE_VERSION=v1.15.0, EASTMESH_VERSION=v2026.5.1, # RELEASE_VERSION=v1.15.0-eastmesh-v2026.5.1 @@ -79,7 +79,7 @@ runs: exit 1 fi EASTMESH_VERSION="${BASH_REMATCH[1]}" - elif [[ "$GIT_TAG_NAME" =~ ^observer-bridge-espnow-eastmesh-(v[[:alnum:]._-]+)$ ]]; then + elif [[ "$GIT_TAG_NAME" =~ ^observer-eastmesh-bridge-espnow-(v[[:alnum:]._-]+)$ ]]; then if [[ -z "$STATIC_OFFICIAL_VERSION" ]]; then echo "OFFICIAL_MESHCORE_VERSION must be set for EastMesh release tags" >&2 exit 1 diff --git a/.github/workflows/eastmesh-build-observer-espnow-firmwares.yml b/.github/workflows/eastmesh-build-observer-espnow-firmwares.yml index e5c6e524..036b6ccd 100644 --- a/.github/workflows/eastmesh-build-observer-espnow-firmwares.yml +++ b/.github/workflows/eastmesh-build-observer-espnow-firmwares.yml @@ -1,4 +1,4 @@ -name: EastMesh Build Observer ESP-NOW Firmwares +name: EastMesh Build Observer Bridge ESP-NOW Firmwares permissions: contents: write @@ -7,7 +7,7 @@ on: workflow_dispatch: push: tags: - - "observer-bridge-espnow-eastmesh-v*" + - "observer-eastmesh-bridge-espnow-v*" jobs: build: @@ -28,14 +28,14 @@ jobs: - name: Upload Workflow Artifacts uses: actions/upload-artifact@v7 with: - name: observer-espnow-firmwares + name: observer-bridge-espnow-firmwares path: out - name: Create Release uses: softprops/action-gh-release@v3 if: startsWith(github.ref, 'refs/tags/') with: - name: Observer ESP-NOW Bridge Firmware ${{ env.RELEASE_VERSION }} + name: Observer EastMesh Firmware with ESP-NOW Bridge ${{ env.RELEASE_VERSION }} body: "" draft: true files: out/* diff --git a/.github/workflows/eastmesh-build-observer-firmwares.yml b/.github/workflows/eastmesh-build-observer-firmwares.yml index 20a9e768..ec613229 100644 --- a/.github/workflows/eastmesh-build-observer-firmwares.yml +++ b/.github/workflows/eastmesh-build-observer-firmwares.yml @@ -35,7 +35,7 @@ jobs: uses: softprops/action-gh-release@v3 if: startsWith(github.ref, 'refs/tags/') with: - name: Observer MQTT Firmware ${{ env.RELEASE_VERSION }} + name: Observer EastMesh Firmware ${{ env.RELEASE_VERSION }} body: "" draft: true files: out/* diff --git a/AGENTS.md b/AGENTS.md index f8b2a897..56908eaf 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -171,7 +171,7 @@ Current tag formats: ```bash git tag companion-wifi-v1.15.0 git tag repeater-bridge-espnow-v1.15.0 -git tag observer-bridge-espnow-eastmesh-v2026.5.1 +git tag observer-eastmesh-bridge-espnow-v2026.5.1 git tag observer-eastmesh-v2026.5.1 ``` @@ -179,7 +179,7 @@ Rules: - `companion-wifi` tags use the upstream MeshCore version directly - `repeater-bridge-espnow` tags use the upstream MeshCore version directly -- `observer-bridge-espnow-eastmesh` tags use the EastMesh release version in the tag +- `observer-eastmesh-bridge-espnow` tags use the EastMesh release version in the tag - `observer-eastmesh` tags use the EastMesh release version in the tag - GitHub Actions variable `OFFICIAL_MESHCORE_VERSION` supplies the upstream base version for Observer EastMesh and Observer ESP-NOW EastMesh release builds - if the upstream MeshCore release version changes, update `OFFICIAL_MESHCORE_VERSION` in GitHub before cutting release tags diff --git a/README.md b/README.md index f9440350..7f6440a3 100644 --- a/README.md +++ b/README.md @@ -207,7 +207,7 @@ The current release workflows intentionally focus only on: - `companion-wifi` - `repeater-bridge-espnow` - `observer-eastmesh` -- `observer-bridge-espnow-eastmesh` +- `observer-eastmesh-bridge-espnow` ## Release Tags @@ -217,7 +217,7 @@ Current release tags are: git tag companion-wifi-v1.14.1 git tag repeater-bridge-espnow-v1.15.0 git tag observer-eastmesh-v2026.5.1 -git tag observer-bridge-espnow-eastmesh-v2026.5.1 +git tag observer-eastmesh-bridge-espnow-v2026.5.1 ``` Companion WiFi uses the upstream MeshCore version in the tag. diff --git a/RELEASE.md b/RELEASE.md index 4f717e93..cec3c0e1 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -18,19 +18,19 @@ Push one or more of the following tag formats to trigger the matching firmware r - `companion-wifi-v1.15.0` - `repeater-bridge-espnow-v1.15.0` -- `observer-bridge-espnow-eastmesh-v2026.5.1` +- `observer-eastmesh-bridge-espnow-v2026.5.1` - `observer-eastmesh-v2026.5.1` Use the upstream MeshCore version in `companion-wifi-v1.15.0`. Use the upstream MeshCore version in `repeater-bridge-espnow-v1.15.0`. -Use the EastMesh release version in `observer-bridge-espnow-eastmesh-v2026.5.1`. +Use the EastMesh release version in `observer-eastmesh-bridge-espnow-v2026.5.1`. Use the EastMesh release version in `observer-eastmesh-v2026.5.1`. Each tag triggers a separate workflow: - `companion-wifi-v*` builds companion WiFi firmware - `repeater-bridge-espnow-v*` builds repeater ESP-NOW bridge firmware -- `observer-bridge-espnow-eastmesh-v*` builds Observer ESP-NOW firmware +- `observer-eastmesh-bridge-espnow-v*` builds Observer ESP-NOW firmware - `observer-eastmesh-v*` builds Observer firmware You can push one, or more tags on the same commit, and they will all build separately. @@ -41,14 +41,14 @@ During the GitHub Actions build: - `companion-wifi` uses the version in the tag as `FIRMWARE_VERSION` - `repeater-bridge-espnow` uses the version in the tag as `FIRMWARE_VERSION` -- `observer-bridge-espnow-eastmesh` uses `OFFICIAL_MESHCORE_VERSION` as `FIRMWARE_VERSION` and the EastMesh version from the tag as `EASTMESH_VERSION` +- `observer-eastmesh-bridge-espnow` uses `OFFICIAL_MESHCORE_VERSION` as `FIRMWARE_VERSION` and the EastMesh version from the tag as `EASTMESH_VERSION` - `observer-eastmesh` uses `OFFICIAL_MESHCORE_VERSION` as `FIRMWARE_VERSION` and the EastMesh version from the tag as `EASTMESH_VERSION` The resulting version string depends on the workflow: - `companion-wifi`: `v1.15.0-` - `repeater-bridge-espnow`: `v1.15.0-` -- `observer-bridge-espnow-eastmesh`: `v1.15.0-eastmesh-v2026.5.1-` +- `observer-eastmesh-bridge-espnow`: `v1.15.0-eastmesh-v2026.5.1-` - `observer-eastmesh`: `v1.15.0-eastmesh-v2026.5.1-` Example: @@ -75,14 +75,14 @@ Example: ```bash git tag companion-wifi-v1.15.0 git tag repeater-bridge-espnow-v1.15.0 -git tag observer-bridge-espnow-eastmesh-v2026.5.1 +git tag observer-eastmesh-bridge-espnow-v2026.5.1 git tag observer-eastmesh-v2026.5.1 -git push origin companion-wifi-v1.15.0 repeater-bridge-espnow-v1.15.0 observer-bridge-espnow-eastmesh-v2026.5.1 observer-eastmesh-v2026.5.1 +git push origin companion-wifi-v1.15.0 repeater-bridge-espnow-v1.15.0 observer-eastmesh-bridge-espnow-v2026.5.1 observer-eastmesh-v2026.5.1 ``` ## Supported Tags - `companion-wifi-v1.15.0` - `repeater-bridge-espnow-v1.15.0` -- `observer-bridge-espnow-eastmesh-v2026.5.1` +- `observer-eastmesh-bridge-espnow-v2026.5.1` - `observer-eastmesh-v2026.5.1` diff --git a/eastmesh-docs/boards.md b/eastmesh-docs/boards.md index 32e1b8b5..9fff8bc8 100644 --- a/eastmesh-docs/boards.md +++ b/eastmesh-docs/boards.md @@ -26,7 +26,7 @@ For bridge repeaters, think local radio linking between nearby repeaters: - use bridge firmware when two local repeaters need to exchange traffic across different MeshCore radio configs, such as `Australia (Narrow)` and `Australia (Mid)` - pure ESP-NOW bridge repeaters do not need MQTT, the EastMesh web panel, or a screen - prioritise stable power, suitable antennas, and placement over display features -- use `observer-bridge-espnow-eastmesh` only when the same repeater also needs MQTT uplink; otherwise `repeater-bridge-espnow` keeps the role simpler +- use `observer-eastmesh-bridge-espnow` only when the same repeater also needs MQTT uplink; otherwise `repeater-bridge-espnow` keeps the role simpler Other notes: @@ -51,7 +51,7 @@ The tables below are built from the repo's PlatformIO board metadata and variant - `companion-wifi` boards are for app-connected companion devices. - `observer-eastmesh` boards are for Wi-Fi repeaters that publish to MQTT. -- `repeater-bridge-espnow` and `observer-bridge-espnow-eastmesh` boards are for local ESP-NOW bridge use between nearby repeaters on different MeshCore radio configs. +- `repeater-bridge-espnow` and `observer-eastmesh-bridge-espnow` boards are for local ESP-NOW bridge use between nearby repeaters on different MeshCore radio configs. Bridge firmware is not MQTT-over-WAN or VPN bridging. Use it when two local repeaters need to exchange traffic across radio configs such as `Australia (Narrow)` and `Australia (Mid)`. diff --git a/eastmesh-docs/index.md b/eastmesh-docs/index.md index cf52399b..70c40711 100644 --- a/eastmesh-docs/index.md +++ b/eastmesh-docs/index.md @@ -5,7 +5,7 @@ MeshCore-EastMesh keeps the upstream MeshCore firmware intact and publishes four - `companion-wifi`: use this for Wi-Fi-connected companion devices. It stays closest to upstream MeshCore and adds the EastMesh Wi-Fi rescue/configuration commands. - `repeater-bridge-espnow`: use this when you need a plain upstream-style repeater ESP-NOW bridge without MQTT uplink or the EastMesh web panel. - `observer-eastmesh`: use this for a Wi-Fi repeater that should publish to an MQTT broker and, on supported ESP32 boards, offer the optional local web panel for setup and troubleshooting. -- `observer-bridge-espnow-eastmesh`: use this when one repeater needs both MQTT uplink and ESP-NOW bridge duties, including bridge channel/secret controls for keeping the bridge aligned with Wi-Fi. +- `observer-eastmesh-bridge-espnow`: use this when one repeater needs both MQTT uplink and ESP-NOW bridge duties, including bridge channel/secret controls for keeping the bridge aligned with Wi-Fi. !!! note "Bridge tracks are local radio bridges" diff --git a/eastmesh-docs/local-builds.md b/eastmesh-docs/local-builds.md index 9f7e6808..b988f1e2 100644 --- a/eastmesh-docs/local-builds.md +++ b/eastmesh-docs/local-builds.md @@ -82,7 +82,7 @@ This produces versioned artifacts in `out/`. Versioning rule: - `companion-wifi` and `repeater-bridge-espnow` use the upstream MeshCore version as `FIRMWARE_VERSION` -- `observer-eastmesh` and `observer-bridge-espnow-eastmesh` use the upstream MeshCore version as `FIRMWARE_VERSION` plus the EastMesh release version as `EASTMESH_VERSION` +- `observer-eastmesh` and `observer-eastmesh-bridge-espnow` use the upstream MeshCore version as `FIRMWARE_VERSION` plus the EastMesh release version as `EASTMESH_VERSION` ## Supported `repeater_observer` Boards diff --git a/eastmesh-docs/releases.md b/eastmesh-docs/releases.md index 2cc587a3..5f527ac7 100644 --- a/eastmesh-docs/releases.md +++ b/eastmesh-docs/releases.md @@ -29,7 +29,7 @@ EastMesh publishes four release tracks: | `companion-wifi` | You want a companion device that connects over Wi-Fi instead of BLE or USB. | `*_companion_radio_wifi` | | `observer-eastmesh` | You want a repeater with Wi-Fi and MQTT uplink, usually feeding broker visibility such as EastMesh/CoreScope. | `*_repeater_observer` | | `repeater-bridge-espnow` | You want a local ESP-NOW bridge between nearby repeaters, without MQTT uplink or the EastMesh web panel. | `*_repeater_bridge_espnow` | -| `observer-bridge-espnow-eastmesh` | You want one repeater to provide both MQTT uplink and local ESP-NOW bridge duties. | `*_repeater_observer_espnow` | +| `observer-eastmesh-bridge-espnow` | You want one repeater to provide both MQTT uplink and local ESP-NOW bridge duties. | `*_repeater_observer_espnow` | !!! note "Bridge firmware is not a WAN bridge" diff --git a/release-notes.yml b/release-notes.yml index a0a9f8eb..7f89482f 100644 --- a/release-notes.yml +++ b/release-notes.yml @@ -3,7 +3,7 @@ tracks: - companion-wifi - repeater-bridge-espnow - observer-eastmesh - - observer-bridge-espnow-eastmesh + - observer-eastmesh-bridge-espnow generated_from: "Adjacent git tag comparisons plus non-merge commit subjects." releases: @@ -77,16 +77,16 @@ releases: breaking_changes: - "The EastMesh MQTT release tag format and PlatformIO target suffix changed to Observer naming." - - track: observer-bridge-espnow-eastmesh + - track: observer-eastmesh-bridge-espnow version: "2026.5.1" - tag: "observer-bridge-espnow-eastmesh-v2026.5.1" + tag: "observer-eastmesh-bridge-espnow-v2026.5.1" date: "2026-05-23" previous_version: "1.4.0" summary: "Renames the EastMesh MQTT bridge release track and PlatformIO targets to Observer ESP-NOW naming." changes: - type: changed area: release - text: "Renamed the EastMesh MQTT bridge release tag format from `repeater-mqtt-bridge-eastmesh-v*` to `observer-bridge-espnow-eastmesh-v*`." + text: "Renamed the EastMesh MQTT bridge release tag format from `repeater-mqtt-bridge-eastmesh-v*` to `observer-eastmesh-bridge-espnow-v*`." - type: changed area: build text: "Renamed `*_repeater_mqtt_bridge` PlatformIO environments and release artifact prefixes to `*_repeater_observer_espnow`."