From 2173049af722f2bc14be8f15d666da11b3b00707 Mon Sep 17 00:00:00 2001 From: James Rich <2199651+jamesarich@users.noreply.github.com> Date: Wed, 28 Oct 2026 13:10:22 -0500 Subject: [PATCH 1/2] fix(screen): drop OTAFIX from the color-screen DFU banner --- changelog.md | 2 +- src/boards/heltec_t096/board.h | 2 +- src/boards/heltec_t1/board.h | 2 +- src/screen.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/changelog.md b/changelog.md index d552a267..7a854e7d 100644 --- a/changelog.md +++ b/changelog.md @@ -6,7 +6,7 @@ provenance. ## 2.6.0 -- The project is renamed the Meshtastic nRF52 Bootloader (repo `meshtastic/nRF52_Bootloader`), and releases are tagged plain `x.y.z` from 2.6.0, continuing the OTAFIX numbering. Board-IDs, BLE names and asset file names are unchanged. +- The project is renamed the Meshtastic nRF52 Bootloader (repo `meshtastic/nRF52_Bootloader`), and releases are tagged plain `x.y.z` from 2.6.0, continuing the OTAFIX numbering. Board-IDs, BLE names and asset file names are unchanged. The DFU banner on color-screen boards reads `meshtastic.org`. - New board: Seeed Studio Wio Tracker L1 Pro 1W (OTA DFU advertising name `WTLP_DFU`). - New boards: `meshtastic_6.1.1` and `meshtastic_7.3.0`, generic nRF52840 bootloaders for DIY boards with no board-specific one, for S140 6.1.1 and 7.3.0 (Board-IDs `nRF52840-Meshtastic-Generic-S140v6` and `-S140v7`, OTA DFU name `MESH_DFU`). They drive no LED, and their required button is the reset pin P0.18 so it claims no free GPIO. They share USB `0x239A:0x0029` with the RAK4631, RAK3401, T-Echo, WisMesh Tag and MX25LE01, so their update UF2 installs over those boards' bootloaders and the reverse. - A board with a valid application that sits in DFU for 6 minutes with no activity boots its application. A BLE connection or DFU write, a UF2 drive read or write, USB enumeration, and serial DFU traffic each restart the 6 minutes; a board with no valid application keeps waiting. diff --git a/src/boards/heltec_t096/board.h b/src/boards/heltec_t096/board.h index 2e16d2aa..4db18e99 100644 --- a/src/boards/heltec_t096/board.h +++ b/src/boards/heltec_t096/board.h @@ -83,7 +83,7 @@ #define DISPLAY_VSCSAD 0 #define DISPLAY_TITLE "T096" -#define BANNER_TEXT "meshtastic.org - OTAFIX" +#define BANNER_TEXT "meshtastic.org" #define FONT_SIZE_LARGE 3 #define NOLABELS diff --git a/src/boards/heltec_t1/board.h b/src/boards/heltec_t1/board.h index 6f5d7e25..57859156 100644 --- a/src/boards/heltec_t1/board.h +++ b/src/boards/heltec_t1/board.h @@ -82,7 +82,7 @@ #define DISPLAY_VSCSAD 0 #define DISPLAY_TITLE "T1" -#define BANNER_TEXT "meshtastic.org - OTAFIX" +#define BANNER_TEXT "meshtastic.org" #define FONT_SIZE_LARGE 3 #define NOLABELS diff --git a/src/screen.c b/src/screen.c index 563fc4aa..0311f2ac 100644 --- a/src/screen.c +++ b/src/screen.c @@ -74,7 +74,7 @@ #endif // DISPLAY_MONO #ifndef BANNER_TEXT -#define BANNER_TEXT "meshtastic.org - OTAFIX by oltaco" +#define BANNER_TEXT "meshtastic.org" #endif //BANNER_TEXT #include From de7ebf651cc0114de20f8df256131ec6df1b591d Mon Sep 17 00:00:00 2001 From: James Rich <2199651+jamesarich@users.noreply.github.com> Date: Wed, 28 Oct 2026 13:19:15 -0500 Subject: [PATCH 2/2] ci: drop the stale build job count from a comment --- .github/workflows/githubci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/githubci.yml b/.github/workflows/githubci.yml index f701f2b6..5bc9ed30 100644 --- a/.github/workflows/githubci.yml +++ b/.github/workflows/githubci.yml @@ -41,8 +41,8 @@ jobs: echo "matrix=$MATRIX_JSON" >> $GITHUB_OUTPUT # The factory-erase UF2 is one file for every board, so it is checked in and - # attached once by the `release` job rather than by each of the 17 build - # jobs, which would race deleting and re-uploading the same asset name. + # attached once by the `release` job rather than by each per-board build + # job, which would race deleting and re-uploading the same asset name. # Not a required status check on master unless a human adds it to branch # protection. factory-erase-uf2: