From a5564a4b41e2e75b1f77ef82cce1785f5a3495d7 Mon Sep 17 00:00:00 2001 From: fvanroie Date: Wed, 11 Nov 2020 17:29:23 +0100 Subject: [PATCH] Update environments --- platformio.ini | 28 +----------- platformio_override-template.ini | 45 +++++++++++-------- user_setups/esp32/lolin-d32-pro_ili9341.ini | 30 +++++++++++++ ...li9341.ini => d1-mini-esp8266_ili9341.ini} | 0 4 files changed, 58 insertions(+), 45 deletions(-) create mode 100644 user_setups/esp32/lolin-d32-pro_ili9341.ini rename user_setups/esp8266/{D1-mini_ili9341.ini => d1-mini-esp8266_ili9341.ini} (100%) diff --git a/platformio.ini b/platformio.ini index 31a0d232..ed112287 100644 --- a/platformio.ini +++ b/platformio.ini @@ -17,7 +17,6 @@ extra_configs = lcd_config.ini pin_config.ini ; -- Put active [env] files in this dir to be included in the build menu - user_setups/*/*.ini user_setups/active/*.ini ; -- Add customizations to this file only: platformio_override.ini @@ -96,7 +95,7 @@ esp8266_flags= -D HASP_USE_MQTT=1 -D HASP_USE_HTTP=1 -D HASP_USE_MDNS=1 - -D HASP_USE_SYSLOG=0 + -D HASP_USE_SYSLOG=1 -D HASP_USE_TELNET=0 -D HASP_USE_SPIFFS=1 -D HASP_USE_EEPROM=1 @@ -158,31 +157,6 @@ hspi32 = ; 7 - mirror content, and rotate 90 deg anti-clockwise -;*************************************************** -; Lolin D32 Pro with Lolin TFT 2.4" -;*************************************************** -; !! This board already defines TFT_CS, TFT_DC and TFT_RST !! -[env:lolind32pro-lolintft24] -platform = espressif32@^2.0.0 -board = lolin_d32_pro -;upload_port = COM6 ; To change the port, use platform_override.ini -;monitor_port = COM6 ; To change the port, use platform_override.ini -board_build.partitions = esp32_partition_app1280k_spiffs1472k.csv -build_flags = - ${flags.esp32_flags} -; -- TFT_eSPI build options ------------------------ - ${lcd.lolin24} - ${pins.vspi32} - ;-D TFT_DC=5 ; Defined by board, don't redefine - ;-D TFT_CS=26 ; Defined by board, don't redefine - ;-D TFT_RST=-1 ; Defined by board, don't redefine - -D TFT_BCKL=-1 ; None, configurable via web UI (e.g. 21) - -D TOUCH_CS=17 ; (can also be 22 or 16) - -lib_ignore = - GxTFT - XPT2046_Touchscreen - ;*************************************************** ; Native build diff --git a/platformio_override-template.ini b/platformio_override-template.ini index a5157818..5c423482 100644 --- a/platformio_override-template.ini +++ b/platformio_override-template.ini @@ -9,10 +9,10 @@ extra_configs = ;user_setups/*/*.ini [override] -; -- Hasp config options ---------------------- +; -- Hasp config options -------------------------------------- build_flags = ; -- Use settings from file user_config_override.h - -DUSE_CONFIG_OVERRIDE +; -DUSE_CONFIG_OVERRIDE extra_default_envs = my_custom_build @@ -26,23 +26,14 @@ extra_default_envs = ;nodemcu32s-raspi ;esp32dev-ili9488 -[env:my_custom_build] -platform = espressif32 -board = nodemcu-32s -upload_port = COM3 -monitor_port = COM3 -debug_tool = esp-prog -debug_init_break = tbreak setup -build_flags = - ${flags.esp32_flags} -; -- TFT_eSPI build options ------------------------ - ${lcd.raspberrypi} - ${pins.vspi32} - -D TFT_CS=5 - -D TFT_DC=4 - -D TFT_RST=32 - -D TOUCH_CS=22 +; -- Define COM ports for each environment -------------------- +[env:d1mini32-lolintft24] +upload_port = COM6 ; Change to the correct port +monitor_port = COM6 ; Change to the correct port +[env:d1mini-lolintft24] +upload_port = COM4 ; Change to the correct port +monitor_port = COM4 ; Change to the correct port [env:esp32dev-mrb3511] upload_port = COM3 ; Change to the correct port @@ -53,3 +44,21 @@ upload_protocol = espota ; Use ArduinoOTA after flashing over serial upload_port = 192.168.0.4 ; IP of the ESP upload_flags = --port=3232 + +; -- Custom Environment configuration example ----------------- +[env:my_custom_build] +platform = espressif32 +board = nodemcu-32s +upload_port = COM3 +monitor_port = COM3 +debug_tool = esp-prog +debug_init_break = tbreak setup +build_flags = + ${flags.esp32_flags} +; -- TFT_eSPI build options ----------------------------------- + ${lcd.raspberrypi} + ${pins.vspi32} + -D TFT_CS=5 + -D TFT_DC=4 + -D TFT_RST=32 + -D TOUCH_CS=22 diff --git a/user_setups/esp32/lolin-d32-pro_ili9341.ini b/user_setups/esp32/lolin-d32-pro_ili9341.ini new file mode 100644 index 00000000..ce139dc6 --- /dev/null +++ b/user_setups/esp32/lolin-d32-pro_ili9341.ini @@ -0,0 +1,30 @@ +;***************************************************; +; Lolin D32 Pro with Lolin TFT 2.4" ; +; - lolin_d32_pro board ; +; - ili9341 TFT ; +; - xpt2606 touch controller ; +;***************************************************; + +; !! This board already defines TFT_CS, TFT_DC and TFT_RST !! + +[env:lolind32pro-lolintft24] +platform = espressif32@^2.0.0 +board = lolin_d32_pro +;upload_port = COM6 ; To change the port, use platform_override.ini +;monitor_port = COM6 ; To change the port, use platform_override.ini +board_build.partitions = esp32_partition_app1280k_spiffs1472k.csv +build_flags = + ${flags.esp32_flags} +; -- TFT_eSPI build options ------------------------ + ${lcd.lolin24} + ${pins.vspi32} + ;-D TFT_DC=5 ; Defined by board, don't redefine !! + ;-D TFT_CS=26 ; Defined by board, don't redefine !! + ;-D TFT_RST=-1 ; Defined by board, don't redefine !! + -D TFT_BCKL=-1 ; None, configurable via web UI (e.g. 21) + -D TOUCH_CS=17 ; (can also be 22 or 16) + +lib_ignore = + GxTFT + XPT2046_Touchscreen + diff --git a/user_setups/esp8266/D1-mini_ili9341.ini b/user_setups/esp8266/d1-mini-esp8266_ili9341.ini similarity index 100% rename from user_setups/esp8266/D1-mini_ili9341.ini rename to user_setups/esp8266/d1-mini-esp8266_ili9341.ini