Merge pull request #1725 from meshtastic/AsyncOTA

Changes for OTA Support on ESP32
raytac-diy
Thomas Göttgens 2022-09-26 22:57:48 +02:00 zatwierdzone przez GitHub
commit 1d8a562fd9
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
4 zmienionych plików z 9 dodań i 6 usunięć

Wyświetl plik

@ -30,8 +30,9 @@ IF EXIST %FILENAME% (
echo Trying to flash update %FILENAME%, but first erasing and writing system information"
%PYTHON% -m esptool --baud 115200 erase_flash
%PYTHON% -m esptool --baud 115200 write_flash 0x1000 system-info.bin
%PYTHON% -m esptool --baud 115200 write_flash 0x8000 partitions.bin
for %%f in (littlefs-*.bin) do (
%PYTHON% -m esptool --baud 115200 write_flash 0x2B0000 %%f
%PYTHON% -m esptool --baud 115200 write_flash 0x300000 %%f
)
%PYTHON% -m esptool --baud 115200 write_flash 0x10000 %FILENAME%
) else (

Wyświetl plik

@ -48,7 +48,8 @@ if [ -f "${FILENAME}" ]; then
echo "Trying to flash ${FILENAME}, but first erasing and writing system information"
"$PYTHON" -m esptool erase_flash
"$PYTHON" -m esptool write_flash 0x1000 system-info.bin
"$PYTHON" -m esptool write_flash 0x2B0000 littlefs-*.bin
"$PYTHON" -m esptool write_flash 0x8000 partitions.bin
"$PYTHON" -m esptool write_flash 0x300000 littlefs-*.bin
"$PYTHON" -m esptool write_flash 0x10000 ${FILENAME}
else
echo "Invalid file: ${FILENAME}"

Plik binarny nie jest wyświetlany.

Wyświetl plik

@ -1,7 +1,8 @@
# FIXME! using the genpartitions based table doesn't work on TTGO so for now I stay with my old memory map
# This is a layout for 4MB of flash
# Name, Type, SubType, Offset, Size, Flags
nvs, data, nvs, 0x9000, 0x5000,
otadata, data, ota, 0xe000, 0x2000,
app0, app, ota_0, 0x10000, 0x2A0000,
spiffs, data, spiffs, 0x2B0000,0x150000,
nvs, data, nvs, 0x009000, 0x005000,
otadata, data, ota, 0x00e000, 0x002000,
app, app, ota_0, 0x010000, 0x250000,
flashApp, app, ota_1, 0x260000, 0x0A0000,
spiffs, data, spiffs, 0x300000, 0x100000,
1 # FIXME! using the genpartitions based table doesn't work on TTGO so for now I stay with my old memory map
2 # This is a layout for 4MB of flash
3 # Name, Type, SubType, Offset, Size, Flags
4 nvs, data, nvs, 0x9000, 0x5000, nvs, data, nvs, 0x009000, 0x005000,
5 otadata, data, ota, 0xe000, 0x2000, otadata, data, ota, 0x00e000, 0x002000,
6 app0, app, ota_0, 0x10000, 0x2A0000, app, app, ota_0, 0x010000, 0x250000,
7 spiffs, data, spiffs, 0x2B0000,0x150000, flashApp, app, ota_1, 0x260000, 0x0A0000,
8 spiffs, data, spiffs, 0x300000, 0x100000,