Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/githubci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/boards/heltec_t096/board.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/boards/heltec_t1/board.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/screen.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 <string.h>
Expand Down
Loading