Michel2/ESPEasy
1
0
Fork 0
mirror of https://github.com/letscontrolit/ESPEasy.git synced 2026-07-28 04:07:47 +00:00
Code Issues Releases Activity

Merge branch 'mega' of https://github.com/letscontrolit/ESPEasy into feature/Build-add-collection-h-split-climate-into-a-and-b

Browse Source
This commit is contained in:
Ton Huisman
2025-11-17 22:31:10 +01:00
parent e71f847609 007d29f182
commit 883b38bb43
45 changed files with 906 additions and 425 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platformio_esp32_envs.ini
+54 -54
View File
@@ -66,7 +66,7 @@ lib_ignore = ${esp32_always.lib_ignore}
${esp32_base_idf5.lib_ignore}
[esp32_IRExt_LittleFS_ETH]
[esp32_IRExt]
extends = esp32_common_LittleFS_ETH
lib_ignore = ${esp32_always.lib_ignore}
ESP32_ping
@@ -88,21 +88,21 @@ extra_scripts = ${esp32_common_LittleFS_ETH.extra_scripts}
pre:tools/pio/pre_custom_esp32.py
[env:custom_ESP32_4M316k_LittleFS_ETH]
[env:custom_ESP32_4M316k]
extends = esp32_custom_base_LittleFS
board = esp32_4M
build_flags = ${esp32_custom_base_LittleFS.build_flags}
-DFEATURE_ETHERNET=1
[env:custom_ESP32_16M8M_LittleFS_ETH]
extends = env:custom_ESP32_4M316k_LittleFS_ETH
[env:custom_ESP32_16M8M]
extends = env:custom_ESP32_4M316k
board = esp32_16M8M
board_upload.flash_size = 16MB
build_flags = ${env:custom_ESP32_4M316k_LittleFS_ETH.build_flags}
build_flags = ${env:custom_ESP32_4M316k.build_flags}
[env:custom_IR_ESP32_4M316k_LittleFS_ETH]
[env:custom_IR_ESP32_4M316k]
extends = esp32_common_LittleFS_ETH
board = esp32_4M
build_flags = ${esp32_common_LittleFS_ETH.build_flags}
@@ -115,15 +115,15 @@ extra_scripts = ${esp32_common_LittleFS_ETH.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 = env:custom_ESP32_4M316k_LittleFS_ETH
[env:custom_ESP32_4M2M_NO_OTA]
extends = env:custom_ESP32_4M316k
board = esp32_4M2M
build_flags = ${env:custom_ESP32_4M316k_LittleFS_ETH.build_flags}
build_flags = ${env:custom_ESP32_4M316k.build_flags}
-DNO_HTTP_UPDATER
[env:collection_A_ESP32_4M316k_LittleFS_ETH]
[env:collection_A_ESP32_4M316k]
extends = esp32_common_LittleFS_ETH
board = esp32_4M
build_flags = ${esp32_common_LittleFS_ETH.build_flags}
@@ -132,7 +132,7 @@ build_flags = ${esp32_common_LittleFS_ETH.build_flags}
-DCOLLECTION_FEATURE_RTTTL=1
[env:collection_B_ESP32_4M316k_LittleFS_ETH]
[env:collection_B_ESP32_4M316k]
extends = esp32_common_LittleFS_ETH
board = esp32_4M
build_flags = ${esp32_common_LittleFS_ETH.build_flags}
@@ -141,7 +141,7 @@ build_flags = ${esp32_common_LittleFS_ETH.build_flags}
-DCOLLECTION_FEATURE_RTTTL=1
[env:collection_C_ESP32_4M316k_LittleFS_ETH]
[env:collection_C_ESP32_4M316k]
extends = esp32_common_LittleFS_ETH
board = esp32_4M
build_flags = ${esp32_common_LittleFS_ETH.build_flags}
@@ -150,7 +150,7 @@ build_flags = ${esp32_common_LittleFS_ETH.build_flags}
-DCOLLECTION_FEATURE_RTTTL=1
[env:collection_D_ESP32_4M316k_LittleFS_ETH]
[env:collection_D_ESP32_4M316k]
extends = esp32_common_LittleFS_ETH
board = esp32_4M
build_flags = ${esp32_common_LittleFS_ETH.build_flags}
@@ -159,7 +159,7 @@ build_flags = ${esp32_common_LittleFS_ETH.build_flags}
-DCOLLECTION_FEATURE_RTTTL=1
[env:collection_E_ESP32_4M316k_LittleFS_ETH]
[env:collection_E_ESP32_4M316k]
extends = esp32_common_LittleFS_ETH
board = esp32_4M
build_flags = ${esp32_common_LittleFS_ETH.build_flags}
@@ -168,7 +168,7 @@ build_flags = ${esp32_common_LittleFS_ETH.build_flags}
-DCOLLECTION_FEATURE_RTTTL=1
[env:collection_F_ESP32_4M316k_LittleFS_ETH]
[env:collection_F_ESP32_4M316k]
extends = esp32_common_LittleFS_ETH
board = esp32_4M
build_flags = ${esp32_common_LittleFS_ETH.build_flags}
@@ -177,7 +177,7 @@ build_flags = ${esp32_common_LittleFS_ETH.build_flags}
-DCOLLECTION_FEATURE_RTTTL=1
[env:collection_G_ESP32_4M316k_LittleFS_ETH]
[env:collection_G_ESP32_4M316k]
extends = esp32_common_LittleFS_ETH
board = esp32_4M
build_flags = ${esp32_common_LittleFS_ETH.build_flags}
@@ -186,7 +186,7 @@ build_flags = ${esp32_common_LittleFS_ETH.build_flags}
-DCOLLECTION_FEATURE_RTTTL=1
[env:collection_H_ESP32_4M316k_LittleFS_ETH]
[env:collection_H_ESP32_4M316k]
extends = esp32_common_LittleFS_ETH
board = esp32_4M
build_flags = ${esp32_common_LittleFS_ETH.build_flags}
@@ -196,55 +196,55 @@ build_flags = ${esp32_common_LittleFS_ETH.build_flags}
[env:collection_A_ESP32_IRExt_4M316k_LittleFS_ETH]
extends = esp32_IRExt_LittleFS_ETH
[env:collection_A_ESP32_IRExt_4M316k]
extends = esp32_IRExt
board = esp32_4M
build_flags = ${esp32_IRExt_LittleFS_ETH.build_flags}
build_flags = ${esp32_IRExt.build_flags}
-DPLUGIN_SET_COLLECTION_ESP32
[env:collection_B_ESP32_IRExt_4M316k_LittleFS_ETH]
extends = esp32_IRExt_LittleFS_ETH
[env:collection_B_ESP32_IRExt_4M316k]
extends = esp32_IRExt
board = esp32_4M
build_flags = ${esp32_IRExt_LittleFS_ETH.build_flags}
build_flags = ${esp32_IRExt.build_flags}
-DPLUGIN_SET_COLLECTION_B_ESP32
[env:collection_C_ESP32_IRExt_4M316k_LittleFS_ETH]
extends = esp32_IRExt_LittleFS_ETH
[env:collection_C_ESP32_IRExt_4M316k]
extends = esp32_IRExt
board = esp32_4M
build_flags = ${esp32_IRExt_LittleFS_ETH.build_flags}
build_flags = ${esp32_IRExt.build_flags}
-DPLUGIN_SET_COLLECTION_C_ESP32
[env:collection_D_ESP32_IRExt_4M316k_LittleFS_ETH]
extends = esp32_IRExt_LittleFS_ETH
[env:collection_D_ESP32_IRExt_4M316k]
extends = esp32_IRExt
board = esp32_4M
build_flags = ${esp32_IRExt_LittleFS_ETH.build_flags}
build_flags = ${esp32_IRExt.build_flags}
-DPLUGIN_SET_COLLECTION_D_ESP32
[env:collection_E_ESP32_IRExt_4M316k_LittleFS_ETH]
extends = esp32_IRExt_LittleFS_ETH
[env:collection_E_ESP32_IRExt_4M316k]
extends = esp32_IRExt
board = esp32_4M
build_flags = ${esp32_IRExt_LittleFS_ETH.build_flags}
build_flags = ${esp32_IRExt.build_flags}
-DPLUGIN_SET_COLLECTION_E_ESP32
[env:collection_F_ESP32_IRExt_4M316k_LittleFS_ETH]
extends = esp32_IRExt_LittleFS_ETH
[env:collection_F_ESP32_IRExt_4M316k]
extends = esp32_IRExt
board = esp32_4M
build_flags = ${esp32_IRExt_LittleFS_ETH.build_flags}
build_flags = ${esp32_IRExt.build_flags}
-DPLUGIN_SET_COLLECTION_F_ESP32
[env:collection_G_ESP32_IRExt_4M316k_LittleFS_ETH]
extends = esp32_IRExt_LittleFS_ETH
[env:collection_G_ESP32_IRExt_4M316k]
extends = esp32_IRExt
board = esp32_4M
build_flags = ${esp32_IRExt_LittleFS_ETH.build_flags}
build_flags = ${esp32_IRExt.build_flags}
-DPLUGIN_SET_COLLECTION_G_ESP32
[env:collection_H_ESP32_IRExt_4M316k_LittleFS_ETH]
extends = esp32_IRExt_LittleFS_ETH
[env:collection_H_ESP32_IRExt_4M316k]
extends = esp32_IRExt
board = esp32_4M
build_flags = ${esp32_IRExt_LittleFS_ETH.build_flags}
build_flags = ${esp32_IRExt.build_flags}
-DPLUGIN_SET_COLLECTION_H_ESP32
[env:energy_ESP32_4M316k_LittleFS_ETH]
[env:energy_ESP32_4M316k]
extends = esp32_common_LittleFS_ETH
board = esp32_4M
build_flags = ${esp32_common_LittleFS_ETH.build_flags}
@@ -252,7 +252,7 @@ build_flags = ${esp32_common_LittleFS_ETH.build_flags}
-DPLUGIN_ENERGY_COLLECTION
[env:display_A_ESP32_4M316k_LittleFS_ETH]
[env:display_A_ESP32_4M316k]
extends = esp32_common_LittleFS_ETH
board = esp32_4M
build_flags = ${esp32_common_LittleFS_ETH.build_flags}
@@ -261,7 +261,7 @@ build_flags = ${esp32_common_LittleFS_ETH.build_flags}
-D ST7789_EXTRA_INIT=1
-D P116_EXTRA_ST7789=1
[env:display_B_ESP32_4M316k_LittleFS_ETH]
[env:display_B_ESP32_4M316k]
extends = esp32_common_LittleFS_ETH
board = esp32_4M
build_flags = ${esp32_common_LittleFS_ETH.build_flags}
@@ -272,7 +272,7 @@ build_flags = ${esp32_common_LittleFS_ETH.build_flags}
[env:climate_A_ESP32_4M316k_LittleFS_ETH]
[env:climate_A_ESP32_4M316k]
extends = esp32_common_LittleFS_ETH
board = esp32_4M
lib_ignore = ${esp32_always.lib_ignore}
@@ -282,7 +282,7 @@ lib_ignore = ${esp32_always.lib_ignore}
build_flags = ${esp32_common_LittleFS_ETH.build_flags}
-DPLUGIN_CLIMATE_A_COLLECTION
[env:climate_B_ESP32_4M316k_LittleFS_ETH]
[env:climate_B_ESP32_4M316k]
extends = esp32_common_LittleFS_ETH
board = esp32_4M
lib_ignore = ${esp32_always.lib_ignore}
@@ -293,7 +293,7 @@ build_flags = ${esp32_common_LittleFS_ETH.build_flags}
-DPLUGIN_CLIMATE_B_COLLECTION
[env:neopixel_ESP32_4M316k_LittleFS_ETH]
[env:neopixel_ESP32_4M316k]
extends = esp32_common_LittleFS_ETH
board = esp32_4M
build_flags = ${esp32_common_LittleFS_ETH.build_flags}
@@ -304,7 +304,7 @@ build_flags = ${esp32_common_LittleFS_ETH.build_flags}
[env:custom_IR_ESP32_16M8M_LittleFS_ETH]
[env:custom_IR_ESP32_16M8M]
extends = esp32_common_LittleFS_ETH
board = esp32_16M8M
board_upload.flash_size = 16MB
@@ -320,7 +320,7 @@ extra_scripts = ${esp32_common_LittleFS_ETH.extra_scripts}
[env:normal_ESP32_4M316k_LittleFS_ETH]
[env:normal_ESP32_4M316k]
extends = esp32_common_LittleFS_ETH
board = esp32_4M
lib_ignore = ${esp32_always.lib_ignore}
@@ -331,10 +331,10 @@ build_flags = ${esp32_common_LittleFS_ETH.build_flags}
[env:normal_ESP32_IRExt_4M316k_LittleFS_ETH]
extends = esp32_IRExt_LittleFS_ETH
[env:normal_ESP32_IRExt_4M316k]
extends = esp32_IRExt
board = esp32_4M
build_flags = ${esp32_IRExt_LittleFS_ETH.build_flags}
build_flags = ${esp32_IRExt.build_flags}
@@ -342,7 +342,7 @@ build_flags = ${esp32_IRExt_LittleFS_ETH.build_flags}
; ESP32 MAX builds 16M flash ------------------------------
; A Lolin D32 PRO with 16MB Flash, allowing 4MB sketch size, and file storage using LittleFS filesystem
[env:max_ESP32_16M8M_LittleFS_ETH]
[env:max_ESP32_16M8M]
extends = esp32_common_LittleFS_ETH
board = esp32_16M8M
board_upload.flash_size = 16MB
@@ -359,7 +359,7 @@ 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
; [env:max_ESP32_16M8M_LittleFS_ETH]
; [env:max_ESP32_16M8M]
; extends = env:max_ESP32_16M8M_LittleFS
; board = ${env:max_ESP32_16M8M_LittleFS.board}
; build_flags = ${env:max_ESP32_16M8M_LittleFS.build_flags}