From 310f641f3833b9064f9adc94244bc991590385cb Mon Sep 17 00:00:00 2001 From: fvanroie Date: Wed, 11 Nov 2020 20:36:20 +0100 Subject: [PATCH] Re-organize user_setup files --- .gitignore | 4 +- platformio.ini | 2 +- user_setups/esp32/TTGO-esp32-POE_ili9341.ini | 38 ------------------- user_setups/esp32/d1-mini-esp32_ili9341.ini | 2 +- .../esp32/d132-unoshield_ili9486_parallel.ini | 2 +- user_setups/esp32/esp32-dev_ili9488.ini | 2 +- .../esp32/esp32-dev_ili9488_parallel.ini | 2 +- user_setups/esp32/esp32cam_st7796.ini | 2 +- user_setups/esp32/lolin-d32-pro_ili9341.ini | 2 +- user_setups/esp32/nodemcu-32s_st7796.ini | 2 +- .../esp32_partition_app1280k_spiffs1472k.csv | 0 .../esp32_partition_app1300k_spiffs1216k.csv | 0 lcd_config.ini => user_setups/lcd_config.ini | 0 13 files changed, 9 insertions(+), 49 deletions(-) delete mode 100644 user_setups/esp32/TTGO-esp32-POE_ili9341.ini rename esp32_partition_app1280k_spiffs1472k.csv => user_setups/esp32_partition_app1280k_spiffs1472k.csv (100%) rename esp32_partition_app1300k_spiffs1216k.csv => user_setups/esp32_partition_app1300k_spiffs1216k.csv (100%) rename lcd_config.ini => user_setups/lcd_config.ini (100%) diff --git a/.gitignore b/.gitignore index 887f3694..664189f2 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ build_output/firmware/*.bin ## Test result files *.html *.xml +*.bin ## Visual Studio Code specific ###### .vscode @@ -22,6 +23,3 @@ build_output/firmware/*.bin .vscode/c_cpp_properties.json .vscode/launch.json *.bak - -build_output/firmware/d1mini-lolintft24_v0.2.1111.bin -build_output/firmware/d1mini32-lolintft24_v0.2.1111.bin diff --git a/platformio.ini b/platformio.ini index 43dd1409..0d5ebb32 100644 --- a/platformio.ini +++ b/platformio.ini @@ -9,7 +9,7 @@ ;************************************************************** [platformio] extra_configs = - lcd_config.ini + user_setups/lcd_config.ini ; -- Put active [env] files in this dir to be included in the build menu user_setups/active/*.ini ; -- Add customizations to this file only: diff --git a/user_setups/esp32/TTGO-esp32-POE_ili9341.ini b/user_setups/esp32/TTGO-esp32-POE_ili9341.ini deleted file mode 100644 index bbf50b10..00000000 --- a/user_setups/esp32/TTGO-esp32-POE_ili9341.ini +++ /dev/null @@ -1,38 +0,0 @@ -;***************************************************; -; Lilygo®Ttgo ESP32 with Lolin TFT 2.4" ; -; - T-Internet-Poe ESP32-WROOM ; -; - LAN8720A with POE ; -; - ili9341 TFT ; -; - xpt2606 touch controller ; -;***************************************************; - -[env:ttgo_esp32-lolintft24] -platform = espressif32@^2.0.0 -board = esp32dev -upload_protocol = espota ; Use ArduinoOTA after flashing over serial -upload_port = 10.4.70.37 ; 10.4.0.198 ; IP of the ESP -upload_flags = - --port=3232 - -;upload_port = COM9 ; To change the port, use platform_override.ini -monitor_port = COM9 ; To change the port, use platform_override.ini -board_build.partitions = esp32_partition_app1300k_spiffs1216k.csv ; default.csv -build_flags = - ${flags.esp32_flags} -; -- TFT_eSPI build options ------------------------ - ${lcd.lolin24} - -D TFT_MISO=2 - -D TFT_MOSI=15 - -D TFT_SCLK=14 - -D TFT_DC=4 - -D TFT_CS=33 - -D TFT_RST=12 ; RST - -D TFT_BCKL=16 ; None, configurable via web UI (e.g. 21) - -D TOUCH_CS=32 ; (can also be 22 or 16) -; -- Options ---------------------------------------- - -D HASP_USE_ETHERNET=1 - -D HASP_USE_WIFI=0 - -lib_ignore = - GxTFT - XPT2046_Touchscreen \ No newline at end of file diff --git a/user_setups/esp32/d1-mini-esp32_ili9341.ini b/user_setups/esp32/d1-mini-esp32_ili9341.ini index 6d8bfb93..7f24ce39 100644 --- a/user_setups/esp32/d1-mini-esp32_ili9341.ini +++ b/user_setups/esp32/d1-mini-esp32_ili9341.ini @@ -11,7 +11,7 @@ board = wemos_d1_mini32 ;upload_port = COM5 ; To change the port, use platform_override.ini ;monitor_port = COM5 ; To change the port, use platform_override.ini monitor_filters = esp32_exception_decoder -board_build.partitions = esp32_partition_app1300k_spiffs1216k.csv +board_build.partitions = user_setups/esp32_partition_app1300k_spiffs1216k.csv build_flags = ${flags.esp32_flags} diff --git a/user_setups/esp32/d132-unoshield_ili9486_parallel.ini b/user_setups/esp32/d132-unoshield_ili9486_parallel.ini index 434b5f51..e7b63ddf 100644 --- a/user_setups/esp32/d132-unoshield_ili9486_parallel.ini +++ b/user_setups/esp32/d132-unoshield_ili9486_parallel.ini @@ -9,7 +9,7 @@ platform = espressif32@^2.0.0 board = esp32dev upload_port = COM4 ; To change the port, use platform_override.ini monitor_port = COM4 ; To change the port, use platform_override.ini -board_build.partitions = esp32_partition_app1280k_spiffs1472k.csv +board_build.partitions = user_setups/esp32_partition_app1280k_spiffs1472k.csv build_flags = ${flags.esp32_flags} diff --git a/user_setups/esp32/esp32-dev_ili9488.ini b/user_setups/esp32/esp32-dev_ili9488.ini index f93b3e8c..db7d7efb 100644 --- a/user_setups/esp32/esp32-dev_ili9488.ini +++ b/user_setups/esp32/esp32-dev_ili9488.ini @@ -13,7 +13,7 @@ monitor_port = COM2 ; To change the port, use platform_override.ini ; upload_port = 10.4.0.171 ; IP of the ESP ; upload_flags = ; --port=3232 -board_build.partitions = esp32_partition_app1280k_spiffs1472k.csv +board_build.partitions = user_setups/esp32_partition_app1280k_spiffs1472k.csv debug_tool = esp-prog debug_init_break = tbreak setup diff --git a/user_setups/esp32/esp32-dev_ili9488_parallel.ini b/user_setups/esp32/esp32-dev_ili9488_parallel.ini index aa36d10b..f5a58923 100644 --- a/user_setups/esp32/esp32-dev_ili9488_parallel.ini +++ b/user_setups/esp32/esp32-dev_ili9488_parallel.ini @@ -10,7 +10,7 @@ platform = espressif32@^2.0.0 board = esp32dev upload_port = COM1 ; To change the port, use platform_override.ini monitor_port = COM1 ; To change the port, use platform_override.ini -board_build.partitions = esp32_partition_app1280k_spiffs1472k.csv +board_build.partitions = user_setups/esp32_partition_app1280k_spiffs1472k.csv debug_tool = esp-prog debug_init_break = tbreak setup diff --git a/user_setups/esp32/esp32cam_st7796.ini b/user_setups/esp32/esp32cam_st7796.ini index 0646901d..95a63c8f 100644 --- a/user_setups/esp32/esp32cam_st7796.ini +++ b/user_setups/esp32/esp32cam_st7796.ini @@ -18,7 +18,7 @@ board = esp32cam debug_tool = esp-prog debug_init_break = tbreak setup ;board_build.partitions = min_spiffs.csv -board_build.partitions = esp32_partition_app1280k_spiffs1472k.csv +board_build.partitions = user_setups/esp32_partition_app1280k_spiffs1472k.csv ;ESP32 CAM PINS build_flags = ${flags.esp32_flags} diff --git a/user_setups/esp32/lolin-d32-pro_ili9341.ini b/user_setups/esp32/lolin-d32-pro_ili9341.ini index ce139dc6..967b4e1b 100644 --- a/user_setups/esp32/lolin-d32-pro_ili9341.ini +++ b/user_setups/esp32/lolin-d32-pro_ili9341.ini @@ -12,7 +12,7 @@ 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 +board_build.partitions = user_setups/esp32_partition_app1280k_spiffs1472k.csv build_flags = ${flags.esp32_flags} ; -- TFT_eSPI build options ------------------------ diff --git a/user_setups/esp32/nodemcu-32s_st7796.ini b/user_setups/esp32/nodemcu-32s_st7796.ini index 633f749f..69a05af9 100644 --- a/user_setups/esp32/nodemcu-32s_st7796.ini +++ b/user_setups/esp32/nodemcu-32s_st7796.ini @@ -10,7 +10,7 @@ platform = espressif32@^2.0.0 board = nodemcu-32s upload_port = COM3 ; To change the port, use platform_override.ini monitor_port = COM3 ; To change the port, use platform_override.ini -board_build.partitions = esp32_partition_app1280k_spiffs1472k.csv +board_build.partitions = user_setups/esp32_partition_app1280k_spiffs1472k.csv debug_tool = esp-prog debug_init_break = tbreak setup diff --git a/esp32_partition_app1280k_spiffs1472k.csv b/user_setups/esp32_partition_app1280k_spiffs1472k.csv similarity index 100% rename from esp32_partition_app1280k_spiffs1472k.csv rename to user_setups/esp32_partition_app1280k_spiffs1472k.csv diff --git a/esp32_partition_app1300k_spiffs1216k.csv b/user_setups/esp32_partition_app1300k_spiffs1216k.csv similarity index 100% rename from esp32_partition_app1300k_spiffs1216k.csv rename to user_setups/esp32_partition_app1300k_spiffs1216k.csv diff --git a/lcd_config.ini b/user_setups/lcd_config.ini similarity index 100% rename from lcd_config.ini rename to user_setups/lcd_config.ini