diff --git a/platformio.ini b/platformio.ini index 6311e0ab..ff57addf 100644 --- a/platformio.ini +++ b/platformio.ini @@ -20,14 +20,6 @@ default_envs = ; You can also create new environments in in platformio_override.ini ${override.extra_default_envs} -; -- Location of the configuration files -;include_dir = - ;include - ;lv_lib_zifont - ;lvgl - ;png_decoder - - ;*************************************************** ; Common environment settings ;*************************************************** @@ -37,24 +29,24 @@ upload_speed = 921600 monitor_speed = 115200 ; -- Shared library dependencies in all environments lib_deps = - ;lvgl@7.0.0 ; Not in library yet - ;https://github.com/netwizeBE/TFT_eSPI.git + ;lvgl@7.7.2 ; Not in library yet bodmer/TFT_eSPI @ ^2.3.4 ; Tft SPI drivers - ;TFT_eSPI@^1.4.20 ; Tft SPI drivers - PubSubClient @ ^2.8.0 ; MQTT client - ArduinoJson @ ^6.17.1 ; JSON Parser - StreamUtils @ ^1.5.0 - ;Syslog@^2.0.0 ; Obsoleted + ;TFT_eSPI@^1.4.20 ; Tft SPI drivers + PubSubClient @ ^2.8.0 ; MQTT client + ArduinoJson @ ^6.17.2 ; Json(l) parser + StreamUtils @ ^1.5.0 ; for EEPromStream AceButton @ ^1.7.0 + https://github.com/andrethomas/TasmotaSlave.git + ; ------ Uned / Test libraries + ;https://github.com/netwizeBE/TFT_eSPI.git + ;Syslog@^2.0.0 ; Obsoleted ;AsyncTCP ;https://github.com/me-no-dev/ESPAsyncWebServer/archive/master.zip ;https://github.com/me-no-dev/ESPAsyncTCP/archive/master.zip - https://github.com/andrethomas/TasmotaSlave.git lib_ignore = https://github.com/littlevgl/lvgl.git - build_flags = ;-Os ; Code Size Optimization -Og ; Code Debug Optimization @@ -75,7 +67,7 @@ build_flags = ${override.build_flags} -D HASP_VERSION_MAJOR=0 -D HASP_VERSION_MINOR=2 - -D HASP_VERSION_REVISION=1116 + -D HASP_VERSION_REVISION=1118 src_filter = +<*> -<.git/> -<.svn/> - - - - - @@ -147,17 +139,6 @@ hspi32 = -D TFT_MOSI=13 -D TFT_SCLK=14 -; Rotation params: -; 0 - 0 deg -; 1 - 90 deg anti-clockwise (from 0 deg) -; 2 - 180 deg anti-clockwise -; 3 - 270 deg anti-clockwise -; 4 - mirror content, and rotate 180 deg anti-clockwise -; 5 - mirror content, and rotate 270 deg anti-clockwise -; 6 - mirror content, and rotate 0 deg anti-clockwise -; 7 - mirror content, and rotate 90 deg anti-clockwise - - ;*************************************************** ; Native build diff --git a/user_setups/lcd_config.ini b/user_setups/lcd_config.ini index 0e421971..6cadcb3f 100644 --- a/user_setups/lcd_config.ini +++ b/user_setups/lcd_config.ini @@ -4,11 +4,21 @@ tft_rotation = 0 ; default rotation tft_width = 240 ; default width tft_height = 320 ; default height +; TFT_ROTATION values: +; 0 - 0 deg +; 1 - 90 deg anti-clockwise (from 0 deg) +; 2 - 180 deg anti-clockwise +; 3 - 270 deg anti-clockwise +; 4 - mirror content, and rotate 180 deg anti-clockwise +; 5 - mirror content, and rotate 270 deg anti-clockwise +; 6 - mirror content, and rotate 0 deg anti-clockwise +; 7 - mirror content, and rotate 90 deg anti-clockwise + lolin24 = -D ILI9341_DRIVER=1 -D TFT_WIDTH=240 -D TFT_HEIGHT=320 - -D TFT_ROTATION=0 ; 0=0, 1=90, 2=180 or 3=270 degree + -D TFT_ROTATION=0 ; see TFT_ROTATION values -D SPI_FREQUENCY=40000000 -D SPI_TOUCH_FREQUENCY=2500000 -D SPI_READ_FREQUENCY=20000000 @@ -21,7 +31,7 @@ raspberrypi = -D ST7796_DRIVER=1 -D TFT_WIDTH=320 -D TFT_HEIGHT=480 - -D TFT_ROTATION=0 ; 0=0, 1=90, 2=180 or 3=270 degree + -D TFT_ROTATION=0 ; see TFT_ROTATION values -D SPI_FREQUENCY=80000000 -D SPI_TOUCH_FREQUENCY=2500000 -D USER_SETUP_LOADED=1 @@ -33,7 +43,7 @@ mrb3511 = -D ILI9488_DRIVER=1 -D TFT_WIDTH=320 -D TFT_HEIGHT=480 - -D TFT_ROTATION=0 ; 0=0, 1=90, 2=180 or 3=270 degree + -D TFT_ROTATION=0 ; see TFT_ROTATION values -D USER_SETUP_LOADED=1 -D TOUCH_DRIVER=1 ; GT911 Capacitive touch panel driver -D SUPPORT_TRANSACTIONS