smartPOC/smartPOC-tx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ci/cd update + webserver fix
Some checks failed
build / build (push) Failing after 3m52s
Details

Browse source
This commit is contained in:
cheetah 2025-04-02 00:23:56 +02:00
parent c285caf230
commit 37aa8a82f7
2 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
.forgejo/workflows/build.yaml
View file

@ -24,10 +24,24 @@ jobs:
- name: Build PlatformIO Project - name: Build PlatformIO Project
run: pio run 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 - uses: actions/upload-artifact@v4.6.2
with: with:
name: firmware name: firmware
path: | 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/*/partitions.bin
/workspace/smartPOC/smartPOC-tx/.pio/build/*/firmware.bin /workspace/smartPOC/smartPOC-tx/.pio/build/*/firmware.bin
/workspace/smartPOC/smartPOC-tx/.pio/build/*/merged-flash.bin

7
src/webserver.cpp
View file

@ -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_start[] asm("_binary_data_style_css_start");
extern const uint8_t data_style_css_end[] asm("_binary_data_style_css_end"); 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); AsyncWebServer server(80);
// static AsyncWebSocket ws("/ws"); // static AsyncWebSocket ws("/ws");
// static AsyncEventSource events("/events"); // static AsyncEventSource events("/events");
@ -388,9 +392,6 @@ static void redirectHomeResponse(AsyncWebServerRequest *request, String location
redirectHomeResponse(request, "/#config"); redirectHomeResponse(request, "/#config");
} }
// //
bool webserver_protecc;
char *webserver_user;
char *webserver_pass;
void webserver_setup(cfg_t *cfg) { void webserver_setup(cfg_t *cfg) {
webserver_protecc = cfg->webserver_protect; webserver_protecc = cfg->webserver_protect;
webserver_user = cfg->ap_ssid; webserver_user = cfg->ap_ssid;