mirror of
https://github.com/meshtastic/firmware.git
synced 2025-09-06 19:49:19 +00:00
Merge branch 'tft-gui-work' of https://github.com/meshtastic/firmware into tft-gui-work
This commit is contained in:
commit
210b627765
@ -34,9 +34,9 @@
|
|||||||
"flash_size": "8MB",
|
"flash_size": "8MB",
|
||||||
"maximum_ram_size": 327680,
|
"maximum_ram_size": 327680,
|
||||||
"maximum_size": 8388608,
|
"maximum_size": 8388608,
|
||||||
"require_upload_port": true,
|
"require_upload_port": false,
|
||||||
"use_1200bps_touch": true,
|
"use_1200bps_touch": true,
|
||||||
"wait_for_upload_port": true,
|
"wait_for_upload_port": false,
|
||||||
"speed": 921600
|
"speed": 921600
|
||||||
},
|
},
|
||||||
"url": "https://www.seeedstudio.com/Indicator-for-Meshtastic.html",
|
"url": "https://www.seeedstudio.com/Indicator-for-Meshtastic.html",
|
||||||
|
@ -214,7 +214,7 @@ bool initWifi()
|
|||||||
#if !MESHTASTIC_EXCLUDE_WEBSERVER
|
#if !MESHTASTIC_EXCLUDE_WEBSERVER
|
||||||
createSSLCert(); // For WebServer
|
createSSLCert(); // For WebServer
|
||||||
#endif
|
#endif
|
||||||
esp_wifi_set_storage(WIFI_STORAGE_RAM); // Disable flash storage for WiFi credentials
|
WiFi.persistent(false); // Disable flash storage for WiFi credentials
|
||||||
#endif
|
#endif
|
||||||
if (!*wifiPsw) // Treat empty password as no password
|
if (!*wifiPsw) // Treat empty password as no password
|
||||||
wifiPsw = NULL;
|
wifiPsw = NULL;
|
||||||
|
@ -75,7 +75,6 @@ build_flags = ${esp32_base.build_flags}
|
|||||||
-D USE_LOG_DEBUG
|
-D USE_LOG_DEBUG
|
||||||
-D LOG_DEBUG_INC=\"DebugConfiguration.h\"
|
-D LOG_DEBUG_INC=\"DebugConfiguration.h\"
|
||||||
-D CUSTOM_TOUCH_DRIVER
|
-D CUSTOM_TOUCH_DRIVER
|
||||||
-D FT6X36_ADDR=0x48
|
|
||||||
-D CALIBRATE_TOUCH=0
|
-D CALIBRATE_TOUCH=0
|
||||||
-D LGFX_DRIVER=LGFX_INDICATOR
|
-D LGFX_DRIVER=LGFX_INDICATOR
|
||||||
-D VIEW_320x240
|
-D VIEW_320x240
|
||||||
@ -91,6 +90,6 @@ build_src_filter = ${esp32_base.build_src_filter}
|
|||||||
lib_deps = ${esp32s3_base.lib_deps}
|
lib_deps = ${esp32s3_base.lib_deps}
|
||||||
https://github.com/mverch67/LovyanGFX#develop
|
https://github.com/mverch67/LovyanGFX#develop
|
||||||
; file:///home/manuel/Documents/PlatformIO/Projects/LovyanGFX
|
; 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/ESP8266Audio@^1.9.7
|
||||||
earlephilhower/ESP8266SAM@^1.0.1
|
earlephilhower/ESP8266SAM@^1.0.1
|
||||||
|
Loading…
Reference in New Issue
Block a user