pfeerick · pfeerick · Aug 25, 2026 · Aug 25, 2026 · Aug 25, 2026 · Aug 27, 2026
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,7 +4,7 @@ project(EdgeTX)
 
 set(VERSION_MAJOR "2")
 set(VERSION_MINOR "11")
-set(VERSION_REVISION "7")
+set(VERSION_REVISION "8")
 set(CODENAME "Jolly Mon")
 string(TIMESTAMP BUILD_YEAR "%Y")
 

diff --git a/radio/src/audio.h b/radio/src/audio.h
@@ -98,6 +98,11 @@ constexpr uint8_t AUDIO_FILENAME_MAXLEN = (AUDIO_LUA_FILENAME_MAXLEN > AUDIO_MOD
   #define AUDIO_BUFFER_COUNT           (3)
 #endif
 
+static_assert((AUDIO_QUEUE_LENGTH & (AUDIO_QUEUE_LENGTH - 1)) == 0,
+              "AUDIO_QUEUE_LENGTH must be a power of 2");
+static_assert(2 * AUDIO_BUFFER_COUNT <= 255,
+              "AUDIO_BUFFER_COUNT free-running counter must fit in uint8_t");
+
 #define BEEP_MIN_FREQ                  (150)
 #define BEEP_MAX_FREQ                  (15000)
 #define BEEP_DEFAULT_FREQ              (2250)
@@ -300,23 +305,31 @@ class AudioBufferFifo {
 #endif
 
   private:
+    // free-running counters in [0, 2*AUDIO_BUFFER_COUNT); each written by only one side
     volatile uint8_t readIdx;
     volatile uint8_t writeIdx;
-    volatile bool bufferFull;
 
-    inline uint8_t nextBufferIdx(uint8_t idx) const
+    inline uint8_t nextIndex(uint8_t idx) const
     {
-      return (idx >= AUDIO_BUFFER_COUNT - 1 ? 0 : idx + 1);
+      return (idx >= 2 * AUDIO_BUFFER_COUNT - 1 ? 0 : idx + 1);
     }
 
-    bool full() const { return bufferFull; }
-    bool empty() const { return readIdx == writeIdx && !bufferFull; }
-    uint8_t used() const { return bufferFull ? AUDIO_BUFFER_COUNT
-                                             : (writeIdx < readIdx) ? writeIdx + AUDIO_BUFFER_COUNT - readIdx
-                                                                    : writeIdx - readIdx; }
+    inline uint8_t slot(uint8_t idx) const
+    {
+      return idx >= AUDIO_BUFFER_COUNT ? idx - AUDIO_BUFFER_COUNT : idx;
+    }
+
+    uint8_t used() const
+    {
+      uint8_t w = writeIdx, r = readIdx;
+      return w >= r ? w - r : w + 2 * AUDIO_BUFFER_COUNT - r;
+    }
+
+    bool full() const { return used() == AUDIO_BUFFER_COUNT; }
+    bool empty() const { return readIdx == writeIdx; }
 
    public:
-    AudioBufferFifo() : readIdx(0), writeIdx(0), bufferFull(false)
+    AudioBufferFifo() : readIdx(0), writeIdx(0)
     {
       memset(audioBuffers, 0, sizeof(audioBuffers));
     }
@@ -325,26 +338,19 @@ class AudioBufferFifo {
     // with audioPushBuffer()
     AudioBuffer *getEmptyBuffer() const
     {
-      return full() ? nullptr : &audioBuffers[writeIdx];
+      return full() ? nullptr : &audioBuffers[slot(writeIdx)];
     }
 
     // puts filled buffer into FIFO
-    void audioPushBuffer()
-    {
-      writeIdx = nextBufferIdx(writeIdx);
-      if (writeIdx == readIdx) bufferFull = true;
-    }
+    void audioPushBuffer() { writeIdx = nextIndex(writeIdx); }
 
-    void freeNextFilledBuffer()
-    {
-      readIdx = nextBufferIdx(readIdx);
-      bufferFull = false;
-    }
+    // frees the last played buffer
+    void freeNextFilledBuffer() { readIdx = nextIndex(readIdx); }
 
     // returns a pointer to the audio buffer to be played
     const AudioBuffer *getNextFilledBuffer()
     {
-      return empty() ? nullptr : &audioBuffers[readIdx];
+      return empty() ? nullptr : &audioBuffers[slot(readIdx)];
     }
 
     bool filledAtleast(int noBuffers) const { return used() >= noBuffers; }
@@ -356,13 +362,25 @@ class AudioFragmentFifo
   friend void printAudioVars();
 #endif
   private:
+    // free-running counters in [0, 2*AUDIO_QUEUE_LENGTH); each written by only one side
     volatile uint8_t ridx;
     volatile uint8_t widx;
     AudioFragment fragments[AUDIO_QUEUE_LENGTH];
 
     uint8_t nextIdx(uint8_t idx) const
     {
-      return (idx + 1) & (AUDIO_QUEUE_LENGTH - 1);
+      return (idx + 1) & (2 * AUDIO_QUEUE_LENGTH - 1);
+    }
+
+    uint8_t slot(uint8_t idx) const
+    {
+      return idx & (AUDIO_QUEUE_LENGTH - 1);
+    }
+
+    uint8_t used() const
+    {
+      uint8_t w = widx, r = ridx;
+      return w >= r ? w - r : w + 2 * AUDIO_QUEUE_LENGTH - r;
     }
 
   public:
@@ -372,7 +390,7 @@ class AudioFragmentFifo
     {
       uint8_t i = ridx;
       while (i != widx) {
-        AudioFragment & fragment = fragments[i];
+        AudioFragment & fragment = fragments[slot(i)];
         if (fragment.id == id) return true;
         i = nextIdx(i);
       }
@@ -383,7 +401,7 @@ class AudioFragmentFifo
     {
       uint8_t i = ridx;
       while (i != widx) {
-        AudioFragment & fragment = fragments[i];
+        AudioFragment & fragment = fragments[slot(i)];
         if (fragment.id == id) fragment.clear();
         i = nextIdx(i);
       }
@@ -397,7 +415,7 @@ class AudioFragmentFifo
 
     bool full() const
     {
-      return ridx == nextIdx(widx);
+      return used() == AUDIO_QUEUE_LENGTH;
     }
 
     void clear()
@@ -408,8 +426,8 @@ class AudioFragmentFifo
     const AudioFragment * get()
     {
       if (!empty()) {
-        const AudioFragment * result = &fragments[ridx];
-        if (!fragments[ridx].repeat--) {
+        const AudioFragment * result = &fragments[slot(ridx)];
+        if (!fragments[slot(ridx)].repeat--) {
           // repeat is done, move to the next fragment
           ridx = nextIdx(ridx);
         }
@@ -422,7 +440,7 @@ class AudioFragmentFifo
     {
       if (!full()) {
         // TRACE("fragment %d at %d", fragment.type, widx);
-        fragments[widx] = fragment;
+        fragments[slot(widx)] = fragment;
         widx = nextIdx(widx);
       }
     }

diff --git a/radio/src/bootloader/bin_fw_files.cpp b/radio/src/bootloader/bin_fw_files.cpp
@@ -53,13 +53,14 @@ static FWFileInfo  fwFiles[MAX_FW_FILES];
 static uint8_t     Block_buffer[BLOCK_LEN];
 static UINT        BlockCount;
 
-static void flashWriteBlock()
+static bool flashWriteBlock()
 {
   // TODO: use some board provided driver instead
   uint32_t blockOffset = 0;
 #if !defined(SIMU)
   while (BlockCount) {
-    flashWrite((uint32_t *)firmwareAddress, (uint32_t *)&Block_buffer[blockOffset]);
+    if (!flashWrite((uint32_t *)firmwareAddress, (uint32_t *)&Block_buffer[blockOffset]))
+      return false;
     blockOffset += FLASH_PAGESIZE;
     firmwareAddress += FLASH_PAGESIZE;
     if (BlockCount > FLASH_PAGESIZE) {
@@ -70,6 +71,7 @@ static void flashWriteBlock()
     }
   }
 #endif // SIMU
+  return true;
 }
 
 void sdInit(void)
@@ -267,17 +269,24 @@ void firmwareInitWrite(uint32_t index)
   firmwareWritten = 0;
 }
 
-bool firmwareWriteBlock(uint32_t* progress)
+FlashWriteRes firmwareWriteBlock(uint32_t* progress)
 {
-  flashWriteBlock();
+  if (!flashWriteBlock()) return FW_ERROR;
+
   firmwareWritten += sizeof(Block_buffer);
   *progress = (100 * firmwareWritten) / firmwareSize;
 
-  readFirmwareFile();
+  // a read error or a short file must not be reported as success
+  if (readFirmwareFile() != FR_OK) {
+    return FW_ERROR;
+  }
+  if (BlockCount == 0 && firmwareWritten < firmwareSize) {
+    return FW_ERROR;
+  }
   if (BlockCount == 0 || firmwareWritten >= FLASHSIZE - BOOTLOADER_SIZE) {
-    return true;
+    return FW_DONE;
   }
 
-  return false;
+  return FW_IN_PROGRESS;
 }
 
diff --git a/radio/src/bootloader/boot.h b/radio/src/bootloader/boot.h
@@ -53,6 +53,7 @@ enum BootloaderState {
   ST_FLASH_CHECK,
   ST_FLASHING,
   ST_FLASH_DONE,
+  ST_FLASH_ERROR,
   ST_RESTORE_MENU,
   ST_USB,
 #if defined(SPI_FLASH)

diff --git a/radio/src/bootloader/boot_menu.cpp b/radio/src/bootloader/boot_menu.cpp
@@ -96,6 +96,7 @@ void bootloaderMenu()
   uint8_t index = 0;
   FRESULT fr;
   uint32_t nameCount = 0;
+  uint32_t progress = 0;
 
   sdInit();
 
@@ -107,7 +108,8 @@ void bootloaderMenu()
       next_frame += FRAME_INTERVAL_MS;
 
       if (state != ST_USB && state != ST_FLASHING
-          && state != ST_FLASH_DONE && state != ST_RADIO_MENU) {
+          && state != ST_FLASH_DONE && state != ST_FLASH_ERROR
+          && state != ST_RADIO_MENU) {
         if (usbPlugged()) {
           state = ST_USB;
 #if !defined(SIMU)
@@ -244,14 +246,16 @@ void bootloaderMenu()
         } else if (result == 1) {
           // confirmed
           firmwareInitWrite(vpos);
+          progress = 0;
           state = ST_FLASHING;
         }
       } else if (state == ST_FLASHING) {
-        uint32_t progress = 0;
-        bool done = firmwareWriteBlock(&progress);
+        FlashWriteRes res = firmwareWriteBlock(&progress);
         bootloaderDrawScreen(state, progress);
-        if(done) {
+        if (res == FW_DONE) {
           state = ST_FLASH_DONE;
+        } else if (res == FW_ERROR) {
+          state = ST_FLASH_ERROR;
         }
 #if defined(SPI_FLASH)
       } else if (state == ST_CLEAR_FLASH_CHECK) {
@@ -282,13 +286,15 @@ void bootloaderMenu()
         }
       }
 
-      if (state == ST_FLASH_DONE) {
+      if (state == ST_FLASH_DONE || state == ST_FLASH_ERROR) {
+        BootloaderState drawn = state;
+
         if (event == EVT_KEY_BREAK(KEY_EXIT) || event == EVT_KEY_BREAK(KEY_ENTER)) {
           state = ST_START;
           vpos = 0;
         }
 
-        bootloaderDrawScreen(state, 100);
+        bootloaderDrawScreen(drawn, drawn == ST_FLASH_DONE ? 100 : progress);
       }
 
       if (event == EVT_KEY_LONG(KEY_EXIT)) {

diff --git a/radio/src/bootloader/firmware_files.h b/radio/src/bootloader/firmware_files.h
@@ -69,7 +69,15 @@ enum FlashCheckRes {
 };
 FlashCheckRes checkFirmwareFile(unsigned int index, FlashCheckRes res);
 
+enum FlashWriteRes {
+    FW_IN_PROGRESS=0,
+    FW_DONE,
+    FW_ERROR
+};
+
 void firmwareInitWrite(uint32_t index);
 bool firmwareEraseBlock(uint32_t* progress);
-bool firmwareWriteBlock(uint32_t* progress);
+
+// Write the block currently in the buffer, then fetch the next one
+FlashWriteRes firmwareWriteBlock(uint32_t* progress);
 
diff --git a/radio/src/cli.cpp b/radio/src/cli.cpp
@@ -1400,11 +1400,17 @@ void printAudioVars()
     }
   }
 
-  cliSerialPrint("FragmentFifo:  ridx: %d, widx: %d",
-              audioQueue.fragmentsFifo.ridx, audioQueue.fragmentsFifo.widx);
-  cliSerialPrint("audioQueue:  readIdx: %d, writeIdx: %d, full: %d",
-              audioQueue.buffersFifo.readIdx, audioQueue.buffersFifo.writeIdx,
-              audioQueue.buffersFifo.bufferFull);
+  cliSerialPrint("FragmentFifo:  ridx: %d (slot %d), widx: %d (slot %d)",
+              audioQueue.fragmentsFifo.ridx,
+              audioQueue.fragmentsFifo.slot(audioQueue.fragmentsFifo.ridx),
+              audioQueue.fragmentsFifo.widx,
+              audioQueue.fragmentsFifo.slot(audioQueue.fragmentsFifo.widx));
+  cliSerialPrint("audioQueue:  readIdx: %d (slot %d), writeIdx: %d (slot %d), full: %d",
+              audioQueue.buffersFifo.readIdx,
+              audioQueue.buffersFifo.slot(audioQueue.buffersFifo.readIdx),
+              audioQueue.buffersFifo.writeIdx,
+              audioQueue.buffersFifo.slot(audioQueue.buffersFifo.writeIdx),
+              audioQueue.buffersFifo.full());
 
   cliSerialPrint("normalContext: %u",
               (uint32_t)audioQueue.normalContext.fragment.type);
@@ -1465,6 +1471,11 @@ int cliDisplay(const char ** argv)
     gettime(&utm);
     cliSerialPrint("rtc = %4d-%02d-%02d %02d:%02d:%02d.%02d0", utm.tm_year+TM_YEAR_BASE, utm.tm_mon+1, utm.tm_mday, utm.tm_hour, utm.tm_min, utm.tm_sec, g_ms100);
   }
+#if defined(VOLUME_I2C_ADDRESS)
+  else if (!strcmp(argv[1], "volume")) {
+    cliSerialPrint("volume = %d", getVolume());
+  }
+#endif
   else if (!strcmp(argv[1], "uid")) {
     char str[LEN_CPU_UID+1];
     getCPUUniqueID(str);

diff --git a/radio/src/gui/colorlcd/boot_menu.cpp b/radio/src/gui/colorlcd/boot_menu.cpp
@@ -344,16 +344,20 @@ void bootloaderDrawScreen(BootloaderState st, int opt, const char* str)
     lcd->drawText(USB_TXT_X, y + USB_PLG_TXT_YO, TR_BL_USB_CONNECTED, USB_TXT_ALIGN | BL_FOREGROUND);
   }
   else if (st == ST_FILE_LIST || st == ST_DIR_CHECK || st == ST_FLASH_CHECK ||
-           st == ST_FLASHING || st == ST_FLASH_DONE) {
+           st == ST_FLASHING || st == ST_FLASH_DONE || st == ST_FLASH_ERROR) {
 
     bootloaderDrawTitle(LV_SYMBOL_SD_CARD " /FIRMWARE");
 
-    if (st == ST_FLASHING || st == ST_FLASH_DONE) {
+    if (st == ST_FLASHING || st == ST_FLASH_DONE || st == ST_FLASH_ERROR) {
       LcdFlags color = BL_RED;
 
       if (st == ST_FLASH_DONE) {
         color = BL_GREEN;
         opt = 100;  // Completed > 100%
+      } else if (st == ST_FLASH_ERROR) {
+        // the bar stays where the write gave up
+        lcd->drawText(LCD_W / 2, (LCD_H - PROGRESS_H) / 2 - EdgeTxStyles::STD_FONT_HEIGHT,
+                      LV_SYMBOL_CLOSE " " TR_BL_WRITING_FAILED, CENTERED | BL_FOREGROUND);
       }
 
       lcd->drawRect(PROGRESS_X, (LCD_H - PROGRESS_H) / 2, PROGRESS_W, PROGRESS_H, LINE_H, SOLID, BL_SELECTED);
@@ -408,6 +412,9 @@ void bootloaderDrawScreen(BootloaderState st, int opt, const char* str)
       else if (st == ST_FLASH_DONE) {
         pos = lcd->drawText(FOOTER_X1, LCD_H - FOOTER_Y1, LV_SYMBOL_CHARGE " " TR_BL_WRITING_COMPL, FOOTER_ALIGN1 | BL_FOREGROUND);
       }
+      else if (st == ST_FLASH_ERROR) {
+        pos = lcd->drawText(FOOTER_X1, LCD_H - FOOTER_Y1, LV_SYMBOL_CHARGE " " TR_BL_RETRY_OR_DFU, FOOTER_ALIGN1 | BL_FOREGROUND);
+      }
     }
 #if LANDSCAPE
     pos = 0;

diff --git a/radio/src/gui/colorlcd/controls/color_editor.cpp b/radio/src/gui/colorlcd/controls/color_editor.cpp
@@ -36,8 +36,6 @@ class ColorBar : public FormField
            uint32_t maxValue = 0) :
       FormField(parent, r)
   {
-    lv_obj_add_flag(lvobj, LV_OBJ_FLAG_ENCODER_ACCEL);
-
     lv_group_add_obj((lv_group_t*)lv_group_get_default(), lvobj);
 
     lv_obj_add_event_cb(lvobj, ColorBar::pressing, LV_EVENT_PRESSING, nullptr);