.

2025-12-06 11:36:51 +03:00 · 2023-05-23 00:02:18 +02:00
parent d47ed060b0
commit 3ace5aeff1
8 changed files with 5 additions and 0 deletions
--- a/code/sdkconfig.defaults
+++ b/code/sdkconfig.defaults
@@ -109,6 +109,11 @@ CONFIG_ESP_INT_WDT_TIMEOUT_MS=300

 CONFIG_HTTPD_MAX_REQ_HDR_LEN=1024
 CONFIG_HTTPD_PURGE_BUF_LEN=16
+<<<<<<< Updated upstream
+=======
+CONFIG_HTTPD_WS_SUPPORT=y
+CONFIG_LWIP_MAX_SOCKETS=12
+>>>>>>> Stashed changes

 CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=16
 CONFIG_ESP32_WIFI_CACHE_TX_BUFFER_NUM=16
--- a/images/Flowstate_initialization.xcf
+++ b/images/Flowstate_initialization.xcf
--- a/images/Flowstate_initialization_delayed.xcf
+++ b/images/Flowstate_initialization_delayed.xcf
--- a/images/Flowstate_take_image.xcf
+++ b/images/Flowstate_take_image.xcf
--- a/images/icon/logo.png
+++ b/images/icon/logo.png
--- a/sd-card/html/Flowstate_initialization.jpg
+++ b/sd-card/html/Flowstate_initialization.jpg
--- a/sd-card/html/Flowstate_initialization_delayed.jpg
+++ b/sd-card/html/Flowstate_initialization_delayed.jpg
--- a/sd-card/html/Flowstate_take_image.jpg
+++ b/sd-card/html/Flowstate_take_image.jpg