From 37aa8a82f7f4f35c890a4164fedf40c569138db9 Mon Sep 17 00:00:00 2001
From: cheetah <git@cheetah.cat>
Date: Wed, 2 Apr 2025 00:23:56 +0200
Subject: [PATCH] ci/cd update + webserver fix

---
 .forgejo/workflows/build.yaml | 18 ++++++++++++++++--
 src/webserver.cpp             |  7 ++++---
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml
index 84c5c30..248e151 100644
--- a/.forgejo/workflows/build.yaml
+++ b/.forgejo/workflows/build.yaml
@@ -24,10 +24,24 @@ jobs:
 
       - name: Build PlatformIO Project
         run: pio run
+
+      - name: Merge Firmware Image ttgo-lora32-v2_dwd_mowas_noscreen
+        working-directory: /workspace/smartPOC/smartPOC-tx/.pio/build/ttgo-lora32-v2_dwd_mowas_noscreen/
+        run: pio pkg exec -- esptool.py --chip ESP32 merge_bin -o merged-flash.bin --flash_mode dio --flash_size 4MB 0x1000 bootloader.bin 0x8000 partitions.bin 0x10000 firmware.bin
+
+      - name: Merge Firmware Image ttgo-lora32-v2_dwd_mowas_screen
+        working-directory: /workspace/smartPOC/smartPOC-tx/.pio/build/ttgo-lora32-v2_dwd_mowas_screen/
+        run: pio pkg exec -- esptool.py --chip ESP32 merge_bin -o merged-flash.bin --flash_mode dio --flash_size 4MB 0x1000 bootloader.bin 0x8000 partitions.bin 0x10000 firmware.bin
+
+      - name: Merge Firmware Image ttgo-lora32-v2_nidwd_mowas_noscreen
+        working-directory: /workspace/smartPOC/smartPOC-tx/.pio/build/ttgo-lora32-v2_nodwd_mowas_noscreen/
+        run: pio pkg exec -- esptool.py --chip ESP32 merge_bin -o merged-flash.bin --flash_mode dio --flash_size 4MB 0x1000 bootloader.bin 0x8000 partitions.bin 0x10000 firmware.bin
+
       - uses: actions/upload-artifact@v4.6.2
         with:
           name: firmware
           path: |
-            /workspace/smartPOC/smartPOC-tx/.pio/build/*/firmware.bin/bootloader.bin
+            /workspace/smartPOC/smartPOC-tx/.pio/build/*/bootloader.bin
             /workspace/smartPOC/smartPOC-tx/.pio/build/*/partitions.bin
-            /workspace/smartPOC/smartPOC-tx/.pio/build/*/firmware.bin
\ No newline at end of file
+            /workspace/smartPOC/smartPOC-tx/.pio/build/*/firmware.bin
+            /workspace/smartPOC/smartPOC-tx/.pio/build/*/merged-flash.bin
\ No newline at end of file
diff --git a/src/webserver.cpp b/src/webserver.cpp
index 72fc583..2fdcd26 100644
--- a/src/webserver.cpp
+++ b/src/webserver.cpp
@@ -10,6 +10,10 @@ extern const uint8_t data_script_js_end[] asm("_binary_data_script_js_end");
 extern const uint8_t data_style_css_start[] asm("_binary_data_style_css_start");
 extern const uint8_t data_style_css_end[] asm("_binary_data_style_css_end");
 
+bool webserver_protecc;
+char *webserver_user;
+char *webserver_pass;
+
 AsyncWebServer server(80);
 // static AsyncWebSocket ws("/ws");
 // static AsyncEventSource events("/events");
@@ -388,9 +392,6 @@ static void redirectHomeResponse(AsyncWebServerRequest *request, String location
     redirectHomeResponse(request, "/#config");
   }
 //
-bool webserver_protecc;
-char *webserver_user;
-char *webserver_pass;
 void webserver_setup(cfg_t *cfg) {
   webserver_protecc = cfg->webserver_protect;
   webserver_user = cfg->ap_ssid;