diff --git a/platformio.ini b/platformio.ini
index 4415e89d..6f7e0167 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -64,10 +64,10 @@ build_flags =
; -- Shared library dependencies in all environments
; Warning : don't put comments after github links => causes infinite download loop
lib_deps =
- bxparks/AceButton @ ^1.8.0 ; GPIO button library
- bblanchon/ArduinoJson @ ^6.17.2 ; Json(l) parser
- bblanchon/StreamUtils @ 1.6.0 ; for EEPromStream
- knolleary/PubSubClient @ ^2.8.0 ; MQTT client
+ bxparks/AceButton@^1.8.0 ; GPIO button library
+ bblanchon/ArduinoJson@^6.17.2 ; Json(l) parser
+ bblanchon/StreamUtils@1.6.0 ; for EEPromStream
+ knolleary/PubSubClient@^2.8.0 ; MQTT client
git+https://github.com/Bodmer/TFT_eSPI.git
git+https://github.com/fvanroie/ConsoleInput.git
git+https://github.com/andrethomas/TasmotaSlave.git
@@ -82,10 +82,7 @@ lib_deps =
;https://github.com/me-no-dev/ESPAsyncWebServer/archive/master.zip
;https://github.com/me-no-dev/ESPAsyncTCP/archive/master.zip
-; lib_ignore =
-; https://github.com/littlevgl/lvgl.git
-
-src_filter = +<*> -<.git/> -<.svn/> - - - - -
+src_filter = +<*> -<.git/> - - - -
extra_scripts = tools/move-rename-firmware.py ; tools/pre:extra_script.py
@@ -104,22 +101,21 @@ build_flags =
;-D USE_DMA_TO_TFT
;-D ESP32_DMA ; Make touch reads wait for DMA
; -- hasp-lvgl build options ------------------------
- -D HASP_USE_MQTT=1
- -D HASP_USE_HTTP=1
- -D HASP_USE_MDNS=1
- -D HASP_USE_SYSLOG=1
-D HASP_USE_TELNET=1
-D HASP_USE_SPIFFS=1
-D HASP_USE_LITTLEFS=0
-D HASP_USE_EEPROM=1
- -D HASP_USE_GPIO=1
; -- LittleFS build options ------------------------
-D CONFIG_LITTLEFS_FOR_IDF_3_2
lib_ignore =
GxTFT
XPT2046_Touchscreen
- ESP32 BLE Arduino
+ Adafruit TouchScreen
+ Adafruit BusIO
+ Adafruit GFX Library
+ sstaub/Ticker
+ lv_drv_fsmc_ili9341
lib_deps = LittleFS_esp32
@@ -136,21 +132,17 @@ build_flags=
; -- lvgl build options -----------------------------
-D LV_MEM_SIZE=16384U ; 16kB lvgl memory
; -- hasp-lvgl build options ------------------------
- -D HASP_USE_WIFI=1
- -D HASP_USE_MQTT=1
- -D HASP_USE_HTTP=1
- -D HASP_USE_MDNS=1
- -D HASP_USE_SYSLOG=1
-D HASP_USE_TELNET=1
-D HASP_USE_SPIFFS=1
-D HASP_USE_LITTLEFS=0
-D HASP_USE_EEPROM=1
- -D HASP_USE_GPIO=1
-D HASP_USE_ETHERNET=0
lib_ignore =
+ ESP32 BLE Arduino
GxTFT
- XPT2046_Touchscreen
+ sstaub/Ticker
+ lv_drv_fsmc_ili9341
lib_deps =
@@ -168,6 +160,11 @@ build_flags=
-D HASP_USE_SPIFFS=0
-D HASP_USE_LITTLEFS=0
+lib_deps =
+ sstaub/Ticker @ ^3.2.0
+ stm32duino/STM32duino LwIP @ ^2.1.2
+ ;https://github.com/stm32duino/LwIP.git
+
;***************************************************
; Hardware options
;***************************************************
diff --git a/user_setups/esp32/esp32-dev_ili9488_parallel.ini b/user_setups/esp32/esp32-dev_ili9488_parallel.ini
index 1a17dc57..d6f73632 100644
--- a/user_setups/esp32/esp32-dev_ili9488_parallel.ini
+++ b/user_setups/esp32/esp32-dev_ili9488_parallel.ini
@@ -12,7 +12,8 @@ upload_port = COM1 ; To change the port, use platform_override.ini
monitor_port = COM1 ; To change the port, use platform_override.ini
monitor_filters = esp32_exception_decoder
board_build.partitions = user_setups/esp32_partition_app1300k_spiffs1216k.csv
-
+check_tool = cppcheck
+check_flags = --enable=all
debug_tool = esp-prog
debug_init_break = tbreak setup
@@ -57,4 +58,6 @@ lib_deps =
lib_ignore =
${env.lib_ignore}
; ${esp32.lib_ignore}
+ lv_drv_fsmc_ili9341
+
;endregion
diff --git a/user_setups/esp32/lolin-d32-pro_ili9341.ini b/user_setups/esp32/lolin-d32-pro_ili9341.ini
index 8ffc3b03..7b4ef28c 100644
--- a/user_setups/esp32/lolin-d32-pro_ili9341.ini
+++ b/user_setups/esp32/lolin-d32-pro_ili9341.ini
@@ -14,6 +14,8 @@ board = lolin_d32_pro
;monitor_port = COM6 ; To change the port, use platform_override.ini
monitor_filters = esp32_exception_decoder
board_build.partitions = user_setups/esp32_partition_app1300k_spiffs1216k.csv
+check_tool = cppcheck
+check_flags = --enable=all
build_flags =
${env.build_flags}
diff --git a/user_setups/stm32f4xx/STM32F407VET6_black_fsmc.ini b/user_setups/stm32f4xx/STM32F407VET6_black_fsmc.ini
index 3fffcc2e..7715f629 100644
--- a/user_setups/stm32f4xx/STM32F407VET6_black_fsmc.ini
+++ b/user_setups/stm32f4xx/STM32F407VET6_black_fsmc.ini
@@ -75,10 +75,8 @@ build_flags =
;region -- Library options -------------------------------
lib_deps =
${env.lib_deps}
- Ticker@^3.1.5
- ; STM32duino LwIP@^2.1.2
+ ${stm32f4.lib_deps}
; STM32duino STM32Ethernet@^1.0.5
- https://github.com/stm32duino/LwIP.git
https://github.com/stm32duino/STM32Ethernet.git
https://github.com/khoih-prog/EthernetWebServer_STM32
adafruit/Adafruit GFX Library @ ^1.10.3
diff --git a/user_setups/stm32f4xx/stm32f407-black_ili9341.ini b/user_setups/stm32f4xx/stm32f407-black_ili9341.ini
index a4088c1e..1f70ab76 100644
--- a/user_setups/stm32f4xx/stm32f407-black_ili9341.ini
+++ b/user_setups/stm32f4xx/stm32f407-black_ili9341.ini
@@ -49,11 +49,9 @@ build_flags =
;region -- Library options -------------------------------
lib_deps =
${env.lib_deps}
- sstaub/Ticker @ ^3.2.0
+ ${stm32f4.lib_deps}
;Ethernet
- ; STM32duino LwIP@^2.1.2
; STM32duino STM32Ethernet@^1.0.5
- https://github.com/stm32duino/LwIP.git
https://github.com/netwizeBE/Ethernet3.git
https://github.com/khoih-prog/EthernetWebServer_STM32
diff --git a/user_setups/stm32f4xx/stm32f407-black_ili9341_parallel.ini b/user_setups/stm32f4xx/stm32f407-black_ili9341_parallel.ini
index b836aac5..035289b5 100644
--- a/user_setups/stm32f4xx/stm32f407-black_ili9341_parallel.ini
+++ b/user_setups/stm32f4xx/stm32f407-black_ili9341_parallel.ini
@@ -57,10 +57,9 @@ build_flags =
;region -- Library options -------------------------------
lib_deps =
${env.lib_deps}
- sstaub/Ticker @ ^3.2.0
+ ${stm32f4.lib_deps}
adafruit/Adafruit GFX Library @ ^1.10.3
adafruit/Adafruit BusIO @ ^1.6.0
- stm32duino/STM32duino LwIP @ ^2.1.2
stm32duino/STM32Ethernet @ ^1.2.0
lib_ignore =
diff --git a/user_setups/stm32f4xx/stm32f407-devebox_ili9341.ini b/user_setups/stm32f4xx/stm32f407-devebox_ili9341.ini
index 60e6c3ad..1adeaf29 100644
--- a/user_setups/stm32f4xx/stm32f407-devebox_ili9341.ini
+++ b/user_setups/stm32f4xx/stm32f407-devebox_ili9341.ini
@@ -70,10 +70,8 @@ build_flags =
;region -- Library options -------------------------------
lib_deps =
${env.lib_deps}
- Ticker@^3.1.5
- ; STM32duino LwIP@^2.1.2
+ ${stm32f4.lib_deps}
; STM32duino STM32Ethernet@^1.0.5
- https://github.com/stm32duino/LwIP.git
https://github.com/stm32duino/STM32Ethernet.git
https://github.com/khoih-prog/EthernetWebServer_STM32