From e98c11ff89332a8d317ef392313f6c9cf094720e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= <tgoettgens@gmail.com>
Date: Sat, 1 Oct 2022 09:46:56 +0200
Subject: [PATCH] The new combined firmware starts flashing at offset 0, no
 need to flash system-info or partitions any more.

---
 bin/device-install.bat | 6 ++----
 bin/device-install.sh  | 7 +++----
 bin/device-update.bat  | 2 +-
 bin/device-update.sh   | 2 +-
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/bin/device-install.bat b/bin/device-install.bat
index 763cdac8..419e8d6b 100755
--- a/bin/device-install.bat
+++ b/bin/device-install.bat
@@ -29,13 +29,11 @@ IF "__%FILENAME%__" == "____" (
 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
+	%PYTHON% -m esptool --baud 115200 write_flash 0x00 %FILENAME%
+	%PYTHON% -m esptool --baud 115200 write_flash 0x260000 bleota.bin
     for %%f in (littlefs-*.bin) do (
         %PYTHON% -m esptool --baud 115200 write_flash 0x300000 %%f
     )
-	%PYTHON% -m esptool --baud 115200 write_flash 0x10000 %FILENAME%
-	%PYTHON% -m esptool --baud 115200 write_flash 0x260000 bleota.bin
 ) else (
     echo "Invalid file: %FILENAME%"
 	goto HELP
diff --git a/bin/device-install.sh b/bin/device-install.sh
index 163499d7..a55e553c 100755
--- a/bin/device-install.sh
+++ b/bin/device-install.sh
@@ -47,11 +47,10 @@ shift "$((OPTIND-1))"
 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 0x8000 partitions.bin
+	"$PYTHON" -m esptool  write_flash 0x00 ${FILENAME}
+    "$PYTHON" -m esptool  write_flash 0x260000 bleota.bin
 	"$PYTHON" -m esptool  write_flash 0x300000 littlefs-*.bin
-	"$PYTHON" -m esptool  write_flash 0x260000 bleota.bin
-	"$PYTHON" -m esptool  write_flash 0x10000 ${FILENAME}
+
 else
 	echo "Invalid file: ${FILENAME}"
 	show_help
diff --git a/bin/device-update.bat b/bin/device-update.bat
index c9ec0c4c..40def6ca 100755
--- a/bin/device-update.bat
+++ b/bin/device-update.bat
@@ -28,7 +28,7 @@ IF "__%FILENAME%__" == "____" (
 )
 IF EXIST %FILENAME% (
     echo Trying to flash update %FILENAME%
-    %PYTHON% -m esptool --baud 115200 write_flash 0x10000 %FILENAME%
+    %PYTHON% -m esptool --baud 115200 write_flash 0x00 %FILENAME%
 ) else (
     echo "Invalid file: %FILENAME%"
 	goto HELP
diff --git a/bin/device-update.sh b/bin/device-update.sh
index a233d61d..a6d80c20 100755
--- a/bin/device-update.sh
+++ b/bin/device-update.sh
@@ -44,7 +44,7 @@ shift "$((OPTIND-1))"
 
 if [ -f "${FILENAME}" ]; then
 	echo "Trying to flash update ${FILENAME}."
-	$PYTHON -m esptool --baud 115200 write_flash 0x10000 ${FILENAME}
+	$PYTHON -m esptool --baud 115200 write_flash 0x00 ${FILENAME}
 else
 	echo "Invalid file: ${FILENAME}"
 	show_help