From 1a4431e1cbdb6fea84d41f2699e2b05e2cf9f67c Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Wed, 5 Mar 2025 23:28:40 +0100 Subject: [PATCH] [Build] Restore envs, minor env config improvements for Solo1 builds --- platformio.ini | 14 +- platformio_esp32_envs.ini | 639 ++++++++++++++++++------------------- platformio_esp32_solo1.ini | 26 +- 3 files changed, 340 insertions(+), 339 deletions(-) diff --git a/platformio.ini b/platformio.ini index 7c0edc27a..91cc422d2 100644 --- a/platformio.ini +++ b/platformio.ini @@ -19,15 +19,15 @@ build_cache_dir = .cache extra_configs = platformio_core_defs.ini platformio_esp82xx_base.ini - ; platformio_esp82xx_envs.ini + platformio_esp82xx_envs.ini platformio_esp32_envs.ini platformio_esp32_solo1.ini - ; platformio_esp32c3_envs.ini - ; platformio_esp32s2_envs.ini - ; platformio_esp32s3_envs.ini - ; platformio_special_envs.ini - ; platformio_esp32c2_envs.ini - ; platformio_esp32c6_envs.ini + platformio_esp32c3_envs.ini + platformio_esp32s2_envs.ini + platformio_esp32s3_envs.ini + platformio_special_envs.ini + platformio_esp32c2_envs.ini + platformio_esp32c6_envs.ini ;default_envs = normal_ESP32_4M diff --git a/platformio_esp32_envs.ini b/platformio_esp32_envs.ini index e0a511cae..b33b58035 100644 --- a/platformio_esp32_envs.ini +++ b/platformio_esp32_envs.ini @@ -162,383 +162,382 @@ board = esp32_16M8M board_upload.flash_size = 16MB build_flags = ${esp32_custom_base_LittleFS.build_flags} -DFEATURE_ETHERNET=1 -extra_scripts = ${esp32_custom_base_LittleFS.extra_scripts} -; [env:custom_IR_ESP32_4M316k] -; extends = esp32_common +[env:custom_IR_ESP32_4M316k] +extends = esp32_common +board = esp32_4M +build_flags = ${esp32_common.build_flags} + -DPLUGIN_BUILD_CUSTOM + -DPLUGIN_BUILD_IR +lib_ignore = ${esp32_always.lib_ignore} + ESP32_ping +extra_scripts = ${esp32_common.extra_scripts} + pre:tools/pio/pre_custom_esp32_IR.py + pre:tools/pio/ir_build_check.py + +[env:custom_ESP32_4M2M_NO_OTA_LittleFS_ETH] +extends = esp32_custom_base_LittleFS +board = esp32_4M2M +build_flags = ${esp32_custom_base_LittleFS.build_flags} + -DNO_HTTP_UPDATER + -DFEATURE_ETHERNET=1 + + +[env:normal_ESP32_4M316k] +extends = esp32_common +board = esp32_4M +lib_ignore = ${esp32_common.lib_ignore} + ${no_ir.lib_ignore} + +; [env:normal_ESP32_4M316k_LittleFS] +; extends = esp32_common_LittleFS ; board = esp32_4M -; build_flags = ${esp32_common.build_flags} -; -DPLUGIN_BUILD_CUSTOM -; -DPLUGIN_BUILD_IR -; lib_ignore = ${esp32_always.lib_ignore} -; ESP32_ping -; extra_scripts = ${esp32_common.extra_scripts} -; pre:tools/pio/pre_custom_esp32_IR.py -; pre:tools/pio/ir_build_check.py - -; [env:custom_ESP32_4M2M_NO_OTA_LittleFS_ETH] -; extends = esp32_custom_base_LittleFS -; board = esp32_4M2M -; build_flags = ${esp32_custom_base_LittleFS.build_flags} -; -DNO_HTTP_UPDATER -; -DFEATURE_ETHERNET=1 - - -; [env:normal_ESP32_4M316k] -; extends = esp32_common -; board = esp32_4M -; lib_ignore = ${esp32_common.lib_ignore} +; lib_ignore = ${esp32_common_LittleFS.lib_ignore} ; ${no_ir.lib_ignore} -; ; [env:normal_ESP32_4M316k_LittleFS] -; ; extends = esp32_common_LittleFS -; ; board = esp32_4M -; ; lib_ignore = ${esp32_common_LittleFS.lib_ignore} -; ; ${no_ir.lib_ignore} +[env:collection_A_ESP32_4M316k] +extends = esp32_common +board = esp32_4M +build_flags = ${esp32_common.build_flags} + -DFEATURE_ARDUINO_OTA=1 + -DPLUGIN_SET_COLLECTION_ESP32 + -DCOLLECTION_FEATURE_RTTTL=1 -; [env:collection_A_ESP32_4M316k] -; extends = esp32_common -; board = esp32_4M -; build_flags = ${esp32_common.build_flags} -; -DFEATURE_ARDUINO_OTA=1 -; -DPLUGIN_SET_COLLECTION_ESP32 -; -DCOLLECTION_FEATURE_RTTTL=1 +[env:collection_B_ESP32_4M316k] +extends = esp32_common +board = esp32_4M +build_flags = ${esp32_common.build_flags} + -DFEATURE_ARDUINO_OTA=1 + -DPLUGIN_SET_COLLECTION_B_ESP32 + -DCOLLECTION_FEATURE_RTTTL=1 -; [env:collection_B_ESP32_4M316k] -; extends = esp32_common -; board = esp32_4M -; build_flags = ${esp32_common.build_flags} -; -DFEATURE_ARDUINO_OTA=1 -; -DPLUGIN_SET_COLLECTION_B_ESP32 -; -DCOLLECTION_FEATURE_RTTTL=1 +[env:collection_C_ESP32_4M316k] +extends = esp32_common +board = esp32_4M +build_flags = ${esp32_common.build_flags} + -DFEATURE_ARDUINO_OTA=1 + -DPLUGIN_SET_COLLECTION_C_ESP32 + -DCOLLECTION_FEATURE_RTTTL=1 -; [env:collection_C_ESP32_4M316k] -; extends = esp32_common -; board = esp32_4M -; build_flags = ${esp32_common.build_flags} -; -DFEATURE_ARDUINO_OTA=1 -; -DPLUGIN_SET_COLLECTION_C_ESP32 -; -DCOLLECTION_FEATURE_RTTTL=1 +[env:collection_D_ESP32_4M316k] +extends = esp32_common +board = esp32_4M +build_flags = ${esp32_common.build_flags} + -DFEATURE_ARDUINO_OTA=1 + -DPLUGIN_SET_COLLECTION_D_ESP32 + -DCOLLECTION_FEATURE_RTTTL=1 -; [env:collection_D_ESP32_4M316k] -; extends = esp32_common -; board = esp32_4M -; build_flags = ${esp32_common.build_flags} -; -DFEATURE_ARDUINO_OTA=1 -; -DPLUGIN_SET_COLLECTION_D_ESP32 -; -DCOLLECTION_FEATURE_RTTTL=1 +[env:collection_E_ESP32_4M316k] +extends = esp32_common +board = esp32_4M +build_flags = ${esp32_common.build_flags} + -DFEATURE_ARDUINO_OTA=1 + -DPLUGIN_SET_COLLECTION_E_ESP32 + -DCOLLECTION_FEATURE_RTTTL=1 -; [env:collection_E_ESP32_4M316k] -; extends = esp32_common -; board = esp32_4M -; build_flags = ${esp32_common.build_flags} -; -DFEATURE_ARDUINO_OTA=1 -; -DPLUGIN_SET_COLLECTION_E_ESP32 -; -DCOLLECTION_FEATURE_RTTTL=1 +[env:collection_F_ESP32_4M316k] +extends = esp32_common +board = esp32_4M +build_flags = ${esp32_common.build_flags} + -DFEATURE_ARDUINO_OTA=1 + -DPLUGIN_SET_COLLECTION_F_ESP32 + -DCOLLECTION_FEATURE_RTTTL=1 -; [env:collection_F_ESP32_4M316k] -; extends = esp32_common -; board = esp32_4M -; build_flags = ${esp32_common.build_flags} -; -DFEATURE_ARDUINO_OTA=1 -; -DPLUGIN_SET_COLLECTION_F_ESP32 -; -DCOLLECTION_FEATURE_RTTTL=1 - -; [env:collection_G_ESP32_4M316k] -; extends = esp32_common -; board = esp32_4M -; build_flags = ${esp32_common.build_flags} -; -DFEATURE_ARDUINO_OTA=1 -; -DPLUGIN_SET_COLLECTION_G_ESP32 -; -DCOLLECTION_FEATURE_RTTTL=1 +[env:collection_G_ESP32_4M316k] +extends = esp32_common +board = esp32_4M +build_flags = ${esp32_common.build_flags} + -DFEATURE_ARDUINO_OTA=1 + -DPLUGIN_SET_COLLECTION_G_ESP32 + -DCOLLECTION_FEATURE_RTTTL=1 -; [env:collection_A_ESP32_IRExt_4M316k] +[env:collection_A_ESP32_IRExt_4M316k] +extends = esp32_IRExt +board = esp32_4M +build_flags = ${esp32_IRExt.build_flags} + -DPLUGIN_SET_COLLECTION_ESP32 + +[env:collection_B_ESP32_IRExt_4M316k] +extends = esp32_IRExt +board = esp32_4M +build_flags = ${esp32_IRExt.build_flags} + -DPLUGIN_SET_COLLECTION_B_ESP32 + +[env:collection_C_ESP32_IRExt_4M316k] +extends = esp32_IRExt +board = esp32_4M +build_flags = ${esp32_IRExt.build_flags} + -DPLUGIN_SET_COLLECTION_C_ESP32 + +[env:collection_D_ESP32_IRExt_4M316k] +extends = esp32_IRExt +board = esp32_4M +build_flags = ${esp32_IRExt.build_flags} + -DPLUGIN_SET_COLLECTION_D_ESP32 + +[env:collection_E_ESP32_IRExt_4M316k] +extends = esp32_IRExt +board = esp32_4M +build_flags = ${esp32_IRExt.build_flags} + -DPLUGIN_SET_COLLECTION_E_ESP32 + +[env:collection_F_ESP32_IRExt_4M316k] +extends = esp32_IRExt +board = esp32_4M +build_flags = ${esp32_IRExt.build_flags} + -DPLUGIN_SET_COLLECTION_F_ESP32 + +[env:collection_G_ESP32_IRExt_4M316k] +extends = esp32_IRExt +board = esp32_4M +build_flags = ${esp32_IRExt.build_flags} + -DPLUGIN_SET_COLLECTION_G_ESP32 + +[env:energy_ESP32_4M316k] +extends = esp32_common +board = esp32_4M +build_flags = ${esp32_common.build_flags} + -DFEATURE_ARDUINO_OTA=1 + -DPLUGIN_ENERGY_COLLECTION + +[env:display_ESP32_4M316k] +extends = esp32_common +board = esp32_4M +build_flags = ${esp32_common.build_flags} + -DFEATURE_ARDUINO_OTA=1 + -DPLUGIN_DISPLAY_COLLECTION + +[env:climate_ESP32_4M316k] +extends = esp32_common +board = esp32_4M +build_flags = ${esp32_common.build_flags} + -DFEATURE_ARDUINO_OTA=1 + -DPLUGIN_CLIMATE_COLLECTION + +[env:neopixel_ESP32_4M316k] +extends = esp32_common +board = esp32_4M +build_flags = ${esp32_common.build_flags} + -DFEATURE_ARDUINO_OTA=1 + -DFEATURE_SD=1 + -D PLUGIN_NEOPIXEL_COLLECTION + + +[env:custom_ESP32_4M316k_ETH] +extends = env:custom_ESP32_4M316k +build_flags = ${env:custom_ESP32_4M316k.build_flags} + -DFEATURE_ETHERNET=1 + +[env:custom_ESP32_4M316k_LittleFS_ETH] +extends = esp32_custom_base_LittleFS +board = esp32_4M +build_flags = ${esp32_custom_base_LittleFS.build_flags} + -DFEATURE_ETHERNET=1 + + +[env:custom_IR_ESP32_4M316k_ETH] +extends = env:custom_IR_ESP32_4M316k +build_flags = ${env:custom_IR_ESP32_4M316k.build_flags} + -DFEATURE_ETHERNET=1 +extra_scripts = ${env:custom_IR_ESP32_4M316k.extra_scripts} + +[env:custom_IR_ESP32_16M8M_LittleFS_ETH] +extends = esp32_common_LittleFS +board = esp32_16M8M +board_upload.flash_size = 16MB +build_flags = ${esp32_common_LittleFS.build_flags} + -DPLUGIN_BUILD_CUSTOM + -DPLUGIN_BUILD_IR + -DFEATURE_ETHERNET=1 +lib_ignore = ${esp32_always.lib_ignore} + ESP32_ping + ${esp32_common_LittleFS.lib_ignore} +extra_scripts = ${esp32_common.extra_scripts} + pre:tools/pio/pre_custom_esp32_IR.py + pre:tools/pio/ir_build_check.py + +[env:normal_ESP32_4M316k_ETH] +extends = env:normal_ESP32_4M316k +build_flags = ${env:normal_ESP32_4M316k.build_flags} + -DFEATURE_ETHERNET=1 + + +[env:normal_ESP32_4M316k_LittleFS_ETH] +extends = esp32_common_LittleFS +board = esp32_4M +lib_ignore = ${esp32_always.lib_ignore} + ESP32_ping + ${esp32_common_LittleFS.lib_ignore} + ${no_ir.lib_ignore} +build_flags = ${esp32_common_LittleFS.build_flags} + -DFEATURE_ETHERNET=1 + + +[env:normal_ESP32_IRExt_4M316k_ETH] +extends = esp32_IRExt +board = esp32_4M +build_flags = ${esp32_IRExt.build_flags} + -DFEATURE_ETHERNET=1 + +[env:collection_A_ESP32_4M316k_ETH] +extends = env:collection_A_ESP32_4M316k +build_flags = ${env:collection_A_ESP32_4M316k.build_flags} + -DFEATURE_ETHERNET=1 + -DCOLLECTION_FEATURE_RTTTL=1 + +[env:collection_B_ESP32_4M316k_ETH] +extends = env:collection_B_ESP32_4M316k +build_flags = ${env:collection_B_ESP32_4M316k.build_flags} + -DFEATURE_ETHERNET=1 + -DCOLLECTION_FEATURE_RTTTL=1 + +[env:collection_C_ESP32_4M316k_ETH] +extends = env:collection_C_ESP32_4M316k +build_flags = ${env:collection_C_ESP32_4M316k.build_flags} + -DFEATURE_ETHERNET=1 + -DCOLLECTION_FEATURE_RTTTL=1 + +[env:collection_D_ESP32_4M316k_ETH] +extends = env:collection_D_ESP32_4M316k +build_flags = ${env:collection_D_ESP32_4M316k.build_flags} + -DFEATURE_ETHERNET=1 + -DCOLLECTION_FEATURE_RTTTL=1 + +[env:collection_E_ESP32_4M316k_ETH] +extends = env:collection_E_ESP32_4M316k +build_flags = ${env:collection_E_ESP32_4M316k.build_flags} + -DFEATURE_ETHERNET=1 + -DCOLLECTION_FEATURE_RTTTL=1 + +[env:collection_F_ESP32_4M316k_ETH] +extends = env:collection_F_ESP32_4M316k +build_flags = ${env:collection_F_ESP32_4M316k.build_flags} + -DFEATURE_ETHERNET=1 + -DCOLLECTION_FEATURE_RTTTL=1 + +[env:collection_G_ESP32_4M316k_ETH] +extends = env:collection_G_ESP32_4M316k +build_flags = ${env:collection_G_ESP32_4M316k.build_flags} + -DFEATURE_ETHERNET=1 + -DCOLLECTION_FEATURE_RTTTL=1 + +[env:energy_ESP32_4M316k_ETH] +extends = env:energy_ESP32_4M316k +build_flags = ${env:energy_ESP32_4M316k.build_flags} + -DFEATURE_ETHERNET=1 + +[env:display_ESP32_4M316k_ETH] +extends = env:display_ESP32_4M316k +build_flags = ${env:display_ESP32_4M316k.build_flags} + -DFEATURE_ETHERNET=1 + +[env:climate_ESP32_4M316k_ETH] +extends = env:climate_ESP32_4M316k +build_flags = ${env:climate_ESP32_4M316k.build_flags} + -DFEATURE_ETHERNET=1 + +[env:neopixel_ESP32_4M316k_ETH] +extends = env:neopixel_ESP32_4M316k +build_flags = ${env:neopixel_ESP32_4M316k.build_flags} + -DFEATURE_ETHERNET=1 + +; [env:collection_A_ESP32_IRExt_4M316k_ETH] ; extends = esp32_IRExt ; board = esp32_4M ; build_flags = ${esp32_IRExt.build_flags} ; -DPLUGIN_SET_COLLECTION_ESP32 +; -DFEATURE_ETHERNET=1 -; [env:collection_B_ESP32_IRExt_4M316k] +; [env:collection_B_ESP32_IRExt_4M316k_ETH] ; extends = esp32_IRExt ; board = esp32_4M ; build_flags = ${esp32_IRExt.build_flags} ; -DPLUGIN_SET_COLLECTION_B_ESP32 +; -DFEATURE_ETHERNET=1 -; [env:collection_C_ESP32_IRExt_4M316k] +; [env:collection_C_ESP32_IRExt_4M316k_ETH] ; extends = esp32_IRExt ; board = esp32_4M ; build_flags = ${esp32_IRExt.build_flags} ; -DPLUGIN_SET_COLLECTION_C_ESP32 +; -DFEATURE_ETHERNET=1 -; [env:collection_D_ESP32_IRExt_4M316k] +; [env:collection_D_ESP32_IRExt_4M316k_ETH] ; extends = esp32_IRExt ; board = esp32_4M ; build_flags = ${esp32_IRExt.build_flags} ; -DPLUGIN_SET_COLLECTION_D_ESP32 +; -DFEATURE_ETHERNET=1 -; [env:collection_E_ESP32_IRExt_4M316k] +; [env:collection_E_ESP32_IRExt_4M316k_ETH] ; extends = esp32_IRExt ; board = esp32_4M ; build_flags = ${esp32_IRExt.build_flags} ; -DPLUGIN_SET_COLLECTION_E_ESP32 +; -DFEATURE_ETHERNET=1 -; [env:collection_F_ESP32_IRExt_4M316k] +; [env:collection_F_ESP32_IRExt_4M316k_ETH] ; extends = esp32_IRExt ; board = esp32_4M ; build_flags = ${esp32_IRExt.build_flags} ; -DPLUGIN_SET_COLLECTION_F_ESP32 +; -DFEATURE_ETHERNET=1 -; [env:collection_G_ESP32_IRExt_4M316k] +; [env:collection_G_ESP32_IRExt_4M316k_ETH] ; extends = esp32_IRExt ; board = esp32_4M ; build_flags = ${esp32_IRExt.build_flags} ; -DPLUGIN_SET_COLLECTION_G_ESP32 +; -DFEATURE_ETHERNET=1 -; [env:energy_ESP32_4M316k] -; extends = esp32_common +; [env:energy_ESP32_IRExt_4M316k_ETH] +; extends = esp32_IRExt ; board = esp32_4M -; build_flags = ${esp32_common.build_flags} -; -DFEATURE_ARDUINO_OTA=1 +; build_flags = ${esp32_IRExt.build_flags} ; -DPLUGIN_ENERGY_COLLECTION - -; [env:display_ESP32_4M316k] -; extends = esp32_common -; board = esp32_4M -; build_flags = ${esp32_common.build_flags} -; -DFEATURE_ARDUINO_OTA=1 -; -DPLUGIN_DISPLAY_COLLECTION - -; [env:climate_ESP32_4M316k] -; extends = esp32_common -; board = esp32_4M -; build_flags = ${esp32_common.build_flags} -; -DFEATURE_ARDUINO_OTA=1 -; -DPLUGIN_CLIMATE_COLLECTION - -; [env:neopixel_ESP32_4M316k] -; extends = esp32_common -; board = esp32_4M -; build_flags = ${esp32_common.build_flags} -; -DFEATURE_ARDUINO_OTA=1 -; -DFEATURE_SD=1 -; -D PLUGIN_NEOPIXEL_COLLECTION - - -; [env:custom_ESP32_4M316k_ETH] -; extends = env:custom_ESP32_4M316k -; build_flags = ${env:custom_ESP32_4M316k.build_flags} ; -DFEATURE_ETHERNET=1 -; [env:custom_ESP32_4M316k_LittleFS_ETH] -; extends = esp32_custom_base_LittleFS -; board = esp32_4M -; build_flags = ${esp32_custom_base_LittleFS.build_flags} -; -DFEATURE_ETHERNET=1 - - -; [env:custom_IR_ESP32_4M316k_ETH] -; extends = env:custom_IR_ESP32_4M316k -; build_flags = ${env:custom_IR_ESP32_4M316k.build_flags} -; -DFEATURE_ETHERNET=1 -; extra_scripts = ${env:custom_IR_ESP32_4M316k.extra_scripts} - -; [env:custom_IR_ESP32_16M8M_LittleFS_ETH] -; extends = esp32_common_LittleFS -; board = esp32_16M8M -; board_upload.flash_size = 16MB -; build_flags = ${esp32_common_LittleFS.build_flags} -; -DPLUGIN_BUILD_CUSTOM -; -DPLUGIN_BUILD_IR -; -DFEATURE_ETHERNET=1 -; lib_ignore = ${esp32_always.lib_ignore} -; ESP32_ping -; ${esp32_common_LittleFS.lib_ignore} -; extra_scripts = ${esp32_common.extra_scripts} -; pre:tools/pio/pre_custom_esp32_IR.py -; pre:tools/pio/ir_build_check.py - -; [env:normal_ESP32_4M316k_ETH] -; extends = env:normal_ESP32_4M316k -; build_flags = ${env:normal_ESP32_4M316k.build_flags} -; -DFEATURE_ETHERNET=1 - - -; [env:normal_ESP32_4M316k_LittleFS_ETH] -; extends = esp32_common_LittleFS -; board = esp32_4M -; lib_ignore = ${esp32_always.lib_ignore} -; ESP32_ping -; ${esp32_common_LittleFS.lib_ignore} -; ${no_ir.lib_ignore} -; build_flags = ${esp32_common_LittleFS.build_flags} -; -DFEATURE_ETHERNET=1 - - -; [env:normal_ESP32_IRExt_4M316k_ETH] +; [env:display_ESP32_IRExt_4M316k_ETH] ; extends = esp32_IRExt ; board = esp32_4M ; build_flags = ${esp32_IRExt.build_flags} +; -DPLUGIN_DISPLAY_COLLECTION ; -DFEATURE_ETHERNET=1 -; [env:collection_A_ESP32_4M316k_ETH] -; extends = env:collection_A_ESP32_4M316k -; build_flags = ${env:collection_A_ESP32_4M316k.build_flags} -; -DFEATURE_ETHERNET=1 -; -DCOLLECTION_FEATURE_RTTTL=1 - -; [env:collection_B_ESP32_4M316k_ETH] -; extends = env:collection_B_ESP32_4M316k -; build_flags = ${env:collection_B_ESP32_4M316k.build_flags} -; -DFEATURE_ETHERNET=1 -; -DCOLLECTION_FEATURE_RTTTL=1 - -; [env:collection_C_ESP32_4M316k_ETH] -; extends = env:collection_C_ESP32_4M316k -; build_flags = ${env:collection_C_ESP32_4M316k.build_flags} -; -DFEATURE_ETHERNET=1 -; -DCOLLECTION_FEATURE_RTTTL=1 - -; [env:collection_D_ESP32_4M316k_ETH] -; extends = env:collection_D_ESP32_4M316k -; build_flags = ${env:collection_D_ESP32_4M316k.build_flags} -; -DFEATURE_ETHERNET=1 -; -DCOLLECTION_FEATURE_RTTTL=1 - -; [env:collection_E_ESP32_4M316k_ETH] -; extends = env:collection_E_ESP32_4M316k -; build_flags = ${env:collection_E_ESP32_4M316k.build_flags} -; -DFEATURE_ETHERNET=1 -; -DCOLLECTION_FEATURE_RTTTL=1 - -; [env:collection_F_ESP32_4M316k_ETH] -; extends = env:collection_F_ESP32_4M316k -; build_flags = ${env:collection_F_ESP32_4M316k.build_flags} -; -DFEATURE_ETHERNET=1 -; -DCOLLECTION_FEATURE_RTTTL=1 - -; [env:collection_G_ESP32_4M316k_ETH] -; extends = env:collection_G_ESP32_4M316k -; build_flags = ${env:collection_G_ESP32_4M316k.build_flags} -; -DFEATURE_ETHERNET=1 -; -DCOLLECTION_FEATURE_RTTTL=1 - -; [env:energy_ESP32_4M316k_ETH] -; extends = env:energy_ESP32_4M316k -; build_flags = ${env:energy_ESP32_4M316k.build_flags} +; [env:climate_ESP32_IRExt_4M316k_ETH] +; extends = esp32_IRExt +; board = esp32_4M +; build_flags = ${esp32_IRExt.build_flags} +; -DPLUGIN_CLIMATE_COLLECTION ; -DFEATURE_ETHERNET=1 -; [env:display_ESP32_4M316k_ETH] -; extends = env:display_ESP32_4M316k -; build_flags = ${env:display_ESP32_4M316k.build_flags} +; [env:neopixel_ESP32_IRExt_4M316k_ETH] +; extends = esp32_IRExt +; board = esp32_4M +; build_flags = ${esp32_IRExt.build_flags} +; -D PLUGIN_NEOPIXEL_COLLECTION ; -DFEATURE_ETHERNET=1 -; [env:climate_ESP32_4M316k_ETH] -; extends = env:climate_ESP32_4M316k -; build_flags = ${env:climate_ESP32_4M316k.build_flags} -; -DFEATURE_ETHERNET=1 -; [env:neopixel_ESP32_4M316k_ETH] -; extends = env:neopixel_ESP32_4M316k -; build_flags = ${env:neopixel_ESP32_4M316k.build_flags} -; -DFEATURE_ETHERNET=1 +; ESP32 MAX builds 16M flash ------------------------------ -; ; [env:collection_A_ESP32_IRExt_4M316k_ETH] -; ; extends = esp32_IRExt -; ; board = esp32_4M -; ; build_flags = ${esp32_IRExt.build_flags} -; ; -DPLUGIN_SET_COLLECTION_ESP32 -; ; -DFEATURE_ETHERNET=1 +; A Lolin D32 PRO with 16MB Flash, allowing 4MB sketch size, and file storage using the default (SPIFFS) filesystem +[env:max_ESP32_16M1M] +extends = esp32_common +board = esp32_16M1M +board_upload.flash_size = 16MB +lib_ignore = ${esp32_always.lib_ignore} + ESP32_ping +build_flags = ${esp32_common.build_flags} + -DFEATURE_ARDUINO_OTA=1 + -DPLUGIN_BUILD_MAX_ESP32 + -DPLUGIN_BUILD_IR_EXTENDED -; ; [env:collection_B_ESP32_IRExt_4M316k_ETH] -; ; extends = esp32_IRExt -; ; board = esp32_4M -; ; build_flags = ${esp32_IRExt.build_flags} -; ; -DPLUGIN_SET_COLLECTION_B_ESP32 -; ; -DFEATURE_ETHERNET=1 - -; ; [env:collection_C_ESP32_IRExt_4M316k_ETH] -; ; extends = esp32_IRExt -; ; board = esp32_4M -; ; build_flags = ${esp32_IRExt.build_flags} -; ; -DPLUGIN_SET_COLLECTION_C_ESP32 -; ; -DFEATURE_ETHERNET=1 - -; ; [env:collection_D_ESP32_IRExt_4M316k_ETH] -; ; extends = esp32_IRExt -; ; board = esp32_4M -; ; build_flags = ${esp32_IRExt.build_flags} -; ; -DPLUGIN_SET_COLLECTION_D_ESP32 -; ; -DFEATURE_ETHERNET=1 - -; ; [env:collection_E_ESP32_IRExt_4M316k_ETH] -; ; extends = esp32_IRExt -; ; board = esp32_4M -; ; build_flags = ${esp32_IRExt.build_flags} -; ; -DPLUGIN_SET_COLLECTION_E_ESP32 -; ; -DFEATURE_ETHERNET=1 - -; ; [env:collection_F_ESP32_IRExt_4M316k_ETH] -; ; extends = esp32_IRExt -; ; board = esp32_4M -; ; build_flags = ${esp32_IRExt.build_flags} -; ; -DPLUGIN_SET_COLLECTION_F_ESP32 -; ; -DFEATURE_ETHERNET=1 - -; ; [env:collection_G_ESP32_IRExt_4M316k_ETH] -; ; extends = esp32_IRExt -; ; board = esp32_4M -; ; build_flags = ${esp32_IRExt.build_flags} -; ; -DPLUGIN_SET_COLLECTION_G_ESP32 -; ; -DFEATURE_ETHERNET=1 - -; ; [env:energy_ESP32_IRExt_4M316k_ETH] -; ; extends = esp32_IRExt -; ; board = esp32_4M -; ; build_flags = ${esp32_IRExt.build_flags} -; ; -DPLUGIN_ENERGY_COLLECTION -; ; -DFEATURE_ETHERNET=1 - -; ; [env:display_ESP32_IRExt_4M316k_ETH] -; ; extends = esp32_IRExt -; ; board = esp32_4M -; ; build_flags = ${esp32_IRExt.build_flags} -; ; -DPLUGIN_DISPLAY_COLLECTION -; ; -DFEATURE_ETHERNET=1 - -; ; [env:climate_ESP32_IRExt_4M316k_ETH] -; ; extends = esp32_IRExt -; ; board = esp32_4M -; ; build_flags = ${esp32_IRExt.build_flags} -; ; -DPLUGIN_CLIMATE_COLLECTION -; ; -DFEATURE_ETHERNET=1 - -; ; [env:neopixel_ESP32_IRExt_4M316k_ETH] -; ; extends = esp32_IRExt -; ; board = esp32_4M -; ; build_flags = ${esp32_IRExt.build_flags} -; ; -D PLUGIN_NEOPIXEL_COLLECTION -; ; -DFEATURE_ETHERNET=1 - - -; ; ESP32 MAX builds 16M flash ------------------------------ - -; ; A Lolin D32 PRO with 16MB Flash, allowing 4MB sketch size, and file storage using the default (SPIFFS) filesystem -; [env:max_ESP32_16M1M] -; extends = esp32_common -; board = esp32_16M1M -; board_upload.flash_size = 16MB -; lib_ignore = ${esp32_always.lib_ignore} -; ESP32_ping -; build_flags = ${esp32_common.build_flags} -; -DFEATURE_ARDUINO_OTA=1 -; -DPLUGIN_BUILD_MAX_ESP32 -; -DPLUGIN_BUILD_IR_EXTENDED - -; [env:max_ESP32_16M1M_ETH] -; extends = env:max_ESP32_16M1M -; build_flags = ${env:max_ESP32_16M1M.build_flags} -; -DFEATURE_ETHERNET=1 +[env:max_ESP32_16M1M_ETH] +extends = env:max_ESP32_16M1M +build_flags = ${env:max_ESP32_16M1M.build_flags} + -DFEATURE_ETHERNET=1 ; A Lolin D32 PRO with 16MB Flash, allowing 4MB sketch size, and file storage using LittleFS filesystem @@ -557,12 +556,12 @@ build_flags = ${esp32_common_LittleFS.build_flags} extra_scripts = ${esp32_common.extra_scripts} board_build.filesystem = littlefs -; ; If you have a board with Ethernet integrated and 16MB Flash, then this configuration could be enabled, it's based on the max_ESP32_16M8M_LittleFS definition -; ; [env:max_ESP32_16M8M_LittleFS_ETH] -; ; extends = env:max_ESP32_16M8M_LittleFS -; ; board = ${env:max_ESP32_16M8M_LittleFS.board} -; ; build_flags = ${env:max_ESP32_16M8M_LittleFS.build_flags} -; ; -DFEATURE_ETHERNET=1 +; If you have a board with Ethernet integrated and 16MB Flash, then this configuration could be enabled, it's based on the max_ESP32_16M8M_LittleFS definition +; [env:max_ESP32_16M8M_LittleFS_ETH] +; extends = env:max_ESP32_16M8M_LittleFS +; board = ${env:max_ESP32_16M8M_LittleFS.board} +; build_flags = ${env:max_ESP32_16M8M_LittleFS.build_flags} +; -DFEATURE_ETHERNET=1 diff --git a/platformio_esp32_solo1.ini b/platformio_esp32_solo1.ini index 25a8e8cd4..0396eb738 100644 --- a/platformio_esp32_solo1.ini +++ b/platformio_esp32_solo1.ini @@ -21,8 +21,8 @@ extends = esp32_solo1_common_LittleFS build_flags = ${esp32_solo1_common_LittleFS.build_flags} -DPLUGIN_BUILD_CUSTOM -DFEATURE_ETHERNET=1 -extra_scripts = pre:tools/pio/pre_custom_esp32.py - ${esp32_solo1_common_LittleFS.extra_scripts} +extra_scripts = ${esp32_solo1_common_LittleFS.extra_scripts} + pre:tools/pio/pre_custom_esp32.py [env:normal_ESP32solo1_4M316k_LittleFS_ETH] @@ -34,14 +34,16 @@ lib_ignore = ${esp32_solo1_common_LittleFS.lib_ignore} extra_scripts = ${esp32_solo1_common_LittleFS.extra_scripts} -; [env:energy_ESP32solo1_4M316k_LittleFS_ETH] -; extends = esp32_solo1_common_LittleFS -; build_flags = ${esp32_solo1_common_LittleFS.build_flags} -; -D PLUGIN_ENERGY_COLLECTION -; -DFEATURE_ETHERNET=1 +[env:energy_ESP32solo1_4M316k_LittleFS_ETH] +extends = esp32_solo1_common_LittleFS +build_flags = ${esp32_solo1_common_LittleFS.build_flags} + -D PLUGIN_ENERGY_COLLECTION + -DFEATURE_ETHERNET=1 +extra_scripts = ${esp32_solo1_common_LittleFS.extra_scripts} -; [env:climate_ESP32solo1_4M316k_LittleFS_ETH] -; extends = esp32_solo1_common_LittleFS -; build_flags = ${esp32_solo1_common_LittleFS.build_flags} -; -D PLUGIN_CLIMATE_COLLECTION -; -DFEATURE_ETHERNET=1 +[env:climate_ESP32solo1_4M316k_LittleFS_ETH] +extends = esp32_solo1_common_LittleFS +build_flags = ${esp32_solo1_common_LittleFS.build_flags} + -D PLUGIN_CLIMATE_COLLECTION + -DFEATURE_ETHERNET=1 +extra_scripts = ${esp32_solo1_common_LittleFS.extra_scripts}