());
#endif
}
}
@@ -561,7 +567,7 @@ static void webHandleApi()
{ // http://plate01/api
if(!http_is_authenticated("api")) return;
- DynamicJsonDocument doc(2048);
+ DynamicJsonDocument doc(max(MAX_CONFIG_JSON_ALLOC_SIZE, 2048));
String contentType = http_get_content_type(F(".json"));
String endpoint((char*)0);
endpoint = webServer.pathArg(0);
@@ -635,6 +641,10 @@ static void webHandleApi()
add_license(obj, "AceButton", "2018", "Brian T. Park", "mit");
obj = doc.createNestedObject();
add_license(obj, "QR Code generator", "", "Project Nayuki", "mit");
+#if HASP_USE_WIREGUARD > 0
+ obj = doc.createNestedObject();
+ add_license(obj, "WireGuard", "2021", "Kenta Ida fugafuga.org, Daniel Hope www.floorsense.nz", "bsd", 1);
+#endif
}
{
char output[HTTP_PAGE_SIZE];
@@ -688,6 +698,11 @@ static void webHandleApi()
settings.createNestedObject(module);
timeGetConfig(settings[module]);
#endif
+#if HASP_USE_WIREGUARD > 0
+ module = FPSTR(FP_WG);
+ settings.createNestedObject(module);
+ wgGetConfig(settings[module]);
+#endif
#if HASP_USE_MQTT > 0
module = FPSTR(FP_MQTT);
settings.createNestedObject(module);
@@ -790,6 +805,11 @@ static void webHandleApiConfig()
timeSetConfig(settings);
} else
#endif
+#if HASP_USE_WIREGUARD > 0
+ if(!strcasecmp(endpoint_key, FP_WG)) {
+ wgSetConfig(settings);
+ } else
+#endif
#if HASP_USE_MQTT > 0
if(!strcasecmp(endpoint_key, FP_MQTT)) {
mqttSetConfig(settings);
@@ -831,6 +851,11 @@ static void webHandleApiConfig()
timeGetConfig(settings);
} else
#endif
+#if HASP_USE_WIREGUARD > 0
+ if(!strcasecmp(endpoint_key, FP_WG)) {
+ wgGetConfig(settings);
+ } else
+#endif
#if HASP_USE_MQTT > 0
if(!strcasecmp(endpoint_key, FP_MQTT)) {
mqttGetConfig(settings);
@@ -897,7 +922,7 @@ static void http_handle_about()
-openHASP
Copyright 2019-2023 Francis Van RoieMIT License
+openHASP
Copyright 2019-2024 Francis Van RoieMIT License
@@ -937,6 +962,8 @@ static void http_handle_info()
| {{ item }} |
Wifi |
| {{ item }} |
+WireGuard |
+ | {{ item }} |
Module |
| {{ item }} |
)";
@@ -1109,7 +1136,7 @@ static inline int handleFilesystemFile(String path)
configFile = FPSTR(FP_HASP_CONFIG_FILE);
if(path.endsWith(configFile.c_str())) { // "//config.json" is also a valid path!
- DynamicJsonDocument settings(2048);
+ DynamicJsonDocument settings(MAX_CONFIG_JSON_ALLOC_SIZE);
DeserializationError error = configParseFile(configFile, settings);
if(error) return 500; // Internal Server Error
@@ -1415,6 +1442,9 @@ static void http_handle_config()
#if HASP_USE_WIFI > 0
html[min(i++, len)] = R"()";
#endif
+#if HASP_USE_WIREGUARD > 0
+ html[min(i++, len)] = R"()";
+#endif
#if HASP_USE_MQTT > 0
html[min(i++, len)] = R"()";
#endif
@@ -2302,6 +2332,50 @@ static void http_handle_wifi()
#endif // HASP_USE_WIFI
+////////////////////////////////////////////////////////////////////////////////////////////////////
+#if HASP_USE_WIREGUARD > 0
+static void http_handle_wireguard()
+{ // http://plate01/config/wireguard
+ if(!http_is_authenticated(F("config/wireguard"))) return;
+
+ const char* html[20];
+ int i = 0;
+ int len = (sizeof(html) / sizeof(html[0])) - 1;
+
+ html[min(i++, len)] = "";
+ html[min(i++, len)] = haspDevice.get_hostname();
+ html[min(i++, len)] = "
";
+ html[min(i++, len)] = R"(
+
+)";
+ html[min(i++, len)] = R"()";
+ http_send_content(html, min(i, len));
+}
+
+#endif // HASP_USE_WIREGUARD
+
static inline int handleFirmwareFile(String path)
{
String contentType((char*)0);
@@ -2715,6 +2789,9 @@ void httpSetup()
#if HASP_USE_WIFI > 0
webServer.on("/config/wifi", http_handle_wifi);
#endif
+#if HASP_USE_WIREGUARD > 0
+ webServer.on("/config/wireguard", http_handle_wireguard);
+#endif
#if HASP_USE_GPIO > 0
webServer.on("/config/gpio", webHandleGpioConfig);
webServer.on("/config/gpio/options", webHandleGpioOutput);
diff --git a/src/sys/svc/hasp_http.h b/src/sys/svc/hasp_http.h
index bdbe13c4..388bb67c 100644
--- a/src/sys/svc/hasp_http.h
+++ b/src/sys/svc/hasp_http.h
@@ -1,4 +1,4 @@
-/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
+/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#ifndef HASP_HTTP_H
diff --git a/src/sys/svc/hasp_http_async.cpp b/src/sys/svc/hasp_http_async.cpp
index 13d51d20..e4e882ef 100644
--- a/src/sys/svc/hasp_http_async.cpp
+++ b/src/sys/svc/hasp_http_async.cpp
@@ -1,8 +1,11 @@
-/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
+/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
//#include "webServer.h"
#include "hasplib.h"
+
+#if HASP_USE_HTTP_ASYNC > 0
+
#include "ArduinoLog.h"
#if defined(ARDUINO_ARCH_ESP32)
@@ -16,7 +19,6 @@
#include "hasp_gui.h"
#include "hasp_debug.h"
-#if HASP_USE_HTTP_ASYNC > 0
#include "sys/net/hasp_network.h"
/* clang-format off */
@@ -487,7 +489,7 @@ void webHandleAbout(AsyncWebServerRequest* request)
String httpMessage((char*)0);
httpMessage.reserve(HTTP_PAGE_SIZE);
- httpMessage += F("openHASP
Copyright© 2019-2022 Francis Van Roie ");
+ httpMessage += F("openHASP
Copyright© 2019-2024 Francis Van Roie ");
httpMessage += mitLicense;
httpMessage += F("Based on the previous work of the following open source developers.
");
httpMessage += F("HASwitchPlate
Copyright© 2019 Allen Derusha allen@derusha.org");
@@ -934,7 +936,7 @@ int handleFileRead(AsyncWebServerRequest* request, String path)
if(!strncasecmp(file.name(), configFile.c_str(), configFile.length())) {
file.close();
- DynamicJsonDocument settings(8 * 256);
+ DynamicJsonDocument settings(MAX_CONFIG_JSON_ALLOC_SIZE);
DeserializationError error = configParseFile(configFile, settings);
if(error) return 500; // Internal Server Error
@@ -1259,7 +1261,7 @@ void webHandleMqttConfig(AsyncWebServerRequest* request)
////////////////////////////////////////////////////////////////////////////////////////////////////
void webHandleGuiConfig(AsyncWebServerRequest* request)
-{ // http://plate01/config/wifi
+{ // http://plate01/config/gui
if(!httpIsAuthenticated(request, F("config/gui"))) return;
{
diff --git a/src/sys/svc/hasp_mdns.cpp b/src/sys/svc/hasp_mdns.cpp
index 0252fb9c..2e00239d 100644
--- a/src/sys/svc/hasp_mdns.cpp
+++ b/src/sys/svc/hasp_mdns.cpp
@@ -1,4 +1,4 @@
-/* MIT License - Copyright (c) 2019-2022 Francis Van Roie
+/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#include "hasp_conf.h"
@@ -51,21 +51,32 @@ void mdnsStart()
};*/
if(MDNS.begin(haspDevice.get_hostname())) {
- char value[32];
+ char value[1024]; // 32
char service[12];
char key[12];
char proto[4];
sprintf_P(proto, PSTR("tcp"));
- strcpy_P(service, PSTR("http"));
+ // strcpy_P(service, PSTR("http"));
+ // MDNS.addService(service, proto, 80);
+
+ // strcpy_P(key, PSTR("app_version"));
+ // MDNS.addServiceTxt(service, proto, key, haspDevice.get_version());
+
+ // strcpy_P(key, PSTR("app_name"));
+ // strcpy_P(value, PSTR(D_MANUFACTURER));
+ // MDNS.addServiceTxt(service, proto, key, value);
+
+ strcpy_P(service, PSTR("openhasp"));
MDNS.addService(service, proto, 80);
- strcpy_P(key, PSTR("app_version"));
- MDNS.addServiceTxt(service, proto, key, haspDevice.get_version());
+ StaticJsonDocument<1024> doc;
+ dispatch_get_discovery_data(doc);
- strcpy_P(key, PSTR("app_name"));
- strcpy_P(value, PSTR(D_MANUFACTURER));
- MDNS.addServiceTxt(service, proto, key, value);
+ JsonObject data = doc.as();
+ for(JsonPair i : data) {
+ MDNS.addServiceTxt(service, proto, i.key().c_str(), i.value().as());
+ }
// if(debugTelnetEnabled) {
strcpy_P(service, PSTR("telnet"));
@@ -85,7 +96,7 @@ bool mdns_remove_service(char* service, char* proto)
#endif
#if ESP8266
- return MDNS.removeService(haspDevice.get_hostname(),"_arduino", "_tcp");
+ return MDNS.removeService(haspDevice.get_hostname(), "_arduino", "_tcp");
#endif
}
diff --git a/src/sys/svc/hasp_mdns.h b/src/sys/svc/hasp_mdns.h
index 2f472814..82893e16 100644
--- a/src/sys/svc/hasp_mdns.h
+++ b/src/sys/svc/hasp_mdns.h
@@ -1,4 +1,4 @@
-/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
+/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#ifndef HASP_MDNS_H
diff --git a/src/sys/svc/hasp_ota.cpp b/src/sys/svc/hasp_ota.cpp
index 48d9fb9e..d42ccf61 100644
--- a/src/sys/svc/hasp_ota.cpp
+++ b/src/sys/svc/hasp_ota.cpp
@@ -1,4 +1,4 @@
-/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
+/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
@@ -22,6 +22,7 @@
#include
#include
#include
+#include
#include
#ifndef HASP_ARDUINOOTA_PORT
#define HASP_ARDUINOOTA_PORT 3232
@@ -76,14 +77,14 @@ extern const uint8_t rootca_crt_bundle_start[] asm("_binary_data_cert_x509_crt_b
#endif // ARDUINO_ARCH_ESP32
static WiFiClientSecure secureClient;
-std::string otaUrl = "http://ota.netwize.be";
+/*std::string otaUrl = "http://ota.netwize.be";*/
uint16_t arduinoOtaPort = HASP_ARDUINOOTA_PORT;
int8_t otaPrecentageComplete = -1;
bool otaUpdateCheck()
{ // firmware update check
- WiFiClientSecure wifiUpdateClientSecure;
+ /*WiFiClientSecure wifiUpdateClientSecure;
HTTPClient updateClient;
LOG_TRACE(TAG_OTA, F(D_OTA_CHECK_UPDATE), otaUrl.c_str());
@@ -115,7 +116,7 @@ bool otaUpdateCheck()
// }
}
LOG_VERBOSE(TAG_OTA, F(D_OTA_CHECK_COMPLETE));
- }
+ }*/
return true;
}
@@ -210,9 +211,9 @@ void otaSetup(void)
secureClient.setTimeout(12); // timeout argument is defined in seconds
#if HASP_USE_ARDUINOOTA > 0
- if(strlen(otaUrl.c_str())) {
+ /*if(strlen(otaUrl.c_str())) {
LOG_INFO(TAG_OTA, otaUrl.c_str());
- }
+ }*/
if(arduinoOtaPort > 0) {
ArduinoOTA.onStart(ota_on_start);
diff --git a/src/sys/svc/hasp_ota.h b/src/sys/svc/hasp_ota.h
index f338ad6f..be412060 100644
--- a/src/sys/svc/hasp_ota.h
+++ b/src/sys/svc/hasp_ota.h
@@ -1,4 +1,4 @@
-/* MIT License - Copyright (c) 2019-2022 Francis Van Roie
+/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#ifndef HASP_OTA_H
diff --git a/src/sys/svc/hasp_slave.cpp b/src/sys/svc/hasp_slave.cpp
index f055710e..227492fa 100644
--- a/src/sys/svc/hasp_slave.cpp
+++ b/src/sys/svc/hasp_slave.cpp
@@ -1,4 +1,4 @@
-/* MIT License - Copyright (c) 2019-2022 Francis Van Roie
+/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#include "hasplib.h"
diff --git a/src/sys/svc/hasp_slave.h b/src/sys/svc/hasp_slave.h
index 9fd36749..0a05bc80 100644
--- a/src/sys/svc/hasp_slave.h
+++ b/src/sys/svc/hasp_slave.h
@@ -1,4 +1,4 @@
-/* MIT License - Copyright (c) 2019-2022 Francis Van Roie
+/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#ifndef HASP_TASMOTACLIENT_H
diff --git a/src/sys/svc/hasp_telnet.cpp b/src/sys/svc/hasp_telnet.cpp
index da8f2e85..1f3d8a09 100644
--- a/src/sys/svc/hasp_telnet.cpp
+++ b/src/sys/svc/hasp_telnet.cpp
@@ -1,4 +1,4 @@
-/* MIT License - Copyright (c) 2019-2023 Francis Van Roie
+/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#include "hasplib.h"
diff --git a/src/sys/svc/hasp_telnet.h b/src/sys/svc/hasp_telnet.h
index 91324c69..8f9fbd0e 100644
--- a/src/sys/svc/hasp_telnet.h
+++ b/src/sys/svc/hasp_telnet.h
@@ -1,4 +1,4 @@
-/* MIT License - Copyright (c) 2019-2022 Francis Van Roie
+/* MIT License - Copyright (c) 2019-2024 Francis Van Roie
For full license information read the LICENSE file in the project folder */
#ifndef HASP_TELNET_H
diff --git a/tools/osx_build_extra.py b/tools/osx_build_extra.py
index 3f445946..a36fc387 100644
--- a/tools/osx_build_extra.py
+++ b/tools/osx_build_extra.py
@@ -1,6 +1,7 @@
Import("env")
-env.Replace(CC="gcc-10", CXX="g++-10")
+#env.Replace(CC="gcc-10", CXX="g++-10")
+env.Replace(CC="gcc-13", CXX="g++-13")
env.Replace(BUILD_SCRIPT="tools/osx_build_script.py")
diff --git a/user_setups/darwin_sdl/darwin_sdl_64bits.ini b/user_setups/darwin/darwin_sdl.ini
similarity index 70%
rename from user_setups/darwin_sdl/darwin_sdl_64bits.ini
rename to user_setups/darwin/darwin_sdl.ini
index 25f8d593..b1c4057a 100644
--- a/user_setups/darwin_sdl/darwin_sdl_64bits.ini
+++ b/user_setups/darwin/darwin_sdl.ini
@@ -1,4 +1,4 @@
-[env:darwin_sdl_64bits]
+[env:darwin_sdl]
lib_archive = false
platform = native@^1.1.4
extra_scripts =
@@ -6,7 +6,8 @@ extra_scripts =
tools/linux_build_extra.py
build_flags =
${env.build_flags}
- -D HASP_MODEL="MacOS X App"
+ -D HASP_MODEL="MacOS X App"
+ -D HASP_TARGET_PC=1
; ----- Monitor
-D TFT_WIDTH=240
@@ -25,8 +26,8 @@ build_flags =
-D HASP_USE_SPIFFS=0
-D HASP_USE_LITTLEFS=0
-D HASP_USE_EEPROM=0
- -D HASP_USE_GPIO=1
- -D HASP_USE_CONFIG=0 ; Standalone application, as library
+ -D HASP_USE_GPIO=0
+ -D HASP_USE_CONFIG=1
-D HASP_USE_DEBUG=1
-D HASP_USE_PNGDECODE=1
-D HASP_USE_BMPDECODE=1
@@ -48,8 +49,8 @@ build_flags =
-DCMAKE_BUILD_TYPE=Release
-DCMAKE_VERBOSE_MAKEFILE=TRUE
;-D NO_PERSISTENCE
- -I.pio/libdeps/darwin_sdl_64bits/paho/src
- -I.pio/libdeps/darwin_sdl_64bits/ArduinoJson/src
+ -I.pio/libdeps/darwin_sdl/paho/src
+ -I.pio/libdeps/darwin_sdl/ArduinoJson/src
-I lib/ArduinoJson/src
-I lib/lv_fs_if
!python -c "import os; print(' '.join(['-I {}'.format(i[0].replace('\x5C','/')) for i in os.walk('hal/sdl2')]))"
@@ -58,8 +59,10 @@ build_flags =
-lm
-lpthread
; MacOS with Homebrew
- -I/usr/local/include
- -L/usr/local/lib
+ ;-I/usr/local/include
+ ;-L/usr/local/lib
+ -I/opt/homebrew/include
+ -L/opt/homebrew/lib
-DTARGET_OS_MAC=1
lib_deps =
@@ -67,7 +70,7 @@ lib_deps =
; lv_drivers@~7.9.1
;lv_drivers=https://github.com/littlevgl/lv_drivers/archive/7d71907c1d6b02797d066f50984b866e080ebeed.zip
https://github.com/eclipse/paho.mqtt.c.git
- bblanchon/ArduinoJson@^6.21.3 ; Json(l) parser
+ bblanchon/ArduinoJson@^6.21.5 ; Json(l) parser
https://github.com/fvanroie/lv_drivers
git+https://github.com/lvgl/lv_lib_png.git#release/v7
@@ -77,25 +80,25 @@ lib_ignore =
ArduinoLog
lv_lib_qrcode
ETHSPI
+ freetype
build_src_filter =
+<*>
-<*.h>
- +<../hal/sdl2>
- +<../.pio/libdeps/darwin_sdl_64bits/paho/src/*.c>
- +<../.pio/libdeps/darwin_sdl_64bits/paho/src/MQTTClient.c>
- +<../.pio/libdeps/darwin_sdl_64bits/paho/src/MQTTClient.h>
- -<../.pio/libdeps/darwin_sdl_64bits/paho/src/MQTTAsync.c>
- -<../.pio/libdeps/darwin_sdl_64bits/paho/src/MQTTAsyncUtils.c>
- -<../.pio/libdeps/darwin_sdl_64bits/paho/src/MQTTVersion.c>
- -<../.pio/libdeps/darwin_sdl_64bits/paho/src/SSLSocket.c>
- +
- -
- -
+ +<../.pio/libdeps/darwin_sdl/paho/src/*.c>
+ -<../.pio/libdeps/darwin_sdl/paho/src/MQTTClient.c>
+ +<../.pio/libdeps/darwin_sdl/paho/src/MQTTAsync.c>
+ +<../.pio/libdeps/darwin_sdl/paho/src/MQTTAsyncUtils.c>
+ -<../.pio/libdeps/darwin_sdl/paho/src/MQTTVersion.c>
+ -<../.pio/libdeps/darwin_sdl/paho/src/SSLSocket.c>
+ -
+ +
+ +
-
-
-
+
+ +
-
+
-
@@ -109,4 +112,4 @@ build_src_filter =
+
-
+
- +<../.pio/libdeps/darwin_sdl_64bits/ArduinoJson/src/ArduinoJson.h>
+ +<../.pio/libdeps/darwin_sdl/ArduinoJson/src/ArduinoJson.h>
diff --git a/user_setups/esp32/_esp32.ini b/user_setups/esp32/_esp32.ini
index 93d581ff..aabb2678 100644
--- a/user_setups/esp32/_esp32.ini
+++ b/user_setups/esp32/_esp32.ini
@@ -35,6 +35,7 @@ files =
build_flags =
${env.build_flags}
+ -D HASP_TARGET_ARDUINO=1
-D HTTP_UPLOAD_BUFLEN=1024 ; lower http upload buffer
-D MQTT_MAX_PACKET_SIZE=2048 ; longer PubSubClient messages
-D HASP_CONSOLE_BUFFER=256 ; maximum length of a console/telnet command
@@ -95,7 +96,7 @@ lib_deps =
git+https://github.com/fvanroie/ConsoleInput.git#dev
; lorol/LittleFS_esp32@^1.0.6 ; for Arduino v1 only
bxparks/AceButton@^1.10.1 ; GPIO button library
- bblanchon/StreamUtils@^1.7.3 ; for EEPromStream and BufferedTelnetClient
+ bblanchon/StreamUtils@^1.8.0 ; for EEPromStream and BufferedTelnetClient
; knolleary/PubSubClient@^2.8.0 ; MQTT client
extra_scripts =
@@ -140,8 +141,10 @@ lib_deps =
extends = esp32
framework = arduino
; platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.05.01/platform-espressif32.zip
-platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.08.01/platform-espressif32.zip
-
+; platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.08.01/platform-espressif32.zip
+;platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.10.03/platform-espressif32.zip
+;;;platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.11.01/platform-espressif32.zip
+platform = https://github.com/Jason2866/platform-espressif32/releases/download/2023.10.02/platform-espressif32-2023.10.02.zip
lib_ignore =
${esp32.lib_ignore}
LittleFS_esp32 ; Not needed for Arduino v2
diff --git a/user_setups/esp32/esp32-2432s028.ini b/user_setups/esp32/esp32-2432s028.ini
new file mode 100644
index 00000000..338e60b2
--- /dev/null
+++ b/user_setups/esp32/esp32-2432s028.ini
@@ -0,0 +1,130 @@
+;***************************************************;
+; Sunton ESP32-WROOM custom dev board with ;
+; - ILI9341 TFT SPI 4-WIRE ;
+; - XPT2046 touch controller ;
+;***************************************************;
+
+[esp32-2432s028r]
+extends = arduino_esp32_v2
+board = esp32dev
+upload_speed = 921600
+
+build_flags =
+ ${arduino_esp32_v2.build_flags}
+ ${esp32.no_ps_ram}
+
+;region -- TFT_eSPI build options ------------------------
+ ; -D USER_SETUP_LOADED=1
+ -D LGFX_USE_V1=1
+ -D TFT_RST=-1
+ -D TFT_SCLK=14
+ -D TFT_DC=2
+ -D TFT_CS=15
+ -D TFT_MOSI=13
+ -D TFT_MISO=12
+ -D TFT_BCKL=21
+ -D SUPPORT_TRANSACTIONS
+ -D SPI_READ_FREQUENCY=20000000
+ -D TOUCH_OFFSET_ROTATION=0 ; 1=swap xy, 2=invert x, 4=inverty
+
+ -D ESP32_2432S028R=1
+;endregion
+
+; -- Debugging options -----------------------------
+; -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
+
+lib_deps =
+ ${arduino_esp32_v2.lib_deps}
+ ${lovyangfx.lib_deps}
+
+
+[env:esp32-2432s028r_4MB]
+extends = esp32-2432s028r, flash_4mb
+build_flags =
+ ${esp32-2432s028r.build_flags}
+ -D ILI9341_DRIVER=1
+ -D INVERT_COLORS=0
+ -D TFT_ROTATION=0 ; 0=0, 1=90, 2=180 or 3=270 degree
+ -D TFT_WIDTH=240
+ -D TFT_HEIGHT=320
+ -D TOUCH_DRIVER=0x2046 ; XPT2606 Resistive touch panel driver
+ -D HASP_USE_LGFX_TOUCH=1
+ -D TOUCH_CS=33
+ -D TOUCH_SCLK=25
+ -D TOUCH_MOSI=32
+ -D TOUCH_MISO=39
+ -D TOUCH_SDA=-1
+ -D TOUCH_SCL=-1
+ -D TOUCH_IRQ=36
+ -D SPI_FREQUENCY=55000000
+ -D SPI_TOUCH_FREQUENCY=2500000
+
+; -- Debugging options -----------------------------
+; -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_VERBOSE
+
+lib_deps =
+ ${esp32-2432s028r.lib_deps}
+ ;${tft_espi.lib_deps}
+ ${lovyangfx.lib_deps}
+ ;${goodix.lib_deps}
+
+[env:esp32-2432s028r-st7789_4MB]
+extends = esp32-2432s028r, flash_4mb
+build_flags =
+ ${esp32-2432s028r.build_flags}
+ -D ST7789_DRIVER=1
+ -D INVERT_COLORS=0
+ -D TFT_ROTATION=0 ; 0=0, 1=90, 2=180 or 3=270 degree
+ -D TFT_WIDTH=240
+ -D TFT_HEIGHT=320
+ -D TOUCH_DRIVER=0x2046 ; XPT2606 Resistive touch panel driver
+ -D HASP_USE_LGFX_TOUCH=1
+ -D TOUCH_CS=33
+ -D TOUCH_SCLK=25
+ -D TOUCH_MOSI=32
+ -D TOUCH_MISO=39
+ -D TOUCH_SDA=-1
+ -D TOUCH_SCL=-1
+ -D TOUCH_IRQ=36
+ -D SPI_FREQUENCY=24000000
+ -D SPI_TOUCH_FREQUENCY=2500000
+
+; -- Debugging options -----------------------------
+; -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_VERBOSE
+
+lib_deps =
+ ${esp32-2432s028r.lib_deps}
+ ;${tft_espi.lib_deps}
+ ${lovyangfx.lib_deps}
+ ;${goodix.lib_deps}
+
+
+[env:esp32-2432s028r-ili9342_4MB]
+extends = esp32-2432s028r, flash_4mb
+build_flags =
+ ${esp32-2432s028r.build_flags}
+ -D ILI9342_DRIVER=1
+ -D INVERT_COLORS=1
+ -D TFT_ROTATION=4 ; 0=0, 1=90, 2=180 or 3=270 degree
+ -D TFT_WIDTH=320
+ -D TFT_HEIGHT=240
+ -D TOUCH_DRIVER=0x2046 ; XPT2606 Resistive touch panel driver
+ -D HASP_USE_LGFX_TOUCH=1
+ -D TOUCH_CS=33
+ -D TOUCH_SCLK=25
+ -D TOUCH_MOSI=32
+ -D TOUCH_MISO=39
+ -D TOUCH_SDA=-1
+ -D TOUCH_SCL=-1
+ -D TOUCH_IRQ=36
+ -D SPI_FREQUENCY=55000000
+ -D SPI_TOUCH_FREQUENCY=2500000
+
+; -- Debugging options -----------------------------
+; -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_VERBOSE
+
+lib_deps =
+ ${esp32-2432s028r.lib_deps}
+ ;${tft_espi.lib_deps}
+ ${lovyangfx.lib_deps}
+ ;${goodix.lib_deps}
diff --git a/user_setups/esp32/huzzah32-featherwing-24-v2.ini b/user_setups/esp32/huzzah32-featherwing-24-v2.ini
new file mode 100644
index 00000000..8c97b591
--- /dev/null
+++ b/user_setups/esp32/huzzah32-featherwing-24-v2.ini
@@ -0,0 +1,31 @@
+;***************************************************;
+; HUZZAH32 ESP32 with Featherwing TFT 2.4" V2 ;
+; - HUZZAH32 esp32 board ;
+; - ili9341 TFT Featherwing 2.4" V2 ;
+; - TSC2007 touch controller ;
+;***************************************************;
+
+[env:huzzah32-featherwing-24-v2]
+extends = arduino_esp32_v2, flash_4mb
+board = featheresp32
+
+build_flags =
+ -D HASP_MODEL="Adafruit HUZZAH32 ESP32 Featherwing 2.4 V2"
+ ${arduino_esp32_v2.build_flags}
+ ${esp32.no_ps_ram}
+
+;region -- TFT_eSPI build options ------------------------
+ ${lcd.featherwing-24-v2}
+ -D TFT_MISO=19
+ -D TFT_MOSI=18
+ -D TFT_SCLK=5
+ -D TFT_DC=33
+ -D TFT_CS=15
+ -D TFT_RST=-1 ; RST
+ -D TFT_BCKL=21 ; Solder the LITE pad to a PWM enabled pin of the ESP, like GPIO 21
+;endregion
+
+lib_deps =
+ ${arduino_esp32_v2.lib_deps}
+ ${tft_espi.lib_deps}
+ ${tsc2007.lib_deps}
\ No newline at end of file
diff --git a/user_setups/esp32/huzzah32-featherwing-35-v2.ini b/user_setups/esp32/huzzah32-featherwing-35-v2.ini
new file mode 100644
index 00000000..8b17d1bf
--- /dev/null
+++ b/user_setups/esp32/huzzah32-featherwing-35-v2.ini
@@ -0,0 +1,32 @@
+;***************************************************;
+; HUZZAH32 ESP32 with Featherwing TFT 3.5" V2 ;
+; - HUZZAH32 esp32 board ;
+; - HX8357D TFT Featherwing 3.5" V2 ;
+; - TSC2007 touch controller ;
+;***************************************************;
+
+[env:huzzah32-featherwing-35-v2]
+extends = arduino_esp32_v2, flash_4mb
+board = featheresp32
+
+build_flags =
+ -D HASP_MODEL="Adafruit HUZZAH32 ESP32 Featherwing 3.5 V2"
+ ${arduino_esp32_v2.build_flags}
+ ${esp32.no_ps_ram}
+
+ -D LV_INDEV_DEF_READ_PERIOD=30
+;region -- TFT_eSPI build options ------------------------
+ ${lcd.featherwing-35-v2}
+ -D TFT_MISO=19
+ -D TFT_MOSI=18
+ -D TFT_SCLK=5
+ -D TFT_DC=10
+ -D TFT_CS=9
+ -D TFT_RST=-1 ; RST
+ -D TFT_BCKL=21 ; Solder the LITE pad to a PWM enabled pin of the ESP, like GPIO 21
+;endregion
+
+lib_deps =
+ ${arduino_esp32_v2.lib_deps}
+ ${tft_espi.lib_deps}
+ ${tsc2007.lib_deps}
diff --git a/user_setups/esp32/huzzah32-v2-featherwing-24-v2.ini b/user_setups/esp32/huzzah32-v2-featherwing-24-v2.ini
new file mode 100644
index 00000000..457dc5aa
--- /dev/null
+++ b/user_setups/esp32/huzzah32-v2-featherwing-24-v2.ini
@@ -0,0 +1,31 @@
+;***************************************************;
+; HUZZAH32 V2 ESP32 with Featherwing TFT 2.4" V2 ;
+; - HUZZAH32 V2 w/ 2 MB PSRAM board ;
+; - ili9341 TFT Featherwing 2.4" V2 ;
+; - TSC2007 touch controller ;
+;***************************************************;
+
+[env:huzzah32-v2-featherwing-24-v2]
+extends = arduino_esp32_v2, flash_4mb
+board = featheresp32
+
+build_flags =
+ -D HASP_MODEL="Adafruit HUZZAH32 V2 ESP32 Featherwing 2.4 V2"
+ ${arduino_esp32_v2.build_flags}
+ ${esp32.ps_ram}
+
+;region -- TFT_eSPI build options ------------------------
+ ${lcd.featherwing-24-v2}
+ -D TFT_MISO=19
+ -D TFT_MOSI=18
+ -D TFT_SCLK=5
+ -D TFT_DC=33
+ -D TFT_CS=15
+ -D TFT_RST=-1 ; RST
+ -D TFT_BCKL=21 ; Solder the LITE pad to a PWM enabled pin of the ESP, like GPIO 21
+;endregion
+
+lib_deps =
+ ${arduino_esp32_v2.lib_deps}
+ ${tft_espi.lib_deps}
+ ${tsc2007.lib_deps}
\ No newline at end of file
diff --git a/user_setups/esp32/huzzah32-v2-featherwing-35-v2.ini b/user_setups/esp32/huzzah32-v2-featherwing-35-v2.ini
new file mode 100644
index 00000000..1cb762f8
--- /dev/null
+++ b/user_setups/esp32/huzzah32-v2-featherwing-35-v2.ini
@@ -0,0 +1,31 @@
+;***************************************************;
+; HUZZAH32 V2 ESP32 with Featherwing TFT 3.5" V2 ;
+; - HUZZAH32 V2 w/ 2 MB PSRAM board ;
+; - HX8357D TFT Featherwing 3.5" V2 ;
+; - TSC2007 touch controller ;
+;***************************************************;
+
+[env:huzzah32-v2-featherwing-35-v2]
+extends = arduino_esp32_v2, flash_4mb
+board = featheresp32
+
+build_flags =
+ -D HASP_MODEL="Adafruit HUZZAH32 V2 ESP32 Featherwing 3.5 V2"
+ ${arduino_esp32_v2.build_flags}
+ ${esp32.ps_ram}
+ -D LV_INDEV_DEF_READ_PERIOD=30
+;region -- TFT_eSPI build options ------------------------
+ ${lcd.featherwing-35-v2}
+ -D TFT_MISO=19
+ -D TFT_MOSI=18
+ -D TFT_SCLK=5
+ -D TFT_DC=10
+ -D TFT_CS=9
+ -D TFT_RST=-1 ; RST
+ -D TFT_BCKL=21 ; Solder the LITE pad to a PWM enabled pin of the ESP, like GPIO 21
+;endregion
+
+lib_deps =
+ ${arduino_esp32_v2.lib_deps}
+ ${tft_espi.lib_deps}
+ ${tsc2007.lib_deps}
diff --git a/user_setups/esp32/esp32-2832s028.ini b/user_setups/esp32/wz2432r028.ini
similarity index 60%
rename from user_setups/esp32/esp32-2832s028.ini
rename to user_setups/esp32/wz2432r028.ini
index c9a96cc8..9e5c0c36 100644
--- a/user_setups/esp32/esp32-2832s028.ini
+++ b/user_setups/esp32/wz2432r028.ini
@@ -1,12 +1,12 @@
;***************************************************;
-; Sunton ESP32-WROOM custom dev board with ;
+; Wizee WZ2432R028 ESP32-WROOM custom dev board ;
; - ILI9341 TFT SPI 4-WIRE ;
; - XPT2046 touch controller ;
;***************************************************;
-[esp32-2432s028r]
-extends = arduino_esp32_v2
-board = esp32dev
+[env:wz2432r028]
+extends = arduino_esp32_v2, flash_4mb
+board = denky32
upload_speed = 921600
build_flags =
@@ -14,39 +14,22 @@ build_flags =
${esp32.no_ps_ram}
;region -- TFT_eSPI build options ------------------------
- ; -D USER_SETUP_LOADED=1
- -D LGFX_USE_V1=1
+ ${esp32.hspi}
+ -D USER_SETUP_LOADED=1
-D ILI9341_DRIVER=1
-D TFT_ROTATION=0 ; 0=0, 1=90, 2=180 or 3=270 degree
-D TFT_WIDTH=240
-D TFT_HEIGHT=320
- -D TFT_RST=-1
- -D TFT_SCLK=14
+
-D TFT_DC=2
-D TFT_CS=15
+ -D TFT_SCLK=14
-D TFT_MOSI=13
-D TFT_MISO=12
- -D TFT_BCKL=21
+ -D TFT_BCKL=27
-D SUPPORT_TRANSACTIONS
- -D SPI_FREQUENCY=55000000
+ -D SPI_FREQUENCY=65000000
-D SPI_READ_FREQUENCY=20000000
- -D TOUCH_OFFSET_ROTATION=0 ; 1=swap xy, 2=invert x, 4=inverty
-
- -D ESP32_2432S028R=1
-;endregion
-
-; -- Debugging options -----------------------------
-; -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
-
-lib_deps =
- ${arduino_esp32_v2.lib_deps}
- ${lovyangfx.lib_deps}
-
-
-[env:esp32-2432s028r_4MB]
-extends = esp32-2432s028r, flash_4mb
-build_flags =
- ${esp32-2432s028r.build_flags}
-D TOUCH_DRIVER=0x2046 ; XPT2606 Resistive touch panel driver
-D HASP_USE_LGFX_TOUCH=1
-D TOUCH_CS=33
@@ -60,9 +43,6 @@ build_flags =
; -- Debugging options -----------------------------
; -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_VERBOSE
-
lib_deps =
- ${esp32-2432s028r.lib_deps}
- ;${tft_espi.lib_deps}
- ${lovyangfx.lib_deps}
- ;${goodix.lib_deps}
+ ${arduino_esp32_v2.lib_deps}
+ ${tft_espi.lib_deps}
diff --git a/user_setups/esp32c3/_esp32c3.ini b/user_setups/esp32c3/_esp32c3.ini
index 2053ab5d..fcf2fbff 100644
--- a/user_setups/esp32c3/_esp32c3.ini
+++ b/user_setups/esp32c3/_esp32c3.ini
@@ -16,7 +16,6 @@ no_ps_ram =
[arduino_esp32c3_v2]
extends = esp32c3
framework = arduino
-;platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.01.01/platform-espressif32.zip
-platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.07.00/platform-espressif32.zip
-;platform = espressif32@5.3.0
-
+; platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.05.01/platform-espressif32.zip
+; platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.08.01/platform-espressif32.zip
+platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.10.03/platform-espressif32.zip
diff --git a/user_setups/esp32s2/_esp32s2.ini b/user_setups/esp32s2/_esp32s2.ini
index 82f1d9df..907a0f06 100644
--- a/user_setups/esp32s2/_esp32s2.ini
+++ b/user_setups/esp32s2/_esp32s2.ini
@@ -5,6 +5,7 @@ board_build.mcu = esp32s2
build_flags =
${env.build_flags}
+ -D HASP_TARGET_ARDUINO=1
-D HTTP_UPLOAD_BUFLEN=512 ; lower http upload buffer
-D MQTT_MAX_PACKET_SIZE=2048 ; longer PubSubClient messages
-D HASP_CONSOLE_BUFFER=256 ; maximum length of a console/telnet command
@@ -83,7 +84,8 @@ platform = https://github.com/tasmota/platform-espressif32/releases/download/202
[arduino_esp32s2-solo_v2]
framework = arduino
; platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.01.01/platform-espressif32.zip
-platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.07.00/platform-espressif32.zip
+; platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.10.03/platform-espressif32.zip
+platform = https://github.com/Jason2866/platform-espressif32/releases/download/2023.10.02/platform-espressif32-2023.10.02.zip
board_build.embed_files = ${esp32.board_build.embed_files}
board_build.filesystem = littlefs
; ----- crash reporter
diff --git a/user_setups/esp32s2/esp32s2-featherwing-24-v2.ini b/user_setups/esp32s2/esp32s2-featherwing-24-v2.ini
new file mode 100644
index 00000000..cb102e00
--- /dev/null
+++ b/user_setups/esp32s2/esp32s2-featherwing-24-v2.ini
@@ -0,0 +1,40 @@
+;***************************************************;
+; Adafruit ESP32-S2 with Featherwing TFT 2.4" V2 ;
+; - ESP32-S2 w/ 2 MB PSRAM board ;
+; - ili9341 TFT Featherwing 2.4" V2 ;
+; - TSC2007 touch controller ;
+;***************************************************;
+
+[env:esp32s2-featherwing-24-v2]
+extends = esp32s2_4mb_v2
+board = esp32s2
+
+build_flags =
+ ${env.build_flags}
+ ${esp32s2.build_flags}
+ ${esp32.ps_ram}
+ -D HASP_MODEL="Adafruit ESP32-S2 Featherwing 2.4 V2"
+ -D USE_HSPI_PORT
+
+;region -- TFT_eSPI build options ------------------------
+ ${lcd.featherwing-24-v2}
+ -D LGFX_USE_V1=1
+ -D TFT_MISO=19
+ -D TFT_MOSI=18
+ -D TFT_SCLK=5
+ -D TFT_DC=33
+ -D TFT_CS=15
+ -D TFT_RST=-1 ; RST
+ -D TFT_BCKL=21 ; Solder the LITE pad to a PWM enabled pin of the ESP, like GPIO 21
+;endregion
+
+lib_deps =
+ ${env.lib_deps}
+ ${esp32s2.lib_deps}
+ ${lovyangfx.lib_deps}
+ ${tsc2007.lib_deps}
+
+lib_ignore =
+ ${env.lib_ignore}
+ ${esp32s2.lib_ignore}
+ TFT_eSPI
diff --git a/user_setups/esp32s2/esp32s2-featherwing-35-v2.ini b/user_setups/esp32s2/esp32s2-featherwing-35-v2.ini
new file mode 100644
index 00000000..b781f449
--- /dev/null
+++ b/user_setups/esp32s2/esp32s2-featherwing-35-v2.ini
@@ -0,0 +1,40 @@
+;***************************************************;
+; Adafruit ESP32-S2 with Featherwing TFT 3.5" V2 ;
+; - ESP32-S2 w/ 2 MB PSRAM board ;
+; - HX8357D TFT Featherwing 3.5" V2 ;
+; - TSC2007 touch controller ;
+;***************************************************;
+
+[env:esp32s2-featherwing-24-v2]
+extends = esp32s2_4mb_v2
+board = esp32s2
+
+build_flags =
+ ${env.build_flags}
+ ${esp32s2.build_flags}
+ ${esp32.ps_ram}
+ -D HASP_MODEL="Adafruit ESP32-S2 Featherwing 3.5 V2"
+ -D USE_HSPI_PORT
+
+;region -- TFT_eSPI build options ------------------------
+ ${lcd.featherwing-35-v2}
+ -D LGFX_USE_V1=1
+ -D TFT_MISO=19
+ -D TFT_MOSI=18
+ -D TFT_SCLK=5
+ -D TFT_DC=10
+ -D TFT_CS=9
+ -D TFT_RST=-1 ; RST
+ -D TFT_BCKL=21 ; Solder the LITE pad to a PWM enabled pin of the ESP, like GPIO 21
+;endregion
+
+lib_deps =
+ ${env.lib_deps}
+ ${esp32s2.lib_deps}
+ ${tsc2007.lib_deps}
+ ${lovyangfx.lib_deps}
+
+lib_ignore =
+ ${env.lib_ignore}
+ ${esp32s2.lib_ignore}
+ TFT_eSPI
diff --git a/user_setups/esp32s3/_esp32s3.ini b/user_setups/esp32s3/_esp32s3.ini
index ec88eb84..13f7a122 100644
--- a/user_setups/esp32s3/_esp32s3.ini
+++ b/user_setups/esp32s3/_esp32s3.ini
@@ -15,7 +15,7 @@ no_ps_ram =
[arduino_esp32s3_v2]
extends = esp32s3
framework = arduino
-;platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.01.01/platform-espressif32.zip
-platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.07.00/platform-espressif32.zip
-;platform = espressif32@5.3.0
-
+; platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.05.01/platform-espressif32.zip
+; platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.08.01/platform-espressif32.zip
+; platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.10.03/platform-espressif32.zip
+platform = https://github.com/Jason2866/platform-espressif32/releases/download/2023.10.02/platform-espressif32-2023.10.02.zip
\ No newline at end of file
diff --git a/user_setups/esp32s3/esp32-s3-4848S040.ini b/user_setups/esp32s3/esp32-s3-4848S040.ini
new file mode 100644
index 00000000..a07a6bb3
--- /dev/null
+++ b/user_setups/esp32s3/esp32-s3-4848S040.ini
@@ -0,0 +1,86 @@
+;***************************************************;
+; Generic Guition with TFT 3.95" ;
+; - Custom esp32-s3 board ;
+; - st7701s TFT ;
+; - gt911 touch controller ;
+;***************************************************;
+
+[esp32-s3-4848s040]
+extends = arduino_esp32s3_v2
+board = esp32-s3-devkitc-1
+board_build.arduino.memory_type = qio_opi
+
+build_flags =
+ -D HASP_MODEL="ESP32-S3 4848S040"
+ ${arduino_esp32s3_v2.build_flags}
+ ${esp32s3.ps_ram}
+ ;-DARDUINO_USB_CDC_ON_BOOT
+ ;-DUSE_USB_CDC_CONSOLE
+
+;region -- ArduinoGFX build options ------------------------
+ -D HASP_USE_ARDUINOGFX=1
+ -D ST7701_DRIVER=1
+ -D ST7701_4848S040=1
+ -D TFT_WIDTH=480
+ -D TFT_HEIGHT=480
+ ; Bus Settings
+ -D TFT_CS=39
+ -D TFT_SCLK=48
+ -D TFT_MOSI=47
+ -D TFT_DE=18
+ -D TFT_VSYNC=17
+ -D TFT_HSYNC=16
+ -D TFT_PCLK=21
+ -D TFT_R0=11
+ -D TFT_R1=12
+ -D TFT_R2=13
+ -D TFT_R3=14
+ -D TFT_R4=0
+ -D TFT_G0=8
+ -D TFT_G1=20
+ -D TFT_G2=3
+ -D TFT_G3=46
+ -D TFT_G4=9
+ -D TFT_G5=10
+ -D TFT_B0=4
+ -D TFT_B1=5
+ -D TFT_B2=6
+ -D TFT_B3=7
+ -D TFT_B4=15
+ -D TFT_DC=-1
+ -D TFT_MISO=-1
+ -D TFT_RST=-1
+ -D TFT_BUSY=-1
+ -D TFT_BCKL=38
+ ; Panel Settings
+ -D TFT_HSYNC_POLARITY=1
+ -D TFT_HSYNC_FRONT_PORCH=10
+ -D TFT_HSYNC_PULSE_WIDTH=8
+ -D TFT_HSYNC_BACK_PORCH=50
+ -D TFT_VSYNC_POLARITY=1
+ -D TFT_VSYNC_FRONT_PORCH=10
+ -D TFT_VSYNC_PULSE_WIDTH=8
+ -D TFT_VSYNC_BACK_PORCH=20
+ -D TFT_PCLK_ACTIVE_NEG=1
+ -D TFT_PREFER_SPEED=12000000
+ -D TFT_AUTO_FLUSH=1
+ ; Touch Settings
+ -D TOUCH_DRIVER=0x911
+ -D TOUCH_WIDTH=480
+ -D TOUCH_HEIGHT=480
+ -D TOUCH_SDA=19
+ -D TOUCH_SCL=45
+ -D TOUCH_RST=-1
+ -D TOUCH_IRQ=-1
+ -D I2C_TOUCH_FREQUENCY=400000
+ -D I2C_TOUCH_ADDRESS=0x5D ; or 0x14
+ -D I2C_TOUCH_PORT=1
+;endregion
+
+lib_deps =
+ ${arduino_esp32s3_v2.lib_deps}
+ ${arduinogfx.lib_deps}
+ ${goodix.lib_deps}
+
+[env:esp32-s3-4848s040_16MB]
+extends = esp32-s3-4848s040, flash_16mb
\ No newline at end of file
diff --git a/user_setups/esp32s3/sunton-esp32-s3-tft.ini b/user_setups/esp32s3/sunton-esp32-s3-tft.ini
index 7cbb14d8..f9bbe24c 100644
--- a/user_setups/esp32s3/sunton-esp32-s3-tft.ini
+++ b/user_setups/esp32s3/sunton-esp32-s3-tft.ini
@@ -228,15 +228,15 @@ build_flags =
-D TFT_B4=4
; Panel Settings
-D TFT_HSYNC_POLARITY=0
- -D TFT_HSYNC_FRONT_PORCH=240 ; Maximum HSYNC Front Porch
- -D TFT_HSYNC_PULSE_WIDTH=30 ; Typical HSYNC Pulse Width
- -D TFT_HSYNC_BACK_PORCH=16 ; Typical HSYNC Back Porch
+ -D TFT_HSYNC_FRONT_PORCH=8 ; Maximum HSYNC Front Porch / 8 GOOD
+ -D TFT_HSYNC_PULSE_WIDTH=10 ; Typical HSYNC Pulse Width / 10 GOOD
+ -D TFT_HSYNC_BACK_PORCH=43 ; Typical HSYNC Back Porch / 43 GOOD
-D TFT_VSYNC_POLARITY=0
- -D TFT_VSYNC_FRONT_PORCH=32 ; Maximum VSYNC Front Porch
- -D TFT_VSYNC_PULSE_WIDTH=13 ; Typical VSYNC Pulse Width
- -D TFT_VSYNC_BACK_PORCH=10 ; Typical VSYNC Back Porch
+ -D TFT_VSYNC_FRONT_PORCH=8 ; Maximum VSYNC Front Porch / 8 GOOD
+ -D TFT_VSYNC_PULSE_WIDTH=8 ; Typical VSYNC Pulse Width / 8 GOOD
+ -D TFT_VSYNC_BACK_PORCH=12 ; Typical VSYNC Back Porch / 12 GOOD
-D TFT_PCLK_ACTIVE_NEG=1
- -D TFT_PREFER_SPEED=16000000 ; 1/2 of Typical DCLK Frequency
+ -D TFT_PREFER_SPEED=14500000 ; 1/2 of Typical DCLK Frequency / 12000000 GOOD
-D TFT_AUTO_FLUSH=1
; Touch Settings
-D TOUCH_WIDTH=800
@@ -250,4 +250,4 @@ build_flags =
-D I2C_TOUCH_FREQUENCY=400000
lib_deps =
${sunton-esp32-s3-tft.lib_deps}
- ${goodix.lib_deps}
\ No newline at end of file
+ ${goodix.lib_deps}
diff --git a/user_setups/esp8266/_esp8266.ini b/user_setups/esp8266/_esp8266.ini
index ad231166..e9ffe212 100644
--- a/user_setups/esp8266/_esp8266.ini
+++ b/user_setups/esp8266/_esp8266.ini
@@ -12,6 +12,7 @@ board_build.f_cpu = 160000000L ; set frequency to 160MHz
monitor_filters = esp8266_exception_decoder
build_flags=
+ -D HASP_TARGET_ARDUINO=1
-D HTTP_UPLOAD_BUFLEN=512 ; lower http upload buffer
-D MQTT_MAX_PACKET_SIZE=1024 ; longer PubSubClient messages
-D HASP_CONSOLE_BUFFER=160 ; maximum length of a console/telnet command
diff --git a/user_setups/lcd_config.ini b/user_setups/lcd_config.ini
index ce4e272b..8b5df106 100644
--- a/user_setups/lcd_config.ini
+++ b/user_setups/lcd_config.ini
@@ -122,6 +122,18 @@ featherwing-35 =
-D TOUCH_DRIVER=0x0610 ;STMPE610
;-D SUPPORT_TRANSACTIONS ; Default on ESP32
+featherwing-35-v2 =
+ -D HX8357D_DRIVER=1
+ -D TFT_WIDTH=320
+ -D TFT_HEIGHT=480
+ -D TFT_ROTATION=0 ; Use default, see TFT_ROTATION values
+ -D SPI_FREQUENCY=27000000
+ -D SPI_TOUCH_FREQUENCY=2500000
+ -D SPI_READ_FREQUENCY=20000000
+ -D USER_SETUP_LOADED=1
+ -D TOUCH_DRIVER=0x2007 ;TSC2007
+ ;-D SUPPORT_TRANSACTIONS ; Default on ESP32
+
featherwing-24 =
-D ILI9341_DRIVER=1
-D TFT_WIDTH=240
@@ -132,4 +144,15 @@ featherwing-24 =
-D SPI_READ_FREQUENCY=20000000
-D USER_SETUP_LOADED=1
-D TOUCH_DRIVER=0x0610 ;STMPE610
+ ;-D SUPPORT_TRANSACTIONS ; Default on ESP32
+
+featherwing-24-v2 =
+ -D ILI9341_DRIVER=1
+ -D TFT_WIDTH=240
+ -D TFT_HEIGHT=320
+ -D TFT_ROTATION=0 ; Use default, see TFT_ROTATION values
+ -D SPI_FREQUENCY=27000000
+ -D SPI_READ_FREQUENCY=20000000
+ -D USER_SETUP_LOADED=1
+ -D TOUCH_DRIVER=0x2007 ;TSC2007
;-D SUPPORT_TRANSACTIONS ; Default on ESP32
\ No newline at end of file
diff --git a/user_setups/linux/linux_fbdev.ini b/user_setups/linux/linux_fbdev.ini
new file mode 100644
index 00000000..1927c7ab
--- /dev/null
+++ b/user_setups/linux/linux_fbdev.ini
@@ -0,0 +1,101 @@
+[env:linux_fbdev]
+platform = native@^1.1.4
+extra_scripts =
+ tools/linux_build_extra.py
+build_flags =
+ ${env.build_flags}
+ -D HASP_MODEL="Linux App"
+ -D HASP_TARGET_PC=1
+
+ ; ----- Monitor
+ -D TFT_WIDTH=240
+ -D TFT_HEIGHT=320
+ ; SDL drivers options
+ ;-D LV_LVGL_H_INCLUDE_SIMPLE
+ ;-D LV_DRV_NO_CONF
+ -D USE_FBDEV
+ -D USE_EVDEV
+ ; ----- ArduinoJson
+ -D ARDUINOJSON_DECODE_UNICODE=1
+ -D HASP_NUM_PAGES=12
+ -D HASP_USE_SPIFFS=0
+ -D HASP_USE_LITTLEFS=0
+ -D LV_USE_FS_IF=1
+ -D HASP_USE_EEPROM=0
+ -D HASP_USE_GPIO=0
+ -D HASP_USE_CONFIG=1
+ -D HASP_USE_DEBUG=1
+ -D HASP_USE_PNGDECODE=1
+ -D HASP_USE_BMPDECODE=1
+ -D HASP_USE_GIFDECODE=0
+ -D HASP_USE_JPGDECODE=0
+ -D HASP_USE_MQTT=1
+ -D HASP_USE_LVGL_TASK=1
+ -D MQTT_MAX_PACKET_SIZE=2048
+ -D HASP_ATTRIBUTE_FAST_MEM=
+ -D IRAM_ATTR= ; No IRAM_ATTR available
+ -D PROGMEM= ; No PROGMEM available
+ ;-D LV_LOG_LEVEL=LV_LOG_LEVEL_INFO
+ ;-D LV_LOG_PRINTF=1
+ ; Add recursive dirs for hal headers search
+ -D POSIX
+ -D PAHO_MQTT_STATIC
+ -DPAHO_WITH_SSL=TRUE
+ -DPAHO_BUILD_DOCUMENTATION=FALSE
+ -DPAHO_BUILD_SAMPLES=FALSE
+ -DCMAKE_BUILD_TYPE=Release
+ -DCMAKE_VERBOSE_MAKEFILE=TRUE
+ ;-D NO_PERSISTENCE
+ -I.pio/libdeps/linux_fbdev/paho/src
+ -I.pio/libdeps/linux_fbdev/ArduinoJson/src
+
+ ; ----- Statically linked libraries --------------------
+ -lm
+ -lpthread
+
+lib_deps =
+ ${env.lib_deps}
+ ;lv_drivers@~7.9.0
+ ;lv_drivers=https://github.com/littlevgl/lv_drivers/archive/7d71907c1d6b02797d066f50984b866e080ebeed.zip
+ https://github.com/eclipse/paho.mqtt.c.git
+ bblanchon/ArduinoJson@^6.21.5 ; Json(l) parser
+ https://github.com/fvanroie/lv_drivers
+
+lib_ignore =
+ paho
+ AXP192
+ ArduinoLog
+ lv_lib_qrcode
+ ETHSPI
+
+build_src_filter =
+ +<*>
+ -<*.h>
+ +<../.pio/libdeps/linux_fbdev/paho/src/*.c>
+ -<../.pio/libdeps/linux_fbdev/paho/src/MQTTClient.c>
+ +<../.pio/libdeps/linux_fbdev/paho/src/MQTTAsync.c>
+ +<../.pio/libdeps/linux_fbdev/paho/src/MQTTAsyncUtils.c>
+ -<../.pio/libdeps/linux_fbdev/paho/src/MQTTVersion.c>
+ -<../.pio/libdeps/linux_fbdev/paho/src/SSLSocket.c>
+ -
+ +
+ +
+ -
+ -
+ -
+ +
+ +
+ -
+ +
+ -
+ +
+ +
+ -
+ -
+ -
+ +
+ +
+ +
+ -
+ +
+ +<../.pio/libdeps/linux_fbdev/ArduinoJson/src/ArduinoJson.h>
diff --git a/user_setups/linux_sdl/linux_sdl_64bits.ini b/user_setups/linux/linux_sdl.ini
similarity index 72%
rename from user_setups/linux_sdl/linux_sdl_64bits.ini
rename to user_setups/linux/linux_sdl.ini
index e49d3447..2445b8b0 100644
--- a/user_setups/linux_sdl/linux_sdl_64bits.ini
+++ b/user_setups/linux/linux_sdl.ini
@@ -1,4 +1,4 @@
-[env:linux_sdl_64bits]
+[env:linux_sdl]
platform = native@^1.1.4
extra_scripts =
tools/sdl2_build_extra.py
@@ -6,6 +6,7 @@ extra_scripts =
build_flags =
${env.build_flags}
-D HASP_MODEL="Linux App"
+ -D HASP_TARGET_PC=1
; ----- Monitor
-D TFT_WIDTH=240
@@ -25,8 +26,8 @@ build_flags =
-D HASP_USE_LITTLEFS=0
-D LV_USE_FS_IF=1
-D HASP_USE_EEPROM=0
- -D HASP_USE_GPIO=1
- -D HASP_USE_CONFIG=0 ; Standalone application, as library
+ -D HASP_USE_GPIO=0
+ -D HASP_USE_CONFIG=1
-D HASP_USE_DEBUG=1
-D HASP_USE_PNGDECODE=1
-D HASP_USE_BMPDECODE=1
@@ -48,8 +49,8 @@ build_flags =
-DCMAKE_BUILD_TYPE=Release
-DCMAKE_VERBOSE_MAKEFILE=TRUE
;-D NO_PERSISTENCE
- -I.pio/libdeps/linux_sdl_64bits/paho/src
- -I.pio/libdeps/linux_sdl_64bits/ArduinoJson/src
+ -I.pio/libdeps/linux_sdl/paho/src
+ -I.pio/libdeps/linux_sdl/ArduinoJson/src
!python -c "import os; print(' '.join(['-I {}'.format(i[0].replace('\x5C','/')) for i in os.walk('hal/sdl2')]))"
; ----- Statically linked libraries --------------------
@@ -62,7 +63,7 @@ lib_deps =
;lv_drivers@~7.9.0
;lv_drivers=https://github.com/littlevgl/lv_drivers/archive/7d71907c1d6b02797d066f50984b866e080ebeed.zip
https://github.com/eclipse/paho.mqtt.c.git
- bblanchon/ArduinoJson@^6.21.3 ; Json(l) parser
+ bblanchon/ArduinoJson@^6.21.5 ; Json(l) parser
https://github.com/fvanroie/lv_drivers
lib_ignore =
@@ -75,20 +76,20 @@ lib_ignore =
build_src_filter =
+<*>
-<*.h>
- +<../hal/sdl2>
- +<../.pio/libdeps/linux_sdl_64bits/paho/src/*.c>
- +<../.pio/libdeps/linux_sdl_64bits/paho/src/MQTTClient.c>
- -<../.pio/libdeps/linux_sdl_64bits/paho/src/MQTTAsync.c>
- -<../.pio/libdeps/linux_sdl_64bits/paho/src/MQTTAsyncUtils.c>
- -<../.pio/libdeps/linux_sdl_64bits/paho/src/MQTTVersion.c>
- -<../.pio/libdeps/linux_sdl_64bits/paho/src/SSLSocket.c>
- +
- -
- -
+ +<../.pio/libdeps/linux_sdl/paho/src/*.c>
+ -<../.pio/libdeps/linux_sdl/paho/src/MQTTClient.c>
+ +<../.pio/libdeps/linux_sdl/paho/src/MQTTAsync.c>
+ +<../.pio/libdeps/linux_sdl/paho/src/MQTTAsyncUtils.c>
+ -<../.pio/libdeps/linux_sdl/paho/src/MQTTVersion.c>
+ -<../.pio/libdeps/linux_sdl/paho/src/SSLSocket.c>
+ -
+ +
+ +
-
-
-
+
+ +
-
+
-
@@ -102,4 +103,4 @@ build_src_filter =
+
-
+
- +<../.pio/libdeps/linux_sdl_64bits/ArduinoJson/src/ArduinoJson.h>
+ +<../.pio/libdeps/linux_sdl/ArduinoJson/src/ArduinoJson.h>
diff --git a/user_setups/stm32f4xx/_stm32f4.ini b/user_setups/stm32f4xx/_stm32f4.ini
index 20a755d3..7ec27e01 100644
--- a/user_setups/stm32f4xx/_stm32f4.ini
+++ b/user_setups/stm32f4xx/_stm32f4.ini
@@ -3,6 +3,7 @@
framework = arduino
platform = ststm32
build_flags=
+ -D HASP_TARGET_ARDUINO=1
-I include/stm32f4
-D MQTT_MAX_PACKET_SIZE=2048 ; longer PubSubClient messages
-D HASP_CONSOLE_BUFFER=220 ; maximum length of a console/telnet command
@@ -21,4 +22,4 @@ build_flags=
lib_deps =
stm32duino/STM32duino LwIP @ ^2.1.2
- ;https://github.com/stm32duino/LwIP.git
\ No newline at end of file
+ ;https://github.com/stm32duino/LwIP.git
diff --git a/user_setups/stm32f7xx/_stm32f7.ini b/user_setups/stm32f7xx/_stm32f7.ini
index 192119d5..17fa84a6 100644
--- a/user_setups/stm32f7xx/_stm32f7.ini
+++ b/user_setups/stm32f7xx/_stm32f7.ini
@@ -3,6 +3,7 @@
framework = arduino
platform = ststm32
build_flags=
+ -D HASP_TARGET_ARDUINO=1
; -I include/stm32f4
-D MQTT_MAX_PACKET_SIZE=2048 ; longer PubSubClient messages
-D HASP_CONSOLE_BUFFER=220 ; maximum length of a console/telnet command
diff --git a/user_setups/win32/windows_gdi.ini b/user_setups/win32/windows_gdi.ini
new file mode 100644
index 00000000..c887ffd8
--- /dev/null
+++ b/user_setups/win32/windows_gdi.ini
@@ -0,0 +1,131 @@
+[env:windows_gdi]
+platform = native@^1.1.4
+extra_scripts =
+ tools/windows_build_extra.py
+build_flags =
+ ${env.build_flags}
+ -D HASP_MODEL="Windows App"
+ -D HASP_TARGET_PC=1
+
+ ; ----- Monitor
+ -D TFT_WIDTH=240
+ -D TFT_HEIGHT=320
+ ; SDL drivers options
+ ;-D LV_LVGL_H_INCLUDE_SIMPLE
+ ;-D LV_DRV_NO_CONF
+ -D USE_WIN32DRV
+ ; ----- ArduinoJson
+ -D ARDUINOJSON_DECODE_UNICODE=1
+ -D HASP_NUM_PAGES=12
+ -D HASP_USE_SPIFFS=0
+ -D HASP_USE_LITTLEFS=0
+ -D HASP_USE_EEPROM=0
+ -D HASP_USE_GPIO=0
+ -D HASP_USE_CONFIG=1
+ -D HASP_USE_DEBUG=1
+ -D HASP_USE_PNGDECODE=1
+ -D HASP_USE_BMPDECODE=1
+ -D HASP_USE_GIFDECODE=0
+ -D HASP_USE_JPGDECODE=0
+ -D HASP_USE_MQTT=1
+ -D HASP_USE_SYSLOG=0
+ -D HASP_USE_LVGL_TASK=1
+ -D MQTT_MAX_PACKET_SIZE=2048
+ -D HASP_ATTRIBUTE_FAST_MEM=
+ -D IRAM_ATTR= ; No IRAM_ATTR available
+ -D PROGMEM= ; No PROGMEM available
+
+ ; -- FreeType build options ------------------------
+ -D LV_USE_FT_CACHE_MANAGER=1 ; crashes without cache
+ -D LVGL_FREETYPE_MAX_FACES=64 ; max number of FreeType faces in cache
+ -D LVGL_FREETYPE_MAX_SIZES=4 ; max number of sizes in cache
+ -D LVGL_FREETYPE_MAX_BYTES=16384 ; max bytes in cache
+ -D LVGL_FREETYPE_MAX_BYTES_PSRAM=65536 ; max bytes in cache when using PSRAM
+
+ ;-D LV_LOG_LEVEL=LV_LOG_LEVEL_INFO
+ ;-D LV_LOG_PRINTF=1
+ ; Add recursive dirs for hal headers search
+ -D _WIN64
+ -D WINDOWS ; We add this ourselves for code branching in hasp
+ -D WIN32_LEAN_AND_MEAN ; exclude a bunch of Windows header files from windows.h
+ -D PAHO_MQTT_STATIC
+ -DPAHO_WITH_SSL=TRUE
+ -DPAHO_BUILD_DOCUMENTATION=FALSE
+ -DPAHO_BUILD_SAMPLES=FALSE
+ -DCMAKE_BUILD_TYPE=Release
+ -DCMAKE_VERBOSE_MAKEFILE=TRUE
+ ;-D NO_PERSISTENCE
+ -I.pio/libdeps/windows_gdi/paho/src
+ -I.pio/libdeps/windows_gdi/ArduinoJson/src
+ -I lib/lv_fs_if
+ -I lib/lv_datetime
+ -mconsole
+ ; ----- Statically linked libraries --------------------
+ -l"ws2_32" ;windsock2
+ -lrpcrt4
+ -lcrypt32
+ -lmingw32
+ -lm
+ -ldinput8
+ ;-ldxguid
+ ;-ldxerr8
+ ;-luser32
+ -lgdi32
+ -lwinmm
+ -limm32
+ -lole32
+ -loleaut32
+ ;-lshell32
+ -lversion
+ ;-luuid
+ -lsetupapi
+ -lshlwapi
+ ;-lhid
+
+lib_deps =
+ ${env.lib_deps}
+ ;lv_drivers@~7.9.0
+ ;lv_drivers=https://github.com/littlevgl/lv_drivers/archive/7d71907c1d6b02797d066f50984b866e080ebeed.zip
+ https://github.com/eclipse/paho.mqtt.c.git
+ bblanchon/ArduinoJson@^6.21.5 ; Json(l) parser
+ https://github.com/fvanroie/lv_drivers
+
+lib_ignore =
+ paho
+ AXP192
+ ArduinoLog
+ lv_lib_qrcode
+ ETHSPI
+
+build_src_filter =
+ +<*>
+ -<*.h>
+ +<../.pio/libdeps/windows_gdi/paho/src/*.c>
+ -<../.pio/libdeps/windows_gdi/paho/src/MQTTClient.c>
+ +<../.pio/libdeps/windows_gdi/paho/src/MQTTAsync.c>
+ +<../.pio/libdeps/windows_gdi/paho/src/MQTTAsyncUtils.c>
+ -<../.pio/libdeps/windows_gdi/paho/src/MQTTVersion.c>
+ -<../.pio/libdeps/windows_gdi/paho/src/SSLSocket.c>
+ -
+ +
+ +
+ -
+ -
+ -
+ +
+ +
+ -
+ +
+ -
+ +
+ +
+ -
+ -
+ -
+ +
+ +
+ +
+ -
+ +
+ +<../.pio/libdeps/windows_gdi/ArduinoJson/src/ArduinoJson.h>
+ +
diff --git a/user_setups/win32/windows_sdl.ini b/user_setups/win32/windows_sdl.ini
new file mode 100644
index 00000000..dfaa7c96
--- /dev/null
+++ b/user_setups/win32/windows_sdl.ini
@@ -0,0 +1,137 @@
+[env:windows_sdl]
+platform = native@^1.1.4
+extra_scripts =
+ tools/sdl2_build_extra.py
+ tools/windows_build_extra.py
+build_flags =
+ ${env.build_flags}
+ -D HASP_MODEL="Windows App"
+ -D HASP_TARGET_PC=1
+
+ ; ----- Monitor
+ -D TFT_WIDTH=240
+ -D TFT_HEIGHT=320
+ ; SDL drivers options
+ ;-D LV_LVGL_H_INCLUDE_SIMPLE
+ ;-D LV_DRV_NO_CONF
+ -D USE_MONITOR
+ -D MONITOR_ZOOM=1 ; can be fractional like 1.5 or 2
+ -D USE_MOUSE
+ -D USE_MOUSEWHEEL
+ -D USE_KEYBOARD
+ ; ----- ArduinoJson
+ -D ARDUINOJSON_DECODE_UNICODE=1
+ -D HASP_NUM_PAGES=12
+ -D HASP_USE_SPIFFS=0
+ -D HASP_USE_LITTLEFS=0
+ -D HASP_USE_EEPROM=0
+ -D HASP_USE_GPIO=0
+ -D HASP_USE_CONFIG=1
+ -D HASP_USE_DEBUG=1
+ -D HASP_USE_PNGDECODE=1
+ -D HASP_USE_BMPDECODE=1
+ -D HASP_USE_GIFDECODE=0
+ -D HASP_USE_JPGDECODE=0
+ -D HASP_USE_MQTT=1
+ -D HASP_USE_SYSLOG=0
+ -D MQTT_MAX_PACKET_SIZE=2048
+ -D HASP_ATTRIBUTE_FAST_MEM=
+ -D IRAM_ATTR= ; No IRAM_ATTR available
+ -D PROGMEM= ; No PROGMEM available
+
+ ; -- FreeType build options ------------------------
+ -D LV_USE_FT_CACHE_MANAGER=1 ; crashes without cache
+ -D LVGL_FREETYPE_MAX_FACES=64 ; max number of FreeType faces in cache
+ -D LVGL_FREETYPE_MAX_SIZES=4 ; max number of sizes in cache
+ -D LVGL_FREETYPE_MAX_BYTES=16384 ; max bytes in cache
+ -D LVGL_FREETYPE_MAX_BYTES_PSRAM=65536 ; max bytes in cache when using PSRAM
+
+ ;-D LV_LOG_LEVEL=LV_LOG_LEVEL_INFO
+ ;-D LV_LOG_PRINTF=1
+ ; Add recursive dirs for hal headers search
+ -D _WIN64
+ -D WINDOWS ; We add this ourselves for code branching in hasp
+ -D WIN32_LEAN_AND_MEAN ; exclude a bunch of Windows header files from windows.h
+ -D PAHO_MQTT_STATIC
+ -DPAHO_WITH_SSL=TRUE
+ -DPAHO_BUILD_DOCUMENTATION=FALSE
+ -DPAHO_BUILD_SAMPLES=FALSE
+ -DCMAKE_BUILD_TYPE=Release
+ -DCMAKE_VERBOSE_MAKEFILE=TRUE
+ ;-D NO_PERSISTENCE
+ -I.pio/libdeps/windows_sdl/paho/src
+ -I.pio/libdeps/windows_sdl/ArduinoJson/src
+ -I lib/lv_fs_if
+ -I lib/lv_datetime
+ !python -c "import os; print(' '.join(['-I {}'.format(i[0].replace('\x5C','/')) for i in os.walk('hal/sdl2')]))"
+ -mconsole
+ ; ----- Statically linked libraries --------------------
+ -l"ws2_32" ;windsock2
+ -lrpcrt4
+ -lcrypt32
+ -lmingw32
+ -lSDL2main
+ -lSDL2
+ -lm
+ -ldinput8
+ ;-ldxguid
+ ;-ldxerr8
+ ;-luser32
+ -lgdi32
+ -lwinmm
+ -limm32
+ -lole32
+ -loleaut32
+ ;-lshell32
+ -lversion
+ ;-luuid
+ -lsetupapi
+ ;-lhid
+
+lib_deps =
+ ${env.lib_deps}
+ ;lv_drivers@~7.9.0
+ ;lv_drivers=https://github.com/littlevgl/lv_drivers/archive/7d71907c1d6b02797d066f50984b866e080ebeed.zip
+ https://github.com/eclipse/paho.mqtt.c.git
+ bblanchon/ArduinoJson@^6.21.5 ; Json(l) parser
+ https://github.com/fvanroie/lv_drivers
+
+lib_ignore =
+ paho
+ AXP192
+ ArduinoLog
+ lv_lib_qrcode
+ ETHSPI
+
+build_src_filter =
+ +<*>
+ -<*.h>
+ +<../.pio/libdeps/windows_sdl/paho/src/*.c>
+ -<../.pio/libdeps/windows_sdl/paho/src/MQTTClient.c>
+ +<../.pio/libdeps/windows_sdl/paho/src/MQTTAsync.c>
+ +<../.pio/libdeps/windows_sdl/paho/src/MQTTAsyncUtils.c>
+ -<../.pio/libdeps/windows_sdl/paho/src/MQTTVersion.c>
+ -<../.pio/libdeps/windows_sdl/paho/src/SSLSocket.c>
+ -
+ +
+ +
+ -
+ -
+ -
+ +
+ +
+ -
+ +
+ -
+ +
+ +
+ -
+ -
+ -
+ +
+ +
+ +
+ -
+ +
+ +<../.pio/libdeps/windows_sdl/ArduinoJson/src/ArduinoJson.h>
+ +
diff --git a/user_setups/win32/windows_sdl_64bits.ini b/user_setups/win32/windows_sdl_64bits.ini
index 9bc1f7c7..b51ecfb4 100644
--- a/user_setups/win32/windows_sdl_64bits.ini
+++ b/user_setups/win32/windows_sdl_64bits.ini
@@ -93,7 +93,7 @@ lib_deps =
;lv_drivers@~7.9.0
;lv_drivers=https://github.com/littlevgl/lv_drivers/archive/7d71907c1d6b02797d066f50984b866e080ebeed.zip
https://github.com/eclipse/paho.mqtt.c.git
- bblanchon/ArduinoJson@^6.21.3 ; Json(l) parser
+ bblanchon/ArduinoJson@^6.21.5 ; Json(l) parser
https://github.com/fvanroie/lv_drivers
lib_ignore =