Skip to content

Commit 956c1f5

Browse files
Copilotnetmindz
andcommitted
Remove fallback bootloader detection logic as requested
Co-authored-by: netmindz <442066+netmindz@users.noreply.github.com>
1 parent a4b9da6 commit 956c1f5

1 file changed

Lines changed: 2 additions & 44 deletions

File tree

wled00/util.cpp

Lines changed: 2 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -949,50 +949,8 @@ uint32_t getBootloaderVersion() {
949949
DEBUG_PRINTF_P(PSTR("Bootloader version from description: %d\n"), cached_version);
950950
} else {
951951
DEBUG_PRINTF_P(PSTR("Failed to read bootloader description: %s\n"), esp_err_to_name(err));
952-
953-
// Fallback: Try basic flash reading as before
954-
const uint32_t BOOTLOADER_OFFSET_FALLBACK = 0x1000;
955-
uint8_t bootloader_header[32];
956-
957-
err = esp_flash_read(esp_flash_default_chip, bootloader_header, BOOTLOADER_OFFSET_FALLBACK, sizeof(bootloader_header));
958-
959-
if (err == ESP_OK && bootloader_header[0] == 0xE9) {
960-
// Use rollback capability as primary indicator of V4 bootloader
961-
if (Update.canRollBack()) {
962-
cached_version = 4;
963-
DEBUG_PRINTF_P(PSTR("Bootloader V4 detected (rollback capable, fallback)\n"));
964-
} else {
965-
// Fallback to ESP-IDF version heuristics for older bootloaders
966-
#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)
967-
cached_version = 4; // ESP-IDF 5.0+ typically has V4 bootloader
968-
#elif ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 4, 0)
969-
cached_version = 3; // ESP-IDF 4.4+ may have V3 or V4
970-
#else
971-
cached_version = 2; // Older ESP-IDF has V2
972-
#endif
973-
974-
DEBUG_PRINTF_P(PSTR("Bootloader version estimated from ESP-IDF (fallback): %d\n"), cached_version);
975-
}
976-
977-
DEBUG_PRINTF_P(PSTR("Fallback: Read bootloader from flash: magic=0x%02X, version=%d\n"),
978-
bootloader_header[0], cached_version);
979-
} else {
980-
DEBUG_PRINTF_P(PSTR("Failed to read bootloader from flash (fallback): %s\n"), esp_err_to_name(err));
981-
982-
// Final fallback to ESP-IDF version heuristics
983-
#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)
984-
cached_version = 4;
985-
#elif ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 4, 0)
986-
cached_version = 3;
987-
#else
988-
cached_version = 2;
989-
#endif
990-
991-
// Still check rollback capability
992-
if (Update.canRollBack()) {
993-
cached_version = max(cached_version, 4U);
994-
}
995-
}
952+
// Return 0 to indicate unknown/unsupported bootloader
953+
cached_version = 0;
996954
}
997955

998956
DEBUG_PRINTF_P(PSTR("Final bootloader version: %d\n"), cached_version);

0 commit comments

Comments
 (0)