Merge branch 'master' into renovate/lib-tinyusb-digest

Author: jamesarich

changelog.md

@@ -3,6 +3,11 @@
 OTAFIX 2.1–2.3 are Meshtastic's fork; everything from 0.6.2 down predates
 it and is upstream Adafruit history, kept for provenance.
 
+## OTAFIX 2.3-BP1.6
+
+- `CURRENT.UF2` is now sized from the application start instead of counting every UF2 block written since the start of flash. Previously, a dump taken after a serial or BLE OTA update was silently truncated by the SoftDevice span, and restoring such a dump only worked while the missing tail happened to still be in flash — re-take any backups made with BP1.5 or older after a DFU update. Verified on RAK4631 both directions (dump size correct after serial DFU; restore boots, next dump byte-identical).
+- `lib/tinyusb` digest bump (0.21.0-241-g7800876). Exercised on hardware via UF2 mass-storage flashing, USB CDC, and serial DFU on RAK4631.
+
 ## OTAFIX 2.3
 
 - New boards: Heltec T096, Heltec T1, RAK 3401 (merged from oltaco's upstream, which calls this same board-support work "OTAFIX 2.3" too).

src/usb/msc_uf2.c

@@ -223,12 +223,15 @@ void tud_msc_write10_complete_cb(uint8_t lun)
         // update App
         update_status.status_code = DFU_UPDATE_APP_COMPLETE;
 
-        // Record the real written size so bootloader_settings.bank_0_size
+        // Record the real app span so bootloader_settings.bank_0_size
         // reflects the actual app, not 0 -- ghostfat.c's CURRENT.UF2 uses
-        // this to size its dump to the real app instead of the max region.
-        // 256 mirrors ghostfat.c's UF2_FIRMWARE_BYTES_PER_SECTOR (the UF2
-        // format's fixed payload-per-block size, not board-specific).
-        update_status.app_size = _wr_state.numWritten * 256;
+        // this to size its dump. Measured from DFU_BANK_0_REGION_START like
+        // serial/OTA DFU do, so a CURRENT.UF2 restore (which also carries
+        // the SoftDevice blocks) does not overcount.
+        if ( _wr_state.appEnd > DFU_BANK_0_REGION_START )
+        {
+          update_status.app_size = _wr_state.appEnd - DFU_BANK_0_REGION_START;
+        }
 
         PRINTF("Application update complete\r\n");
       }

src/usb/uf2/ghostfat.c

@@ -199,7 +199,14 @@ static uint32_t current_flash_size(void)
     bootloader_settings_t const * boot_setting;
     bootloader_util_settings_get(&boot_setting);
 
+    // bank_0_size counts from DFU_BANK_0_REGION_START (the CRC check and
+    // serial/OTA DFU both define it that way); the dump starts at
+    // USER_FLASH_START, so add the SoftDevice span in between.
     flash_sz = boot_setting->bank_0_size;
+    if ( flash_sz && (flash_sz != 0xFFFFFFFFUL) )
+    {
+      flash_sz += DFU_BANK_0_REGION_START - USER_FLASH_START;
+    }
 
     // Round up to a whole UF2 payload chunk, else the last real chunk of
     // the app would get truncated out of CURRENT.UF2.
@@ -484,6 +491,7 @@ int write_block (uint32_t block_no, uint8_t *data, WriteState *state)
       {
         PRINTF("Write addr = 0x%08lX, block = %ld (%ld of %ld)\r\n", bl->targetAddr, bl->blockNo, state->numWritten, bl->numBlocks);
         flash_nrf5x_write(bl->targetAddr, bl->data, bl->payloadSize, true);
+        if ( bl->targetAddr + bl->payloadSize > state->appEnd ) state->appEnd = bl->targetAddr + bl->payloadSize;
       }else if ( bl->targetAddr < USER_FLASH_START )
       {
         // do nothing if writing to MBR, occurs when SD hex is included

src/usb/uf2/uf2.h

@@ -52,6 +52,7 @@ SOFTWARE.
 typedef struct {
     uint32_t numBlocks;
     uint32_t numWritten;
+    uint32_t appEnd;          // highest end address written in app space (0 if none)
 
     bool aborted;             // aborting update and reset
     bool update_bootloader;   // if updating bootloader (else app)