diff --git a/platformio_core_defs.ini b/platformio_core_defs.ini index baa352f13..3fc69a120 100644 --- a/platformio_core_defs.ini +++ b/platformio_core_defs.ini @@ -162,43 +162,13 @@ extra_scripts = ${esp82xx_common.extra_scripts} -; Updated ESP-IDF to the latest stable 4.0.1 -; See: https://github.com/platformio/platform-espressif32/releases -; IDF 4.4 = platform-espressif32 3.4.x = espressif/arduino-esp32 tag 2.0.4 -; Just for those who lost track of the extremely confusing numbering schema. -; For MUSTFIX_CLIENT_TIMEOUT_IN_SECONDS See: https://github.com/espressif/arduino-esp32/pull/6676 -[core_esp32_IDF5_1_4__3_1_0_SPIFFS] -platform = https://github.com/tasmota/platform-espressif32/releases/download/2024.09.10/platform-espressif32.zip -platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3202/framework-arduinoespressif32-all-release_v5.1-41a885b.zip -build_flags = -DESP32_STAGE - -DESP_IDF_VERSION_MAJOR=5 - -DLIBRARIES_NO_LOG=1 - -DDISABLE_SC16IS752_SPI - -DCONFIG_PM_ENABLE=0 - -DESP_IDF_STILL_NEEDS_SPI_REGISTERS_FIXED - -DPR_9453_FLUSH_TO_CLEAR=clear - ;-DETH_TYPE_JL1101_SUPPORTED -; -DCONFIG_LWIP_L2_TO_L3_COPY -; -DETH_SPI_SUPPORTS_NO_IRQ=1 - -DCONFIG_FREERTOS_USE_TICKLESS_IDLE=1 - -DCONFIG_FREERTOS_IDLE_TIME_BEFORE_SLEEP=3 - -DNEOPIXEL_ESP32_RMT_DEFAULT - -DCRON_USE_LOCAL_TIME - -I$PROJECT_DIR/src/include - -include "sdkconfig.h" - -include "ESPEasy_config.h" - -include "esp32x_fixes.h" - -Wnull-dereference -lib_ignore = -lib_extra_dirs = - lib/lib_ssl - - -; ESP_IDF 5.3.1 -[core_esp32_IDF5_3_2__3_1_0_LittleFS] +; ESP_IDF 5.4.1 +[core_esp32_IDF5_4_1__3_2_0_LittleFS] +;platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF54 +;platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3538/framework-arduinoespressif32-all-release_v5.4-8f5ad6d7.zip platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF54 -platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3538/framework-arduinoespressif32-all-release_v5.4-8f5ad6d7.zip +platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3717/framework-arduinoespressif32-all-release_v5.4-fea159f6.zip build_flags = -DESP32_STAGE -DESP_IDF_VERSION_MAJOR=5 -DLIBRARIES_NO_LOG=1 diff --git a/platformio_esp32_envs.ini b/platformio_esp32_envs.ini index e19c70d5f..db934372b 100644 --- a/platformio_esp32_envs.ini +++ b/platformio_esp32_envs.ini @@ -1,42 +1,5 @@ -;;; ESP32 test build ********************************************************************; -; Status of the ESP32 support is still considered "beta" ; -; Most plugins work just fine on ESP32. ; -; Especially some plugins using serial may not run very well (GPS does run fine). ; -; ***************************************************************************************; - - -[esp32_base] -extends = common, core_esp32_IDF5_1_4__3_1_0_SPIFFS -upload_speed = 460800 -upload_before_reset = default_reset -upload_after_reset = hard_reset -extra_scripts = pre:tools/pio/pre_esp32.py - post:tools/pio/post_esp32.py - ${extra_scripts_default.extra_scripts} - post:tools/pio/copy_files.py -; you can disable debug linker flag to reduce binary size (comment out line below), but the backtraces will become less readable -; tools/pio/extra_linker_flags.py -; fix the platform package to use gcc-ar and gcc-ranlib to enable lto linker plugin -; more detail: https://embeddedartistry.com/blog/2020/04/13/prefer-gcc-ar-to-ar-in-your-buildsystems/ -; pre:tools/pio/apply_patches.py -build_unflags = -Wall - -fno-lto -build_flags = ${core_esp32_IDF5_1_4__3_1_0_SPIFFS.build_flags} -; ${mqtt_flags.build_flags} - -DMQTT_MAX_PACKET_SIZE=2048 - -DCONFIG_FREERTOS_ASSERT_DISABLE - -DCONFIG_LWIP_ESP_GRATUITOUS_ARP - -fno-strict-aliasing - -flto=auto - -Wswitch - -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_NONE -monitor_filters = esp32_exception_decoder -lib_ignore = - ${core_esp32_IDF5_1_4__3_1_0_SPIFFS.lib_ignore} - - [esp32_base_idf5] -extends = common, core_esp32_IDF5_3_2__3_1_0_LittleFS +extends = common, core_esp32_IDF5_4_1__3_2_0_LittleFS upload_speed = 460800 upload_before_reset = default_reset upload_after_reset = hard_reset @@ -55,7 +18,7 @@ extra_scripts = pre:tools/pio/pre_esp32.py ; However LTO cannot optimize builds with text section literals and thus will result in quite a lot larger builds (80k - 140k larger) build_unflags = -Wall -fno-lto -build_flags = ${core_esp32_IDF5_3_2__3_1_0_LittleFS.build_flags} +build_flags = ${core_esp32_IDF5_4_1__3_2_0_LittleFS.build_flags} ; ${mqtt_flags.build_flags} -DMQTT_MAX_PACKET_SIZE=2048 -DCONFIG_FREERTOS_ASSERT_DISABLE @@ -69,17 +32,7 @@ build_flags = ${core_esp32_IDF5_3_2__3_1_0_LittleFS.build_flags} -DLWIP_IPV6=1 monitor_filters = esp32_exception_decoder lib_ignore = - ${core_esp32_IDF5_3_2__3_1_0_LittleFS.lib_ignore} - - -; -flto cannot be used for ESP32 C3! -; See: https://github.com/letscontrolit/ESPEasy/pull/3845#issuecomment-1014857366 -; TD-er: 2022-01-20: Disabled for now as it also resulted in obscure linker errors on ESP32-S2 and ESP32 running custom builds. -;build_flags = ${esp32_base.build_flags} -; -flto -;build_unflags = ${esp32_base.build_unflags} -; -fexceptions -; -fno-lto + ${core_esp32_IDF5_4_1__3_2_0_LittleFS.lib_ignore} [esp32_always] @@ -93,503 +46,282 @@ lib_ignore = ESP8266Ping TinyWireM LittleFS_esp32 Adafruit NeoPixel - ${esp32_base.lib_ignore} + ${esp32_base_idf5.lib_ignore} -[esp32_common] -extends = esp32_base -lib_ignore = ${esp32_always.lib_ignore} - ESP32_ping - ${no_ir.lib_ignore} - ESP32 BLE Arduino -build_flags = ${esp32_base.build_flags} - -DESP32_CLASSIC -extra_scripts = ${esp32_base.extra_scripts} -build_unflags = ${esp32_base.build_unflags} - -fexceptions -[esp32_common_LittleFS] +[esp32_common_LittleFS_ETH] extends = esp32_base_idf5 build_flags = ${esp32_base_idf5.build_flags} ; -mtext-section-literals + -DFEATURE_ETHERNET=1 -DESP32_CLASSIC -DUSE_LITTLEFS build_unflags = ${esp32_base_idf5.build_unflags} -extra_scripts = ${esp32_common.extra_scripts} +extra_scripts = ${esp32_base_idf5.extra_scripts} board_build.filesystem = littlefs lib_ignore = ${esp32_always.lib_ignore} ESP32_ping ESP32 BLE Arduino - ${core_esp32_IDF5_3_2__3_1_0_LittleFS.lib_ignore} + ${core_esp32_IDF5_4_1__3_2_0_LittleFS.lib_ignore} -[esp32_IRExt] -extends = esp32_common +[esp32_IRExt_LittleFS_ETH] +extends = esp32_common_LittleFS_ETH lib_ignore = ${esp32_always.lib_ignore} ESP32_ping -build_flags = ${esp32_common.build_flags} +build_flags = ${esp32_common_LittleFS_ETH.build_flags} + -DFEATURE_ETHERNET=1 -DFEATURE_ARDUINO_OTA=1 -DPLUGIN_BUILD_NORMAL_IRext -DCOLLECTION_FEATURE_RTTTL=1 -extra_scripts = ${esp32_common.extra_scripts} + -DLIMIT_BUILD_SIZE +extra_scripts = ${esp32_common_LittleFS_ETH.extra_scripts} pre:tools/pio/ir_build_check.py -[esp32_custom_base] -extends = esp32_common -build_flags = ${esp32_common.build_flags} - -DPLUGIN_BUILD_CUSTOM -extra_scripts = ${esp32_common.extra_scripts} - pre:tools/pio/pre_custom_esp32.py - [esp32_custom_base_LittleFS] -extends = esp32_common_LittleFS -build_flags = ${esp32_common_LittleFS.build_flags} +extends = esp32_common_LittleFS_ETH +build_flags = ${esp32_common_LittleFS_ETH.build_flags} -DPLUGIN_BUILD_CUSTOM -extra_scripts = ${esp32_common_LittleFS.extra_scripts} +extra_scripts = ${esp32_common_LittleFS_ETH.extra_scripts} pre:tools/pio/pre_custom_esp32.py -[env:custom_ESP32_4M316k_ETH] -extends = esp32_custom_base -board = esp32_4M -build_flags = ${esp32_custom_base.build_flags} - -DFEATURE_ETHERNET=1 - -; [env:custom_ESP32_4M316k_LittleFS] -; extends = esp32_custom_base_LittleFS -; board = esp32_4M - -[env:custom_ESP32_16M8M_LittleFS_ETH] -extends = esp32_custom_base_LittleFS -board = esp32_16M8M -board_upload.flash_size = 16MB -build_flags = ${esp32_custom_base_LittleFS.build_flags} - -DFEATURE_ETHERNET=1 - -[env:custom_IR_ESP32_4M316k_ETH] -extends = esp32_common -board = esp32_4M -build_flags = ${esp32_common.build_flags} - -DPLUGIN_BUILD_CUSTOM - -DPLUGIN_BUILD_IR - -DFEATURE_ETHERNET=1 -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_ETH] -extends = esp32_common -board = esp32_4M -lib_ignore = ${esp32_common.lib_ignore} - ${no_ir.lib_ignore} -build_flags = ${esp32_common.build_flags} - -DFEATURE_ETHERNET=1 - -; [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_ETH] -extends = esp32_common -board = esp32_4M -build_flags = ${esp32_common.build_flags} - -DFEATURE_ARDUINO_OTA=1 - -DPLUGIN_SET_COLLECTION_ESP32 - -DCOLLECTION_FEATURE_RTTTL=1 - -DFEATURE_ETHERNET=1 - -[env:collection_B_ESP32_4M316k_ETH] -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 - -DFEATURE_ETHERNET=1 - -[env:collection_C_ESP32_4M316k_ETH] -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 - -DFEATURE_ETHERNET=1 - -[env:collection_D_ESP32_4M316k_ETH] -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 - -DFEATURE_ETHERNET=1 - -[env:collection_E_ESP32_4M316k_ETH] -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 - -DFEATURE_ETHERNET=1 - -[env:collection_F_ESP32_4M316k_ETH] -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 - -DFEATURE_ETHERNET=1 - -[env:collection_G_ESP32_4M316k_ETH] -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 - -DFEATURE_ETHERNET=1 - - -[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_ETH] -extends = esp32_common -board = esp32_4M -build_flags = ${esp32_common.build_flags} - -DFEATURE_ARDUINO_OTA=1 - -DPLUGIN_ENERGY_COLLECTION - -DFEATURE_ETHERNET=1 - -[env:display_ESP32_4M316k_ETH] -extends = esp32_common -board = esp32_4M -build_flags = ${esp32_common.build_flags} - -DFEATURE_ARDUINO_OTA=1 - -DPLUGIN_DISPLAY_COLLECTION - -D ST7789_EXTRA_INIT=1 - -D P116_EXTRA_ST7789=1 - -DFEATURE_ETHERNET=1 - -[env:climate_ESP32_4M316k_ETH] -extends = esp32_common -board = esp32_4M -build_flags = ${esp32_common.build_flags} - -DFEATURE_ARDUINO_OTA=1 - -DPLUGIN_CLIMATE_COLLECTION - -DFEATURE_ETHERNET=1 - -[env:climate_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} - -DPLUGIN_CLIMATE_COLLECTION - -DFEATURE_ETHERNET=1 - -[env:neopixel_ESP32_4M316k_ETH] -extends = esp32_common -board = esp32_4M -build_flags = ${esp32_common.build_flags} - -DFEATURE_ARDUINO_OTA=1 - -DFEATURE_SD=1 - -D PLUGIN_NEOPIXEL_COLLECTION - -DFEATURE_ETHERNET=1 - - -; [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 + +[env:custom_ESP32_16M8M_LittleFS_ETH] +extends = env:custom_ESP32_4M316k_LittleFS_ETH board = esp32_16M8M board_upload.flash_size = 16MB -build_flags = ${esp32_common_LittleFS.build_flags} +build_flags = ${env:custom_ESP32_4M316k_LittleFS_ETH.build_flags} + + +[env:custom_IR_ESP32_4M316k_LittleFS_ETH] +extends = esp32_common_LittleFS_ETH +board = esp32_4M +build_flags = ${esp32_common_LittleFS_ETH.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} +extra_scripts = ${esp32_common_LittleFS_ETH.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:custom_ESP32_4M2M_NO_OTA_LittleFS_ETH] +extends = env:custom_ESP32_4M316k_LittleFS_ETH +board = esp32_4M2M +build_flags = ${env:custom_ESP32_4M316k_LittleFS_ETH.build_flags} + -DNO_HTTP_UPDATER + -[env:normal_ESP32_4M316k_LittleFS_ETH] -extends = esp32_common_LittleFS +[env:collection_A_ESP32_4M316k_LittleFS_ETH] +extends = esp32_common_LittleFS_ETH +board = esp32_4M +build_flags = ${esp32_common_LittleFS_ETH.build_flags} + -DFEATURE_ARDUINO_OTA=1 + -DPLUGIN_SET_COLLECTION_ESP32 + -DCOLLECTION_FEATURE_RTTTL=1 + + +[env:collection_B_ESP32_4M316k_LittleFS_ETH] +extends = esp32_common_LittleFS_ETH +board = esp32_4M +build_flags = ${esp32_common_LittleFS_ETH.build_flags} + -DFEATURE_ARDUINO_OTA=1 + -DPLUGIN_SET_COLLECTION_B_ESP32 + -DCOLLECTION_FEATURE_RTTTL=1 + + +[env:collection_C_ESP32_4M316k_LittleFS_ETH] +extends = esp32_common_LittleFS_ETH +board = esp32_4M +build_flags = ${esp32_common_LittleFS_ETH.build_flags} + -DFEATURE_ARDUINO_OTA=1 + -DPLUGIN_SET_COLLECTION_C_ESP32 + -DCOLLECTION_FEATURE_RTTTL=1 + + +[env:collection_D_ESP32_4M316k_LittleFS_ETH] +extends = esp32_common_LittleFS_ETH +board = esp32_4M +build_flags = ${esp32_common_LittleFS_ETH.build_flags} + -DFEATURE_ARDUINO_OTA=1 + -DPLUGIN_SET_COLLECTION_D_ESP32 + -DCOLLECTION_FEATURE_RTTTL=1 + + +[env:collection_E_ESP32_4M316k_LittleFS_ETH] +extends = esp32_common_LittleFS_ETH +board = esp32_4M +build_flags = ${esp32_common_LittleFS_ETH.build_flags} + -DFEATURE_ARDUINO_OTA=1 + -DPLUGIN_SET_COLLECTION_E_ESP32 + -DCOLLECTION_FEATURE_RTTTL=1 + + +[env:collection_F_ESP32_4M316k_LittleFS_ETH] +extends = esp32_common_LittleFS_ETH +board = esp32_4M +build_flags = ${esp32_common_LittleFS_ETH.build_flags} + -DFEATURE_ARDUINO_OTA=1 + -DPLUGIN_SET_COLLECTION_F_ESP32 + -DCOLLECTION_FEATURE_RTTTL=1 + + +[env:collection_G_ESP32_4M316k_LittleFS_ETH] +extends = esp32_common_LittleFS_ETH +board = esp32_4M +build_flags = ${esp32_common_LittleFS_ETH.build_flags} + -DFEATURE_ARDUINO_OTA=1 + -DPLUGIN_SET_COLLECTION_G_ESP32 + -DCOLLECTION_FEATURE_RTTTL=1 + + + +[env:collection_A_ESP32_IRExt_4M316k_LittleFS_ETH] +extends = esp32_IRExt_LittleFS_ETH +board = esp32_4M +build_flags = ${esp32_IRExt_LittleFS_ETH.build_flags} + -DPLUGIN_SET_COLLECTION_ESP32 + +[env:collection_B_ESP32_IRExt_4M316k_LittleFS_ETH] +extends = esp32_IRExt_LittleFS_ETH +board = esp32_4M +build_flags = ${esp32_IRExt_LittleFS_ETH.build_flags} + -DPLUGIN_SET_COLLECTION_B_ESP32 + +[env:collection_C_ESP32_IRExt_4M316k_LittleFS_ETH] +extends = esp32_IRExt_LittleFS_ETH +board = esp32_4M +build_flags = ${esp32_IRExt_LittleFS_ETH.build_flags} + -DPLUGIN_SET_COLLECTION_C_ESP32 + +[env:collection_D_ESP32_IRExt_4M316k_LittleFS_ETH] +extends = esp32_IRExt_LittleFS_ETH +board = esp32_4M +build_flags = ${esp32_IRExt_LittleFS_ETH.build_flags} + -DPLUGIN_SET_COLLECTION_D_ESP32 + +[env:collection_E_ESP32_IRExt_4M316k_LittleFS_ETH] +extends = esp32_IRExt_LittleFS_ETH +board = esp32_4M +build_flags = ${esp32_IRExt_LittleFS_ETH.build_flags} + -DPLUGIN_SET_COLLECTION_E_ESP32 + +[env:collection_F_ESP32_IRExt_4M316k_LittleFS_ETH] +extends = esp32_IRExt_LittleFS_ETH +board = esp32_4M +build_flags = ${esp32_IRExt_LittleFS_ETH.build_flags} + -DPLUGIN_SET_COLLECTION_F_ESP32 + +[env:collection_G_ESP32_IRExt_4M316k_LittleFS_ETH] +extends = esp32_IRExt_LittleFS_ETH +board = esp32_4M +build_flags = ${esp32_IRExt_LittleFS_ETH.build_flags} + -DPLUGIN_SET_COLLECTION_G_ESP32 + +[env:energy_ESP32_4M316k_LittleFS_ETH] +extends = esp32_common_LittleFS_ETH +board = esp32_4M +build_flags = ${esp32_common_LittleFS_ETH.build_flags} + -DFEATURE_ARDUINO_OTA=1 + -DPLUGIN_ENERGY_COLLECTION + + +[env:display_ESP32_4M316k_LittleFS_ETH] +extends = esp32_common_LittleFS_ETH +board = esp32_4M +build_flags = ${esp32_common_LittleFS_ETH.build_flags} + -DFEATURE_ARDUINO_OTA=1 + -DPLUGIN_DISPLAY_COLLECTION + -D ST7789_EXTRA_INIT=1 + -D P116_EXTRA_ST7789=1 + + + +[env:climate_ESP32_4M316k_LittleFS_ETH] +extends = esp32_common_LittleFS_ETH board = esp32_4M lib_ignore = ${esp32_always.lib_ignore} ESP32_ping - ${esp32_common_LittleFS.lib_ignore} + ${esp32_common_LittleFS_ETH.lib_ignore} ${no_ir.lib_ignore} -build_flags = ${esp32_common_LittleFS.build_flags} - -DFEATURE_ETHERNET=1 +build_flags = ${esp32_common_LittleFS_ETH.build_flags} + -DPLUGIN_CLIMATE_COLLECTION + - -[env:normal_ESP32_IRExt_4M316k_ETH] -extends = esp32_IRExt +[env:neopixel_ESP32_4M316k_LittleFS_ETH] +extends = esp32_common_LittleFS_ETH board = esp32_4M -build_flags = ${esp32_IRExt.build_flags} - -DFEATURE_ETHERNET=1 +build_flags = ${esp32_common_LittleFS_ETH.build_flags} + -DFEATURE_ARDUINO_OTA=1 + -DFEATURE_SD=1 + -D PLUGIN_NEOPIXEL_COLLECTION + -; [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:custom_IR_ESP32_16M8M_LittleFS_ETH] +extends = esp32_common_LittleFS_ETH +board = esp32_16M8M +board_upload.flash_size = 16MB +build_flags = ${esp32_common_LittleFS_ETH.build_flags} + -DPLUGIN_BUILD_CUSTOM + -DPLUGIN_BUILD_IR +lib_ignore = ${esp32_always.lib_ignore} + ESP32_ping + ${esp32_common_LittleFS_ETH.lib_ignore} +extra_scripts = ${esp32_common_LittleFS_ETH.extra_scripts} + pre:tools/pio/pre_custom_esp32_IR.py + pre:tools/pio/ir_build_check.py -; [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:normal_ESP32_4M316k_LittleFS_ETH] +extends = esp32_common_LittleFS_ETH +board = esp32_4M +lib_ignore = ${esp32_always.lib_ignore} + ESP32_ping + ${esp32_common_LittleFS_ETH.lib_ignore} + ${no_ir.lib_ignore} +build_flags = ${esp32_common_LittleFS_ETH.build_flags} + -; [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:normal_ESP32_IRExt_4M316k_LittleFS_ETH] +extends = esp32_IRExt_LittleFS_ETH +board = esp32_4M +build_flags = ${esp32_IRExt_LittleFS_ETH.build_flags} + -; [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_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_ETH] -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 - -D ST7789_EXTRA_INIT=1 - -D P116_EXTRA_ST7789=1 - -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 [env:max_ESP32_16M8M_LittleFS_ETH] -extends = esp32_common_LittleFS +extends = esp32_common_LittleFS_ETH board = esp32_16M8M board_upload.flash_size = 16MB lib_ignore = ${esp32_always.lib_ignore} ESP32_ping - ${esp32_common_LittleFS.lib_ignore} -build_flags = ${esp32_common_LittleFS.build_flags} + ${esp32_common_LittleFS_ETH.lib_ignore} +build_flags = ${esp32_common_LittleFS_ETH.build_flags} -DFEATURE_ARDUINO_OTA=1 -DPLUGIN_BUILD_MAX_ESP32 -DPLUGIN_BUILD_IR_EXTENDED - -DFEATURE_ETHERNET=1 -D ST7789_EXTRA_INIT=1 -D P116_EXTRA_ST7789=1 -extra_scripts = ${esp32_common.extra_scripts} +extra_scripts = ${esp32_common_LittleFS_ETH.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 @@ -597,7 +329,6 @@ board_build.filesystem = littlefs ; 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_esp32c3_envs.ini b/platformio_esp32c3_envs.ini index 3ccbec85c..a0764a93d 100644 --- a/platformio_esp32c3_envs.ini +++ b/platformio_esp32c3_envs.ini @@ -1,23 +1,8 @@ - - - -[esp32c3_common] -extends = esp32_base -lib_ignore = ${esp32_always.lib_ignore} - ESP32_ping - ${no_ir.lib_ignore} - ESP32 BLE Arduino -build_flags = ${esp32_base.build_flags} - -DFEATURE_ARDUINO_OTA=1 - -DESP32C3 -extra_scripts = ${esp32_base.extra_scripts} -build_unflags = ${esp32_base.build_unflags} - -fexceptions - [esp32c3_common_LittleFS] extends = esp32_base_idf5 build_flags = ${esp32_base_idf5.build_flags} -DFEATURE_ARDUINO_OTA=1 + -DFEATURE_ETHERNET=1 -DUSE_LITTLEFS -DESP32C3 extra_scripts = ${esp32_base_idf5.extra_scripts} @@ -27,153 +12,100 @@ board_build.filesystem = littlefs lib_ignore = ${esp32_base_idf5.lib_ignore} -[env:custom_ESP32c3_4M316k_CDC] -extends = esp32c3_common -board = esp32c3cdc -build_flags = ${esp32c3_common.build_flags} - -DPLUGIN_BUILD_CUSTOM -extra_scripts = ${esp32c3_common.extra_scripts} - pre:tools/pio/pre_custom_esp32.py - - -[env:custom_IR_ESP32c3_4M316k_CDC] -extends = esp32c3_common -board = esp32c3cdc -build_flags = ${esp32c3_common.build_flags} - -DPLUGIN_BUILD_CUSTOM - -DPLUGIN_BUILD_IR -lib_ignore = ${esp32_always.lib_ignore} - ESP32_ping -extra_scripts = ${esp32c3_common.extra_scripts} - pre:tools/pio/pre_custom_esp32_IR.py - pre:tools/pio/ir_build_check.py - -; [env:custom_ESP32c3_4M316k_LittleFS_CDC] -; extends = esp32c3_common_LittleFS -; board = esp32c3cdc -; build_flags = ${esp32c3_common_LittleFS.build_flags} -; -DPLUGIN_BUILD_CUSTOM -; extra_scripts = ${esp32c3_common_LittleFS.extra_scripts} -; pre:tools/pio/pre_custom_esp32.py - [env:custom_ESP32c3_4M316k_LittleFS_CDC_ETH] extends = esp32c3_common_LittleFS board = esp32c3cdc build_flags = ${esp32c3_common_LittleFS.build_flags} -DPLUGIN_BUILD_CUSTOM - -DFEATURE_ETHERNET=1 extra_scripts = ${esp32c3_common_LittleFS.extra_scripts} pre:tools/pio/pre_custom_esp32.py -[env:normal_ESP32c3_4M316k_CDC] -extends = esp32c3_common -board = esp32c3cdc -lib_ignore = ${esp32_common.lib_ignore} - ${no_ir.lib_ignore} - - [env:normal_ESP32c3_4M316k_LittleFS_CDC_ETH] extends = esp32c3_common_LittleFS board = esp32c3cdc build_flags = ${esp32c3_common_LittleFS.build_flags} - -DFEATURE_ETHERNET=1 lib_ignore = ${esp32c3_common_LittleFS.lib_ignore} ${no_ir.lib_ignore} -[env:collection_A_ESP32c3_4M316k_CDC] -extends = esp32c3_common +[env:collection_A_ESP32c3_4M316k_LittleFS_CDC_ETH] +extends = esp32c3_common_LittleFS board = esp32c3cdc -build_flags = ${esp32c3_common.build_flags} +build_flags = ${esp32c3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_B_ESP32c3_4M316k_CDC] -extends = esp32c3_common +[env:collection_B_ESP32c3_4M316k_LittleFS_CDC_ETH] +extends = esp32c3_common_LittleFS board = esp32c3cdc -build_flags = ${esp32c3_common.build_flags} +build_flags = ${esp32c3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_B_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_C_ESP32c3_4M316k_CDC] -extends = esp32c3_common +[env:collection_C_ESP32c3_4M316k_LittleFS_CDC_ETH] +extends = esp32c3_common_LittleFS board = esp32c3cdc -build_flags = ${esp32c3_common.build_flags} +build_flags = ${esp32c3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_C_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_D_ESP32c3_4M316k_CDC] -extends = esp32c3_common +[env:collection_D_ESP32c3_4M316k_LittleFS_CDC_ETH] +extends = esp32c3_common_LittleFS board = esp32c3cdc -build_flags = ${esp32c3_common.build_flags} +build_flags = ${esp32c3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_D_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_E_ESP32c3_4M316k_CDC] -extends = esp32c3_common +[env:collection_E_ESP32c3_4M316k_LittleFS_CDC_ETH] +extends = esp32c3_common_LittleFS board = esp32c3cdc -build_flags = ${esp32c3_common.build_flags} +build_flags = ${esp32c3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_E_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_F_ESP32c3_4M316k_CDC] -extends = esp32c3_common +[env:collection_F_ESP32c3_4M316k_LittleFS_CDC_ETH] +extends = esp32c3_common_LittleFS board = esp32c3cdc -build_flags = ${esp32c3_common.build_flags} +build_flags = ${esp32c3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_F_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_G_ESP32c3_4M316k_CDC] -extends = esp32c3_common +[env:collection_G_ESP32c3_4M316k_LittleFS_CDC_ETH] +extends = esp32c3_common_LittleFS board = esp32c3cdc -build_flags = ${esp32c3_common.build_flags} +build_flags = ${esp32c3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_G_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:energy_ESP32c3_4M316k_CDC] -extends = esp32c3_common -board = esp32c3cdc -build_flags = ${esp32c3_common.build_flags} - -D PLUGIN_ENERGY_COLLECTION - [env:energy_ESP32c3_4M316k_LittleFS_CDC_ETH] extends = esp32c3_common_LittleFS board = esp32c3cdc build_flags = ${esp32c3_common_LittleFS.build_flags} -D PLUGIN_ENERGY_COLLECTION - -DFEATURE_ETHERNET=1 + -[env:display_ESP32c3_4M316k_CDC] -extends = esp32c3_common +[env:display_ESP32c3_4M316k_LittleFS_CDC_ETH] +extends = esp32c3_common_LittleFS board = esp32c3cdc -build_flags = ${esp32c3_common.build_flags} +build_flags = ${esp32c3_common_LittleFS.build_flags} -D PLUGIN_DISPLAY_COLLECTION -D ST7789_EXTRA_INIT=1 -D P116_EXTRA_ST7789=1 -[env:climate_ESP32c3_4M316k_CDC] -extends = esp32c3_common +[env:climate_ESP32c3_4M316k_LittleFS_CDC_ETH] +extends = esp32c3_common_LittleFS board = esp32c3cdc -build_flags = ${esp32c3_common.build_flags} +build_flags = ${esp32c3_common_LittleFS.build_flags} -D PLUGIN_CLIMATE_COLLECTION -[env:neopixel_ESP32c3_4M316k_CDC] -extends = esp32c3_common -board = esp32c3cdc -build_flags = ${esp32c3_common.build_flags} - -DFEATURE_ARDUINO_OTA=1 - -DFEATURE_SD=1 - -DPLUGIN_NEOPIXEL_COLLECTION - [env:neopixel_ESP32c3_4M316k_LittleFS_CDC_ETH] extends = esp32c3_common_LittleFS board = esp32c3cdc build_flags = ${esp32c3_common_LittleFS.build_flags} -DFEATURE_ARDUINO_OTA=1 -DFEATURE_SD=1 - -DFEATURE_ETHERNET=1 -DPLUGIN_NEOPIXEL_COLLECTION [env:max_ESP32c3_16M8M_LittleFS_CDC_ETH] @@ -182,7 +114,6 @@ board = esp32c3cdc-16M build_flags = ${esp32c3_common_LittleFS.build_flags} -DFEATURE_ARDUINO_OTA=1 -DFEATURE_SD=1 - -DFEATURE_ETHERNET=1 -DPLUGIN_BUILD_MAX_ESP32 -DPLUGIN_BUILD_IR_EXTENDED extra_scripts = ${esp32c3_common_LittleFS.extra_scripts} diff --git a/platformio_esp32s2_envs.ini b/platformio_esp32s2_envs.ini index f51587d68..473b131ef 100644 --- a/platformio_esp32s2_envs.ini +++ b/platformio_esp32s2_envs.ini @@ -1,24 +1,8 @@ - - - - -[esp32s2_common] -extends = esp32_base -lib_ignore = ${esp32_always.lib_ignore} - ESP32_ping - ${no_ir.lib_ignore} - ESP32 BLE Arduino -build_flags = ${esp32_base.build_flags} - -DFEATURE_ARDUINO_OTA=1 - -DESP32S2 -extra_scripts = ${esp32_base.extra_scripts} -build_unflags = ${esp32_base.build_unflags} - -fexceptions - [esp32s2_common_LittleFS] extends = esp32_base_idf5 build_flags = ${esp32_base_idf5.build_flags} -DFEATURE_ARDUINO_OTA=1 + -DFEATURE_ETHERNET=1 -DUSE_LITTLEFS -DESP32S2 extra_scripts = ${esp32_base_idf5.extra_scripts} @@ -28,23 +12,6 @@ board_build.filesystem = littlefs lib_ignore = ${esp32_base_idf5.lib_ignore} -[env:custom_ESP32s2_4M316k_CDC] -extends = esp32s2_common -board = esp32s2cdc -build_flags = ${esp32s2_common.build_flags} - -DPLUGIN_BUILD_CUSTOM - -DESP_CONSOLE_USB_CDC=y -extra_scripts = ${esp32s2_common.extra_scripts} - pre:tools/pio/pre_custom_esp32.py - -[env:neopixel_ESP32s2_4M316k_CDC] -extends = esp32s2_common -board = esp32s2cdc -build_flags = ${esp32s2_common.build_flags} - -DFEATURE_ARDUINO_OTA=1 - -DFEATURE_SD=1 - -DPLUGIN_NEOPIXEL_COLLECTION - [env:neopixel_ESP32s2_4M316k_LittleFS_CDC_ETH] extends = esp32s2_common_LittleFS board = esp32s2cdc @@ -52,29 +19,22 @@ build_flags = ${esp32s2_common_LittleFS.build_flags} -DFEATURE_ARDUINO_OTA=1 -DFEATURE_SD=1 -DPLUGIN_NEOPIXEL_COLLECTION - -DFEATURE_ETHERNET=1 + -[env:custom_IR_ESP32s2_4M316k_CDC] -extends = esp32s2_common +[env:custom_IR_ESP32s2_4M316k_LittleFS_CDC_ETH] +extends = esp32s2_common_LittleFS board = esp32s2cdc -build_flags = ${esp32s2_common.build_flags} +build_flags = ${esp32s2_common_LittleFS.build_flags} -DPLUGIN_BUILD_CUSTOM -DPLUGIN_BUILD_IR lib_ignore = ${esp32_always.lib_ignore} ESP32_ping -extra_scripts = ${esp32s2_common.extra_scripts} +extra_scripts = ${esp32s2_common_LittleFS.extra_scripts} pre:tools/pio/pre_custom_esp32_IR.py pre:tools/pio/ir_build_check.py - -[env:normal_ESP32s2_4M316k_CDC] -extends = esp32s2_common -board = esp32s2cdc -lib_ignore = ${esp32s2_common.lib_ignore} - ${no_ir.lib_ignore} - [env:custom_ESP32s2_4M316k_LittleFS_CDC_ETH] extends = esp32s2_common_LittleFS board = esp32s2cdc @@ -83,7 +43,6 @@ lib_ignore = ${esp32s2_common_LittleFS.lib_ignore} build_flags = ${esp32s2_common_LittleFS.build_flags} -DPLUGIN_BUILD_CUSTOM -DESP_CONSOLE_USB_CDC=y - -DFEATURE_ETHERNET=1 extra_scripts = ${esp32s2_common_LittleFS.extra_scripts} pre:tools/pio/pre_custom_esp32.py @@ -94,77 +53,76 @@ extends = esp32s2_common_LittleFS board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} -DESP_CONSOLE_USB_CDC=y - -DFEATURE_ETHERNET=1 lib_ignore = ${esp32s2_common_LittleFS.lib_ignore} ${no_ir.lib_ignore} -[env:collection_A_ESP32s2_4M316k_CDC] -extends = esp32s2_common +[env:collection_A_ESP32s2_4M316k_LittleFS_CDC_ETH] +extends = esp32s2_common_LittleFS board = esp32s2cdc -build_flags = ${esp32s2_common.build_flags} +build_flags = ${esp32s2_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_B_ESP32s2_4M316k_CDC] -extends = esp32s2_common +[env:collection_B_ESP32s2_4M316k_LittleFS_CDC_ETH] +extends = esp32s2_common_LittleFS board = esp32s2cdc -build_flags = ${esp32s2_common.build_flags} +build_flags = ${esp32s2_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_B_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_C_ESP32s2_4M316k_CDC] -extends = esp32s2_common +[env:collection_C_ESP32s2_4M316k_LittleFS_CDC_ETH] +extends = esp32s2_common_LittleFS board = esp32s2cdc -build_flags = ${esp32s2_common.build_flags} +build_flags = ${esp32s2_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_C_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_D_ESP32s2_4M316k_CDC] -extends = esp32s2_common +[env:collection_D_ESP32s2_4M316k_LittleFS_CDC_ETH] +extends = esp32s2_common_LittleFS board = esp32s2cdc -build_flags = ${esp32s2_common.build_flags} +build_flags = ${esp32s2_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_D_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_E_ESP32s2_4M316k_CDC] -extends = esp32s2_common +[env:collection_E_ESP32s2_4M316k_LittleFS_CDC_ETH] +extends = esp32s2_common_LittleFS board = esp32s2cdc -build_flags = ${esp32s2_common.build_flags} +build_flags = ${esp32s2_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_E_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_F_ESP32s2_4M316k_CDC] -extends = esp32s2_common +[env:collection_F_ESP32s2_4M316k_LittleFS_CDC_ETH] +extends = esp32s2_common_LittleFS board = esp32s2cdc -build_flags = ${esp32s2_common.build_flags} +build_flags = ${esp32s2_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_F_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_G_ESP32s2_4M316k_CDC] -extends = esp32s2_common +[env:collection_G_ESP32s2_4M316k_LittleFS_CDC_ETH] +extends = esp32s2_common_LittleFS board = esp32s2cdc -build_flags = ${esp32s2_common.build_flags} +build_flags = ${esp32s2_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_G_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:energy_ESP32s2_4M316k_CDC] -extends = esp32s2_common +[env:energy_ESP32s2_4M316k_LittleFS_CDC_ETH] +extends = esp32s2_common_LittleFS board = esp32s2cdc -build_flags = ${esp32s2_common.build_flags} +build_flags = ${esp32s2_common_LittleFS.build_flags} -D PLUGIN_ENERGY_COLLECTION -[env:display_ESP32s2_4M316k_CDC] -extends = esp32s2_common +[env:display_ESP32s2_4M316k_LittleFS_CDC_ETH] +extends = esp32s2_common_LittleFS board = esp32s2cdc -build_flags = ${esp32s2_common.build_flags} +build_flags = ${esp32s2_common_LittleFS.build_flags} -D PLUGIN_DISPLAY_COLLECTION -D ST7789_EXTRA_INIT=1 -D P116_EXTRA_ST7789=1 -[env:climate_ESP32s2_4M316k_CDC] -extends = esp32s2_common +[env:climate_ESP32s2_4M316k_LittleFS_CDC_ETH] +extends = esp32s2_common_LittleFS board = esp32s2cdc -build_flags = ${esp32s2_common.build_flags} +build_flags = ${esp32s2_common_LittleFS.build_flags} -D PLUGIN_CLIMATE_COLLECTION diff --git a/platformio_esp32s3_envs.ini b/platformio_esp32s3_envs.ini index a70755617..a664f96fb 100644 --- a/platformio_esp32s3_envs.ini +++ b/platformio_esp32s3_envs.ini @@ -1,28 +1,12 @@ - - - - -[esp32s3_common] -extends = esp32_base -lib_ignore = ${esp32_always.lib_ignore} - ESP32_ping - ${no_ir.lib_ignore} - ESP32 BLE Arduino -build_flags = ${esp32_base.build_flags} - -DFEATURE_ARDUINO_OTA=1 - -DESP32S3 -extra_scripts = ${esp32_base.extra_scripts} -build_unflags = ${esp32_base.build_unflags} - -fexceptions - [esp32s3_common_LittleFS] extends = esp32_base_idf5 -lib_ignore = ${esp32_common_LittleFS.lib_ignore} +lib_ignore = ${esp32_common_LittleFS_ETH.lib_ignore} ESP32_ping ${esp32_base_idf5.lib_ignore} build_flags = ${esp32_base_idf5.build_flags} ; -mtext-section-literals -DFEATURE_ARDUINO_OTA=1 + -DFEATURE_ETHERNET=1 -DUSE_LITTLEFS -DESP32S3 extra_scripts = ${esp32_base_idf5.extra_scripts} @@ -31,35 +15,28 @@ build_unflags = ${esp32_base_idf5.build_unflags} board_build.filesystem = littlefs -[env:custom_ESP32s3_4M316k_CDC] -extends = esp32s3_common +[env:custom_ESP32s3_4M316k_LittleFS_CDC_ETH] +extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi -build_flags = ${esp32s3_common.build_flags} +build_flags = ${esp32s3_common_LittleFS.build_flags} -DPLUGIN_BUILD_CUSTOM -extra_scripts = ${esp32s3_common.extra_scripts} +extra_scripts = ${esp32s3_common_LittleFS.extra_scripts} pre:tools/pio/pre_custom_esp32.py -[env:custom_IR_ESP32s3_4M316k_CDC] -extends = esp32s3_common +[env:custom_IR_ESP32s3_4M316k_LittleFS_CDC_ETH] +extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi -build_flags = ${esp32s3_common.build_flags} +build_flags = ${esp32s3_common_LittleFS.build_flags} -DPLUGIN_BUILD_CUSTOM -DPLUGIN_BUILD_IR lib_ignore = ${esp32_always.lib_ignore} ESP32_ping -extra_scripts = ${esp32s3_common.extra_scripts} +extra_scripts = ${esp32s3_common_LittleFS.extra_scripts} pre:tools/pio/pre_custom_esp32_IR.py pre:tools/pio/ir_build_check.py - -[env:normal_ESP32s3_4M316k_CDC] -extends = esp32s3_common -board = esp32s3cdc-qio_qspi -lib_ignore = ${esp32s3_common.lib_ignore} - ${no_ir.lib_ignore} - [env:normal_ESP32s3_4M316k_LittleFS_CDC_ETH] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi @@ -68,85 +45,78 @@ lib_ignore = ${esp32s3_common_LittleFS.lib_ignore} build_flags = ${esp32s3_common_LittleFS.build_flags} -DFEATURE_ARDUINO_OTA=1 -DFEATURE_SD=1 - -DFEATURE_ETHERNET=1 + -[env:collection_A_ESP32s3_4M316k_CDC] -extends = esp32s3_common +[env:collection_A_ESP32s3_4M316k_LittleFS_CDC_ETH] +extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi -build_flags = ${esp32s3_common.build_flags} +build_flags = ${esp32s3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_B_ESP32s3_4M316k_CDC] -extends = esp32s3_common +[env:collection_B_ESP32s3_4M316k_LittleFS_CDC_ETH] +extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi -build_flags = ${esp32s3_common.build_flags} +build_flags = ${esp32s3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_B_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_C_ESP32s3_4M316k_CDC] -extends = esp32s3_common +[env:collection_C_ESP32s3_4M316k_LittleFS_CDC_ETH] +extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi -build_flags = ${esp32s3_common.build_flags} +build_flags = ${esp32s3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_C_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_D_ESP32s3_4M316k_CDC] -extends = esp32s3_common +[env:collection_D_ESP32s3_4M316k_LittleFS_CDC_ETH] +extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi -build_flags = ${esp32s3_common.build_flags} +build_flags = ${esp32s3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_D_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_E_ESP32s3_4M316k_CDC] -extends = esp32s3_common +[env:collection_E_ESP32s3_4M316k_LittleFS_CDC_ETH] +extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi -build_flags = ${esp32s3_common.build_flags} +build_flags = ${esp32s3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_E_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_F_ESP32s3_4M316k_CDC] -extends = esp32s3_common +[env:collection_F_ESP32s3_4M316k_LittleFS_CDC_ETH] +extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi -build_flags = ${esp32s3_common.build_flags} +build_flags = ${esp32s3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_F_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_G_ESP32s3_4M316k_CDC] -extends = esp32s3_common +[env:collection_G_ESP32s3_4M316k_LittleFS_CDC_ETH] +extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi -build_flags = ${esp32s3_common.build_flags} +build_flags = ${esp32s3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_G_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:energy_ESP32s3_4M316k_CDC] -extends = esp32s3_common +[env:energy_ESP32s3_4M316k_LittleFS_CDC_ETH] +extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi -build_flags = ${esp32s3_common.build_flags} +build_flags = ${esp32s3_common_LittleFS.build_flags} -D PLUGIN_ENERGY_COLLECTION -[env:display_ESP32s3_4M316k_CDC] -extends = esp32s3_common +[env:display_ESP32s3_4M316k_LittleFS_CDC_ETH] +extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi -build_flags = ${esp32s3_common.build_flags} +build_flags = ${esp32s3_common_LittleFS.build_flags} -D PLUGIN_DISPLAY_COLLECTION -D ST7789_EXTRA_INIT=1 -D P116_EXTRA_ST7789=1 -[env:climate_ESP32s3_4M316k_CDC] -extends = esp32s3_common +[env:climate_ESP32s3_4M316k_LittleFS_CDC_ETH] +extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi -build_flags = ${esp32s3_common.build_flags} +build_flags = ${esp32s3_common_LittleFS.build_flags} -D PLUGIN_CLIMATE_COLLECTION -[env:neopixel_ESP32s3_4M316k_CDC] -extends = esp32s3_common -board = esp32s3cdc-qio_qspi -build_flags = ${esp32s3_common.build_flags} - -DFEATURE_ARDUINO_OTA=1 - -DFEATURE_SD=1 - -DPLUGIN_NEOPIXEL_COLLECTION [env:neopixel_ESP32s3_4M316k_LittleFS_CDC_ETH] extends = esp32s3_common_LittleFS @@ -155,14 +125,13 @@ build_flags = ${esp32s3_common_LittleFS.build_flags} -DFEATURE_ARDUINO_OTA=1 -DFEATURE_SD=1 -DPLUGIN_NEOPIXEL_COLLECTION - -DFEATURE_ETHERNET=1 + [env:custom_ESP32s3_8M1M_LittleFS_CDC_ETH] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi-8M build_flags = ${esp32s3_common_LittleFS.build_flags} - -DFEATURE_ETHERNET=1 -DFEATURE_ARDUINO_OTA=1 -DPLUGIN_BUILD_CUSTOM -DFEATURE_SD=1 @@ -178,7 +147,6 @@ board = esp32s3cdc-qio_opi-8M extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi-8M build_flags = ${esp32s3_common_LittleFS.build_flags} - -DFEATURE_ETHERNET=1 -DFEATURE_ARDUINO_OTA=1 -DPLUGIN_BUILD_MAX_ESP32 -DPLUGIN_BUILD_IR_EXTENDED @@ -196,7 +164,6 @@ board = esp32s3cdc-qio_opi-8M extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi-16M build_flags = ${esp32s3_common_LittleFS.build_flags} - -DFEATURE_ETHERNET=1 -DFEATURE_ARDUINO_OTA=1 -DPLUGIN_BUILD_CUSTOM -DPLUGIN_BUILD_IR_EXTENDED @@ -213,7 +180,6 @@ board = esp32s3cdc-qio_opi-16M extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi-16M build_flags = ${esp32s3_common_LittleFS.build_flags} - -DFEATURE_ETHERNET=1 -DFEATURE_ARDUINO_OTA=1 -DPLUGIN_BUILD_MAX_ESP32 -DPLUGIN_BUILD_IR_EXTENDED @@ -226,7 +192,6 @@ extra_scripts = ${esp32s3_common_LittleFS.extra_scripts} extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_opi-16M build_flags = ${esp32s3_common_LittleFS.build_flags} - -DFEATURE_ETHERNET=1 -DFEATURE_ARDUINO_OTA=1 -DPLUGIN_BUILD_MAX_ESP32 -DPLUGIN_BUILD_IR_EXTENDED diff --git a/platformio_special_envs.ini b/platformio_special_envs.ini index 6b2c28ebd..179b27b68 100644 --- a/platformio_special_envs.ini +++ b/platformio_special_envs.ini @@ -50,14 +50,14 @@ extra_scripts = ${extra_scripts_esp8266.extra_scripts} [env:spec_debug_custom_ESP32_16M8M] -extends = esp32_common_LittleFS +extends = esp32_common_LittleFS_ETH build_type = ${debug_pio.build_type} check_tool = ${debug_pio.check_tool} check_flags = ${debug_pio.check_flags} -platform = ${esp32_common_LittleFS.platform} -build_flags = ${esp32_common_LittleFS.build_flags} ${debug_pio.build_flags} -DPLUGIN_BUILD_CUSTOM +platform = ${esp32_common_LittleFS_ETH.platform} +build_flags = ${esp32_common_LittleFS_ETH.build_flags} ${debug_pio.build_flags} -DPLUGIN_BUILD_CUSTOM board = esp32_16M8M -extra_scripts = ${esp32_common_LittleFS.extra_scripts} +extra_scripts = ${esp32_common_LittleFS_ETH.extra_scripts} pre:tools/pio/pre_custom_esp32.py [env:spec_debug_max_ESP32_16M8M] @@ -65,7 +65,7 @@ extends = esp32_base_idf5 build_type = ${debug_pio.build_type} check_tool = ${debug_pio.check_tool} check_flags = ${debug_pio.check_flags} -lib_ignore = ${esp32_common_LittleFS.lib_ignore} +lib_ignore = ${esp32_common_LittleFS_ETH.lib_ignore} build_flags = ${esp32_base_idf5.build_flags} ${debug_pio.build_flags} -DESP32_CLASSIC @@ -87,7 +87,7 @@ extends = esp32_base_idf5 build_type = ${debug_pio.build_type} check_tool = ${debug_pio.check_tool} check_flags = ${debug_pio.check_flags} -lib_ignore = ${esp32_common_LittleFS.lib_ignore} +lib_ignore = ${esp32_common_LittleFS_ETH.lib_ignore} build_flags = ${esp32_base_idf5.build_flags} ${debug_pio.build_flags} -DESP32_CLASSIC @@ -107,7 +107,7 @@ extends = esp32_base_idf5 build_type = ${debug_pio.build_type} check_tool = ${debug_pio.check_tool} check_flags = ${debug_pio.check_flags} -lib_ignore = ${esp32_common_LittleFS.lib_ignore} +lib_ignore = ${esp32_common_LittleFS_ETH.lib_ignore} build_flags = ${esp32_base_idf5.build_flags} ${debug_pio.build_flags} -DESP32_CLASSIC @@ -128,7 +128,7 @@ extends = esp32_base_idf5 build_type = ${debug_pio.build_type} check_tool = ${debug_pio.check_tool} check_flags = ${debug_pio.check_flags} -lib_ignore = ${esp32_common_LittleFS.lib_ignore} +lib_ignore = ${esp32_common_LittleFS_ETH.lib_ignore} build_flags = ${esp32_base_idf5.build_flags} ${debug_pio.build_flags} -DESP32_CLASSIC diff --git a/src/src/Helpers/Hardware_GPIO_ESP32C3.cpp b/src/src/Helpers/Hardware_GPIO_ESP32C3.cpp index 99bfc09ff..fe3538705 100644 --- a/src/src/Helpers/Hardware_GPIO_ESP32C3.cpp +++ b/src/src/Helpers/Hardware_GPIO_ESP32C3.cpp @@ -45,9 +45,9 @@ bool getGpioInfo(int gpio, int& pinnr, bool& input, bool& output, bool& warning) output = false; } else { // See: https://www.letscontrolit.com/forum/viewtopic.php?p=71880#p71874 - if ((gpio == 12) || (gpio == 13)) { - // SPIHD/GPIO12 - // SPIWP/GPIO13 + if ((gpio == 12) || (gpio == 13)) { + // SPIHD/GPIO12 + // SPIWP/GPIO13 if ((ESP.getFlashChipMode() != FM_DOUT) && (ESP.getFlashChipMode() != FM_DIO)) { input = false; diff --git a/tools/pio/post_esp32.py b/tools/pio/post_esp32.py index d75e918f8..85d59bcc1 100644 --- a/tools/pio/post_esp32.py +++ b/tools/pio/post_esp32.py @@ -44,14 +44,14 @@ def esp32_create_combined_bin(source, target, env): cmd = [ "--chip", chip, - "merge_bin", + "merge-bin", "-o", new_file_name, - "--flash_mode", + "--flash-mode", flash_mode, - "--flash_freq", + "--flash-freq", flash_freq, - "--flash_size", + "--flash-size", flash_size, ]