From ccbc01a7531014ca34dc2c76e1ebce5bc4fa52b6 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Fri, 19 Aug 2022 13:33:02 -0500 Subject: [PATCH 1/4] Repartitioned --- bin/device-install.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/device-install.bat b/bin/device-install.bat index fe4a3870a..d6a034a42 100644 --- a/bin/device-install.bat +++ b/bin/device-install.bat @@ -31,7 +31,7 @@ IF EXIST %FILENAME% ( %PYTHON% -m esptool --baud 115200 erase_flash %PYTHON% -m esptool --baud 115200 write_flash 0x1000 system-info.bin for %%f in (littlefs-*.bin) do ( - %PYTHON% -m esptool --baud 115200 write_flash 0x00390000 %%f + %PYTHON% -m esptool --baud 115200 write_flash 0x2B0000 %%f ) %PYTHON% -m esptool --baud 115200 write_flash 0x10000 %FILENAME% ) else ( @@ -39,4 +39,4 @@ IF EXIST %FILENAME% ( goto HELP ) -:EOF \ No newline at end of file +:EOF From 05df849a6da08647be742fb99ff774306f466ec1 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Fri, 19 Aug 2022 13:33:58 -0500 Subject: [PATCH 2/4] Repartitioned --- bin/device-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/device-install.sh b/bin/device-install.sh index c42325a0e..95383405a 100755 --- a/bin/device-install.sh +++ b/bin/device-install.sh @@ -48,7 +48,7 @@ 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 0x00390000 littlefs-*.bin + "$PYTHON" -m esptool write_flash 0x2B0000 littlefs-*.bin "$PYTHON" -m esptool write_flash 0x10000 ${FILENAME} else echo "Invalid file: ${FILENAME}" From bbd7c5063d0f837f40457e053d57d8e7ced1c956 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Fri, 19 Aug 2022 13:34:41 -0500 Subject: [PATCH 3/4] Removed ota erasure --- bin/device-update.bat | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/bin/device-update.bat b/bin/device-update.bat index 7e8dc329c..c9ec0c4c9 100644 --- a/bin/device-update.bat +++ b/bin/device-update.bat @@ -29,11 +29,9 @@ IF "__%FILENAME%__" == "____" ( IF EXIST %FILENAME% ( echo Trying to flash update %FILENAME% %PYTHON% -m esptool --baud 115200 write_flash 0x10000 %FILENAME% - echo Erasing the otadata partition, which will turn off flash flippy-flop and force the first image to be used - %PYTHON% -m esptool --baud 115200 erase_region 0xe000 0x2000 ) else ( echo "Invalid file: %FILENAME%" goto HELP ) -:EOF \ No newline at end of file +:EOF From 4cfc229e77db3000c6597ecd1e478f2554438c7c Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Fri, 19 Aug 2022 13:35:54 -0500 Subject: [PATCH 4/4] Update device-update.sh --- bin/device-update.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/bin/device-update.sh b/bin/device-update.sh index b4e054196..a233d61dd 100755 --- a/bin/device-update.sh +++ b/bin/device-update.sh @@ -45,8 +45,6 @@ shift "$((OPTIND-1))" if [ -f "${FILENAME}" ]; then echo "Trying to flash update ${FILENAME}." $PYTHON -m esptool --baud 115200 write_flash 0x10000 ${FILENAME} - echo "Erasing the otadata partition, which will turn off flash flippy-flop and force the first image to be used" - $PYTHON -m esptool --baud 115200 erase_region 0xe000 0x2000 else echo "Invalid file: ${FILENAME}" show_help