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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved

## How this fits together

Expand Down
4 changes: 4 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 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

- 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`.
Expand Down
Loading