From c06b44694cc34ca77e5513e6c53375174dc8c054 Mon Sep 17 00:00:00 2001 From: virgil Date: Thu, 14 Nov 2024 18:21:24 +0800 Subject: [PATCH 1/3] Fixed the issue that indicator device uploads via rp2040 serial port in some cases. --- boards/seeed-sensecap-indicator.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boards/seeed-sensecap-indicator.json b/boards/seeed-sensecap-indicator.json index 6ce8d36ad..0a02fc882 100644 --- a/boards/seeed-sensecap-indicator.json +++ b/boards/seeed-sensecap-indicator.json @@ -34,9 +34,9 @@ "flash_size": "8MB", "maximum_ram_size": 327680, "maximum_size": 8388608, - "require_upload_port": true, + "require_upload_port": false, "use_1200bps_touch": true, - "wait_for_upload_port": true, + "wait_for_upload_port": false, "speed": 921600 }, "url": "https://www.seeedstudio.com/Indicator-for-Meshtastic.html", From e697d2ceae510084c16d706c93dd96107137584b Mon Sep 17 00:00:00 2001 From: virgil Date: Thu, 14 Nov 2024 18:22:43 +0800 Subject: [PATCH 2/3] Fixed the issue that the touch I2C address definition was not effective. --- variants/seeed-sensecap-indicator/platformio.ini | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/variants/seeed-sensecap-indicator/platformio.ini b/variants/seeed-sensecap-indicator/platformio.ini index 1399c7687..0fd006865 100644 --- a/variants/seeed-sensecap-indicator/platformio.ini +++ b/variants/seeed-sensecap-indicator/platformio.ini @@ -75,7 +75,6 @@ build_flags = ${esp32_base.build_flags} -D USE_LOG_DEBUG -D LOG_DEBUG_INC=\"DebugConfiguration.h\" -D CUSTOM_TOUCH_DRIVER - -D FT6X36_ADDR=0x48 -D CALIBRATE_TOUCH=0 -D LGFX_DRIVER=LGFX_INDICATOR -D VIEW_320x240 @@ -91,6 +90,6 @@ build_src_filter = ${esp32_base.build_src_filter} lib_deps = ${esp32s3_base.lib_deps} https://github.com/mverch67/LovyanGFX#develop ; file:///home/manuel/Documents/PlatformIO/Projects/LovyanGFX - bitbank2/bb_captouch@1.2.2 ; alternative touch library supporting FT6x36 + https://github.com/bitbank2/bb_captouch ; alternative touch library supporting FT6x36 earlephilhower/ESP8266Audio@^1.9.7 earlephilhower/ESP8266SAM@^1.0.1 From b932d43974543b707521babb152671c4b3edc336 Mon Sep 17 00:00:00 2001 From: virgil Date: Thu, 14 Nov 2024 18:23:44 +0800 Subject: [PATCH 3/3] Fixed the issue that the wifi configuration saved to RAM did not take effect. --- src/mesh/wifi/WiFiAPClient.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mesh/wifi/WiFiAPClient.cpp b/src/mesh/wifi/WiFiAPClient.cpp index faf5ce3de..630a227d8 100644 --- a/src/mesh/wifi/WiFiAPClient.cpp +++ b/src/mesh/wifi/WiFiAPClient.cpp @@ -214,7 +214,7 @@ bool initWifi() #if !MESHTASTIC_EXCLUDE_WEBSERVER createSSLCert(); // For WebServer #endif - esp_wifi_set_storage(WIFI_STORAGE_RAM); // Disable flash storage for WiFi credentials + WiFi.persistent(false); // Disable flash storage for WiFi credentials #endif if (!*wifiPsw) // Treat empty password as no password wifiPsw = NULL;