update6-10

.github/workflows/build.yml

@@ -47,10 +47,41 @@ jobs:
               
             - name: Merge for web flashing
               run: |
-                for board in ${{ matrix.target.name }}; do
-                  python3 -m pip install esptool
-                  python3 -m esptool --chip ${{ matrix.target.chip }} merge_bin -o installer/web_factory_${board}.bin --flash_mode dio --flash_freq 40m --flash_size 4MB 0x1000 installer/firmware/bootloader.bin 0x9000 installer/firmware/partitions.bin 0xe000 installer/firmware/boot_app0.bin 0x10000 installer/firmware/firmware.bin 0x3D0000 installer/firmware/spiffs.bin
-                done
+                python3 -m pip install esptool
+                if [ "${{ matrix.target.chip }}" == "esp32" ]; then
+                  python3 -m esptool merge_bin --chip esp32 \
+                    -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 \
+                    0xe000 installer/firmware/boot_app0.bin \
+                    0x10000 installer/firmware/firmware.bin \
+                    0x3D0000 installer/firmware/spiffs.bin
+                elif [ "${{ matrix.target.chip }}" == "esp32s3" ]; then
+                  python3 -m esptool merge_bin --chip esp32s3 \
+                    -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 \
+                    0x10000 installer/firmware/firmware.bin \
+                    0x410000 installer/firmware/spiffs.bin
+                elif [ "${{ matrix.target.chip }}" == "esp32c3" ]; then
+                  python3 -m esptool merge_bin --chip esp32c3 \
+                    -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 \
+                    0x10000 installer/firmware/firmware.bin \
+                    0x210000 installer/firmware/spiffs.bin
+                fi
 
             - name: Install Zip
               run: sudo apt-get install zip