From b2d9514950caa2b50865ce792cf57b0345744318 Mon Sep 17 00:00:00 2001 From: James Rich <2199651+jamesarich@users.noreply.github.com> Date: Tue, 10 Nov 2026 14:11:20 -0600 Subject: [PATCH 1/2] docs: add the 2.6.1 changelog entry and current release --- README.md | 2 +- changelog.md | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a9c59dfc..893d7312 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Adafruit nRF52 bootloader with enhanced OTA DFU, forked for [Meshtastic](https://meshtastic.org) from [oltaco's bootloader](https://github.com/oltaco/Adafruit_nRF52_Bootloader_OTAFIX) and [Adafruit's](https://github.com/adafruit/Adafruit_nRF52_Bootloader). Formerly the OTAFIX bootloader. Several nRF52 Meshtastic devices ship with it, and the [Meshtastic Android app](https://github.com/meshtastic/Meshtastic-Android) can upgrade it in-app. -Current release: **OTAFIX 2.5** (tag `0.9.2-OTAFIX2.5`). `master` carries the unreleased **2.6.0**; later releases are tagged `x.y.z`. "2.6.0 and later" below means `master` and every release from 2.6.0. See [changelog.md](changelog.md). +Current release: **2.6.1**. Releases are tagged `x.y.z` from 2.6.0; earlier ones are `0.9.2-OTAFIX2.x`. See [changelog.md](changelog.md). ## How this fits together diff --git a/changelog.md b/changelog.md index 1c0b7b96..9741b0cd 100644 --- a/changelog.md +++ b/changelog.md @@ -4,6 +4,10 @@ from 0.6.2 down predates it and is upstream Adafruit history, kept for provenance. +## 2.6.1 + +- Fixed the first application boot after a DFU stalling and ending in a watchdog reset about 90 s later on boards with an I2C OLED DFU screen. 2.6.0 left TWIM0 with the `LASTTX_STOP` short, the pin selects and the last transfer's events set when it jumped to the application, and the Arduino core's repeated-start transfers never finish with that short in place. `board_display_teardown()` now returns TWIM0 to its reset state. Measured on a WisMesh Pocket after a UF2 copy and after a BLE OTA. + ## 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 DFU banner on color-screen boards reads `meshtastic.org`. From 7d3daa34aa4bddffd905a55ca42c932aa1e4c313 Mon Sep 17 00:00:00 2001 From: James Rich <2199651+jamesarich@users.noreply.github.com> Date: Tue, 10 Nov 2026 14:21:45 -0600 Subject: [PATCH 2/2] docs: name what teardown clears in the 2.6.1 entry --- changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index 9741b0cd..b1a47a5a 100644 --- a/changelog.md +++ b/changelog.md @@ -6,7 +6,7 @@ provenance. ## 2.6.1 -- Fixed the first application boot after a DFU stalling and ending in a watchdog reset about 90 s later on boards with an I2C OLED DFU screen. 2.6.0 left TWIM0 with the `LASTTX_STOP` short, the pin selects and the last transfer's events set when it jumped to the application, and the Arduino core's repeated-start transfers never finish with that short in place. `board_display_teardown()` now returns TWIM0 to its reset state. Measured on a WisMesh Pocket after a UF2 copy and after a BLE OTA. +- Fixed the first application boot after a DFU stalling and ending in a watchdog reset about 90 s later on boards with an I2C OLED DFU screen. 2.6.0 left TWIM0 with the `LASTTX_STOP` short, the pin selects and the last transfer's events set when it jumped to the application, and the Arduino core's repeated-start transfers never finish with that short in place. `board_display_teardown()` now clears `SHORTS`, the events and `ERRORSRC`, and disconnects the pin selects. Measured on a WisMesh Pocket after a UF2 copy and after a BLE OTA. ## 2.6.0