From 095cc7edae0afce53db65342b25373ba69bf45ae Mon Sep 17 00:00:00 2001
From: richonguzman <richon2001@hotmail.com>
Date: Sat, 25 May 2024 12:57:39 -0400
Subject: [PATCH] buildUpdate1

---
 .github/workflows/build.yml | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 106560d..7d371f1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -47,9 +47,8 @@ jobs:
               
             - name: Merge for web flashing
               run: |
-                  python3 -m pip install esptool
                   if [ "${{ matrix.target.chip }}" == "esp32" ]; then
-                    python3 -m esptool --chip esp32 merge_bin \
+                    python installer/bin/esptool/esptool.py --chip esp32 merge_bin \
                       -o installer/web_factory_${{ matrix.target.name }}.bin \
                       --flash_mode dio \
                       --flash_freq 40m \
@@ -58,29 +57,29 @@ jobs:
                       0x9000 installer/firmware/partitions.bin \
                       0xe000 installer/firmware/boot_app0.bin \
                       0x10000 installer/firmware/firmware.bin \
-                      0x3D0000 installer/firmware/spiffs.bin
+                      0x290000 installer/firmware/spiffs.bin
                   elif [ "${{ matrix.target.chip }}" == "esp32s3" ]; then
-                    python3 -m esptool --chip esp32s3 merge_bin \
+                    python installer/bin/esptool/esptool.py --chip esp32s3 merge_bin \
                       -o installer/web_factory_${{ matrix.target.name }}.bin \
                       --flash_mode dio \
                       --flash_freq 40m \
-                      --flash_size 4MB \
+                      --flash_size 8MB \
                       0x1000 installer/firmware/bootloader.bin \
                       0x9000 installer/firmware/partitions.bin \
-                      0xf000 installer/firmware/boot_app0.bin \
+                      0xe000 installer/firmware/boot_app0.bin \
                       0x10000 installer/firmware/firmware.bin \
-                      0x410000 installer/firmware/spiffs.bin
+                      0x3D0000 installer/firmware/spiffs.bin
                   elif [ "${{ matrix.target.chip }}" == "esp32c3" ]; then
-                    python3 -m esptool --chip esp32c3 merge_bin \
+                    python installer/bin/esptool/esptool.py --chip esp32c3 merge_bin \
                       -o installer/web_factory_${{ matrix.target.name }}.bin \
                       --flash_mode dio \
                       --flash_freq 40m \
                       --flash_size 4MB \
                       0x1000 installer/firmware/bootloader.bin \
                       0x9000 installer/firmware/partitions.bin \
-                      0xf000 installer/firmware/boot_app0.bin \
+                      0xe000 installer/firmware/boot_app0.bin \
                       0x10000 installer/firmware/firmware.bin \
-                      0x210000 installer/firmware/spiffs.bin
+                      0x290000 installer/firmware/spiffs.bin
                   fi
 
             - name: Install Zip