mirror of
https://github.com/letscontrolit/ESPEasy.git
synced 2026-07-27 19:57:38 +00:00
[Bugfix] RTTTL feature was not enabled for ESP32 Collection builds
This commit is contained in:
+15
-15
@@ -126,7 +126,7 @@ lib_ignore = ${esp32_always.lib_ignore}
|
||||
build_flags = ${esp32_common.build_flags}
|
||||
-DFEATURE_ARDUINO_OTA=1
|
||||
-DPLUGIN_BUILD_NORMAL_IRext
|
||||
-DCOLLECTION_USE_RTTTL
|
||||
-DCOLLECTION_FEATURE_RTTTL
|
||||
extra_scripts = ${esp32_common.extra_scripts}
|
||||
pre:tools/pio/ir_build_check.py
|
||||
|
||||
@@ -199,7 +199,7 @@ board = esp32_4M
|
||||
build_flags = ${esp32_common.build_flags}
|
||||
-DFEATURE_ARDUINO_OTA=1
|
||||
-DPLUGIN_SET_COLLECTION_ESP32
|
||||
-DCOLLECTION_USE_RTTTL
|
||||
-DCOLLECTION_FEATURE_RTTTL
|
||||
|
||||
[env:collection_B_ESP32_4M316k]
|
||||
extends = esp32_common
|
||||
@@ -207,7 +207,7 @@ board = esp32_4M
|
||||
build_flags = ${esp32_common.build_flags}
|
||||
-DFEATURE_ARDUINO_OTA=1
|
||||
-DPLUGIN_SET_COLLECTION_B_ESP32
|
||||
-DCOLLECTION_USE_RTTTL
|
||||
-DCOLLECTION_FEATURE_RTTTL
|
||||
|
||||
[env:collection_C_ESP32_4M316k]
|
||||
extends = esp32_common
|
||||
@@ -215,7 +215,7 @@ board = esp32_4M
|
||||
build_flags = ${esp32_common.build_flags}
|
||||
-DFEATURE_ARDUINO_OTA=1
|
||||
-DPLUGIN_SET_COLLECTION_C_ESP32
|
||||
-DCOLLECTION_USE_RTTTL
|
||||
-DCOLLECTION_FEATURE_RTTTL
|
||||
|
||||
[env:collection_D_ESP32_4M316k]
|
||||
extends = esp32_common
|
||||
@@ -223,7 +223,7 @@ board = esp32_4M
|
||||
build_flags = ${esp32_common.build_flags}
|
||||
-DFEATURE_ARDUINO_OTA=1
|
||||
-DPLUGIN_SET_COLLECTION_D_ESP32
|
||||
-DCOLLECTION_USE_RTTTL
|
||||
-DCOLLECTION_FEATURE_RTTTL
|
||||
|
||||
[env:collection_E_ESP32_4M316k]
|
||||
extends = esp32_common
|
||||
@@ -231,7 +231,7 @@ board = esp32_4M
|
||||
build_flags = ${esp32_common.build_flags}
|
||||
-DFEATURE_ARDUINO_OTA=1
|
||||
-DPLUGIN_SET_COLLECTION_E_ESP32
|
||||
-DCOLLECTION_USE_RTTTL
|
||||
-DCOLLECTION_FEATURE_RTTTL
|
||||
|
||||
[env:collection_F_ESP32_4M316k]
|
||||
extends = esp32_common
|
||||
@@ -239,7 +239,7 @@ board = esp32_4M
|
||||
build_flags = ${esp32_common.build_flags}
|
||||
-DFEATURE_ARDUINO_OTA=1
|
||||
-DPLUGIN_SET_COLLECTION_F_ESP32
|
||||
-DCOLLECTION_USE_RTTTL
|
||||
-DCOLLECTION_FEATURE_RTTTL
|
||||
|
||||
[env:collection_G_ESP32_4M316k]
|
||||
extends = esp32_common
|
||||
@@ -247,7 +247,7 @@ board = esp32_4M
|
||||
build_flags = ${esp32_common.build_flags}
|
||||
-DFEATURE_ARDUINO_OTA=1
|
||||
-DPLUGIN_SET_COLLECTION_G_ESP32
|
||||
-DCOLLECTION_USE_RTTTL
|
||||
-DCOLLECTION_FEATURE_RTTTL
|
||||
|
||||
|
||||
[env:collection_A_ESP32_IRExt_4M316k]
|
||||
@@ -382,43 +382,43 @@ build_flags = ${esp32_IRExt.build_flags}
|
||||
extends = env:collection_A_ESP32_4M316k
|
||||
build_flags = ${env:collection_A_ESP32_4M316k.build_flags}
|
||||
-DFEATURE_ETHERNET=1
|
||||
-DCOLLECTION_USE_RTTTL
|
||||
-DCOLLECTION_FEATURE_RTTTL
|
||||
|
||||
[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_USE_RTTTL
|
||||
-DCOLLECTION_FEATURE_RTTTL
|
||||
|
||||
[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_USE_RTTTL
|
||||
-DCOLLECTION_FEATURE_RTTTL
|
||||
|
||||
[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_USE_RTTTL
|
||||
-DCOLLECTION_FEATURE_RTTTL
|
||||
|
||||
[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_USE_RTTTL
|
||||
-DCOLLECTION_FEATURE_RTTTL
|
||||
|
||||
[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_USE_RTTTL
|
||||
-DCOLLECTION_FEATURE_RTTTL
|
||||
|
||||
[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_USE_RTTTL
|
||||
-DCOLLECTION_FEATURE_RTTTL
|
||||
|
||||
[env:energy_ESP32_4M316k_ETH]
|
||||
extends = env:energy_ESP32_4M316k
|
||||
|
||||
@@ -86,49 +86,49 @@ extends = esp32c3_common
|
||||
board = esp32c3cdc
|
||||
build_flags = ${esp32c3_common.build_flags}
|
||||
-DPLUGIN_SET_COLLECTION_ESP32
|
||||
-DCOLLECTION_USE_RTTTL
|
||||
-DCOLLECTION_FEATURE_RTTTL
|
||||
|
||||
[env:collection_B_ESP32c3_4M316k_CDC]
|
||||
extends = esp32c3_common
|
||||
board = esp32c3cdc
|
||||
build_flags = ${esp32c3_common.build_flags}
|
||||
-DPLUGIN_SET_COLLECTION_B_ESP32
|
||||
-DCOLLECTION_USE_RTTTL
|
||||
-DCOLLECTION_FEATURE_RTTTL
|
||||
|
||||
[env:collection_C_ESP32c3_4M316k_CDC]
|
||||
extends = esp32c3_common
|
||||
board = esp32c3cdc
|
||||
build_flags = ${esp32c3_common.build_flags}
|
||||
-DPLUGIN_SET_COLLECTION_C_ESP32
|
||||
-DCOLLECTION_USE_RTTTL
|
||||
-DCOLLECTION_FEATURE_RTTTL
|
||||
|
||||
[env:collection_D_ESP32c3_4M316k_CDC]
|
||||
extends = esp32c3_common
|
||||
board = esp32c3cdc
|
||||
build_flags = ${esp32c3_common.build_flags}
|
||||
-DPLUGIN_SET_COLLECTION_D_ESP32
|
||||
-DCOLLECTION_USE_RTTTL
|
||||
-DCOLLECTION_FEATURE_RTTTL
|
||||
|
||||
[env:collection_E_ESP32c3_4M316k_CDC]
|
||||
extends = esp32c3_common
|
||||
board = esp32c3cdc
|
||||
build_flags = ${esp32c3_common.build_flags}
|
||||
-DPLUGIN_SET_COLLECTION_E_ESP32
|
||||
-DCOLLECTION_USE_RTTTL
|
||||
-DCOLLECTION_FEATURE_RTTTL
|
||||
|
||||
[env:collection_F_ESP32c3_4M316k_CDC]
|
||||
extends = esp32c3_common
|
||||
board = esp32c3cdc
|
||||
build_flags = ${esp32c3_common.build_flags}
|
||||
-DPLUGIN_SET_COLLECTION_F_ESP32
|
||||
-DCOLLECTION_USE_RTTTL
|
||||
-DCOLLECTION_FEATURE_RTTTL
|
||||
|
||||
[env:collection_G_ESP32c3_4M316k_CDC]
|
||||
extends = esp32c3_common
|
||||
board = esp32c3cdc
|
||||
build_flags = ${esp32c3_common.build_flags}
|
||||
-DPLUGIN_SET_COLLECTION_G_ESP32
|
||||
-DCOLLECTION_USE_RTTTL
|
||||
-DCOLLECTION_FEATURE_RTTTL
|
||||
|
||||
|
||||
[env:energy_ESP32c3_4M316k_CDC]
|
||||
|
||||
@@ -102,49 +102,49 @@ extends = esp32s2_common
|
||||
board = esp32s2cdc
|
||||
build_flags = ${esp32s2_common.build_flags}
|
||||
-DPLUGIN_SET_COLLECTION_ESP32
|
||||
-DCOLLECTION_USE_RTTTL
|
||||
-DCOLLECTION_FEATURE_RTTTL
|
||||
|
||||
[env:collection_B_ESP32s2_4M316k_CDC]
|
||||
extends = esp32s2_common
|
||||
board = esp32s2cdc
|
||||
build_flags = ${esp32s2_common.build_flags}
|
||||
-DPLUGIN_SET_COLLECTION_B_ESP32
|
||||
-DCOLLECTION_USE_RTTTL
|
||||
-DCOLLECTION_FEATURE_RTTTL
|
||||
|
||||
[env:collection_C_ESP32s2_4M316k_CDC]
|
||||
extends = esp32s2_common
|
||||
board = esp32s2cdc
|
||||
build_flags = ${esp32s2_common.build_flags}
|
||||
-DPLUGIN_SET_COLLECTION_C_ESP32
|
||||
-DCOLLECTION_USE_RTTTL
|
||||
-DCOLLECTION_FEATURE_RTTTL
|
||||
|
||||
[env:collection_D_ESP32s2_4M316k_CDC]
|
||||
extends = esp32s2_common
|
||||
board = esp32s2cdc
|
||||
build_flags = ${esp32s2_common.build_flags}
|
||||
-DPLUGIN_SET_COLLECTION_D_ESP32
|
||||
-DCOLLECTION_USE_RTTTL
|
||||
-DCOLLECTION_FEATURE_RTTTL
|
||||
|
||||
[env:collection_E_ESP32s2_4M316k_CDC]
|
||||
extends = esp32s2_common
|
||||
board = esp32s2cdc
|
||||
build_flags = ${esp32s2_common.build_flags}
|
||||
-DPLUGIN_SET_COLLECTION_E_ESP32
|
||||
-DCOLLECTION_USE_RTTTL
|
||||
-DCOLLECTION_FEATURE_RTTTL
|
||||
|
||||
[env:collection_F_ESP32s2_4M316k_CDC]
|
||||
extends = esp32s2_common
|
||||
board = esp32s2cdc
|
||||
build_flags = ${esp32s2_common.build_flags}
|
||||
-DPLUGIN_SET_COLLECTION_F_ESP32
|
||||
-DCOLLECTION_USE_RTTTL
|
||||
-DCOLLECTION_FEATURE_RTTTL
|
||||
|
||||
[env:collection_G_ESP32s2_4M316k_CDC]
|
||||
extends = esp32s2_common
|
||||
board = esp32s2cdc
|
||||
build_flags = ${esp32s2_common.build_flags}
|
||||
-DPLUGIN_SET_COLLECTION_G_ESP32
|
||||
-DCOLLECTION_USE_RTTTL
|
||||
-DCOLLECTION_FEATURE_RTTTL
|
||||
|
||||
|
||||
[env:energy_ESP32s2_4M316k_CDC]
|
||||
|
||||
@@ -66,49 +66,49 @@ extends = esp32s3_common
|
||||
board = esp32s3cdc-qio_qspi
|
||||
build_flags = ${esp32s3_common.build_flags}
|
||||
-DPLUGIN_SET_COLLECTION_ESP32
|
||||
-DCOLLECTION_USE_RTTTL
|
||||
-DCOLLECTION_FEATURE_RTTTL
|
||||
|
||||
[env:collection_B_ESP32s3_4M316k_CDC]
|
||||
extends = esp32s3_common
|
||||
board = esp32s3cdc-qio_qspi
|
||||
build_flags = ${esp32s3_common.build_flags}
|
||||
-DPLUGIN_SET_COLLECTION_B_ESP32
|
||||
-DCOLLECTION_USE_RTTTL
|
||||
-DCOLLECTION_FEATURE_RTTTL
|
||||
|
||||
[env:collection_C_ESP32s3_4M316k_CDC]
|
||||
extends = esp32s3_common
|
||||
board = esp32s3cdc-qio_qspi
|
||||
build_flags = ${esp32s3_common.build_flags}
|
||||
-DPLUGIN_SET_COLLECTION_C_ESP32
|
||||
-DCOLLECTION_USE_RTTTL
|
||||
-DCOLLECTION_FEATURE_RTTTL
|
||||
|
||||
[env:collection_D_ESP32s3_4M316k_CDC]
|
||||
extends = esp32s3_common
|
||||
board = esp32s3cdc-qio_qspi
|
||||
build_flags = ${esp32s3_common.build_flags}
|
||||
-DPLUGIN_SET_COLLECTION_D_ESP32
|
||||
-DCOLLECTION_USE_RTTTL
|
||||
-DCOLLECTION_FEATURE_RTTTL
|
||||
|
||||
[env:collection_E_ESP32s3_4M316k_CDC]
|
||||
extends = esp32s3_common
|
||||
board = esp32s3cdc-qio_qspi
|
||||
build_flags = ${esp32s3_common.build_flags}
|
||||
-DPLUGIN_SET_COLLECTION_E_ESP32
|
||||
-DCOLLECTION_USE_RTTTL
|
||||
-DCOLLECTION_FEATURE_RTTTL
|
||||
|
||||
[env:collection_F_ESP32s3_4M316k_CDC]
|
||||
extends = esp32s3_common
|
||||
board = esp32s3cdc-qio_qspi
|
||||
build_flags = ${esp32s3_common.build_flags}
|
||||
-DPLUGIN_SET_COLLECTION_F_ESP32
|
||||
-DCOLLECTION_USE_RTTTL
|
||||
-DCOLLECTION_FEATURE_RTTTL
|
||||
|
||||
[env:collection_G_ESP32s3_4M316k_CDC]
|
||||
extends = esp32s3_common
|
||||
board = esp32s3cdc-qio_qspi
|
||||
build_flags = ${esp32s3_common.build_flags}
|
||||
-DPLUGIN_SET_COLLECTION_G_ESP32
|
||||
-DCOLLECTION_USE_RTTTL
|
||||
-DCOLLECTION_FEATURE_RTTTL
|
||||
|
||||
|
||||
[env:energy_ESP32s3_4M316k_CDC]
|
||||
|
||||
+12
-12
@@ -471,7 +471,7 @@ build_flags = ${collection.build_flags}
|
||||
[env:collection_A_ESP8266_4M1M]
|
||||
extends = collection_ESP8266_4M1M
|
||||
build_flags = ${collection_ESP8266_4M1M.build_flags}
|
||||
-DCOLLECTION_USE_RTTTL
|
||||
-DCOLLECTION_FEATURE_RTTTL
|
||||
|
||||
[env:collection_B_ESP8266_4M1M]
|
||||
extends = collection_ESP8266_4M1M
|
||||
@@ -482,31 +482,31 @@ build_flags = ${collection_ESP8266_4M1M.build_flags}
|
||||
extends = collection_ESP8266_4M1M
|
||||
build_flags = ${collection_ESP8266_4M1M.build_flags}
|
||||
-DPLUGIN_BUILD_COLLECTION_C
|
||||
-DCOLLECTION_USE_RTTTL
|
||||
-DCOLLECTION_FEATURE_RTTTL
|
||||
|
||||
[env:collection_D_ESP8266_4M1M]
|
||||
extends = collection_ESP8266_4M1M
|
||||
build_flags = ${collection_ESP8266_4M1M.build_flags}
|
||||
-DPLUGIN_BUILD_COLLECTION_D
|
||||
-DCOLLECTION_USE_RTTTL
|
||||
-DCOLLECTION_FEATURE_RTTTL
|
||||
|
||||
[env:collection_E_ESP8266_4M1M]
|
||||
extends = collection_ESP8266_4M1M
|
||||
build_flags = ${collection_ESP8266_4M1M.build_flags}
|
||||
-DPLUGIN_BUILD_COLLECTION_E
|
||||
-DCOLLECTION_USE_RTTTL
|
||||
-DCOLLECTION_FEATURE_RTTTL
|
||||
|
||||
[env:collection_F_ESP8266_4M1M]
|
||||
extends = collection_ESP8266_4M1M
|
||||
build_flags = ${collection_ESP8266_4M1M.build_flags}
|
||||
-DPLUGIN_BUILD_COLLECTION_F
|
||||
-DCOLLECTION_USE_RTTTL
|
||||
-DCOLLECTION_FEATURE_RTTTL
|
||||
|
||||
[env:collection_G_ESP8266_4M1M]
|
||||
extends = collection_ESP8266_4M1M
|
||||
build_flags = ${collection_ESP8266_4M1M.build_flags}
|
||||
-DPLUGIN_BUILD_COLLECTION_G
|
||||
-DCOLLECTION_USE_RTTTL
|
||||
-DCOLLECTION_FEATURE_RTTTL
|
||||
|
||||
|
||||
; COLL: 4096k version + FEATURE_ADC_VCC ----------
|
||||
@@ -514,7 +514,7 @@ build_flags = ${collection_ESP8266_4M1M.build_flags}
|
||||
extends = collection_ESP8266_4M1M
|
||||
build_flags = ${collection_ESP8266_4M1M.build_flags}
|
||||
-DFEATURE_ADC_VCC=1
|
||||
-DCOLLECTION_USE_RTTTL
|
||||
-DCOLLECTION_FEATURE_RTTTL
|
||||
|
||||
[env:collection_B_ESP8266_4M1M_VCC]
|
||||
extends = collection_ESP8266_4M1M
|
||||
@@ -527,35 +527,35 @@ extends = collection_ESP8266_4M1M
|
||||
build_flags = ${collection_ESP8266_4M1M.build_flags}
|
||||
-DFEATURE_ADC_VCC=1
|
||||
-DPLUGIN_BUILD_COLLECTION_C
|
||||
-DCOLLECTION_USE_RTTTL
|
||||
-DCOLLECTION_FEATURE_RTTTL
|
||||
|
||||
[env:collection_D_ESP8266_4M1M_VCC]
|
||||
extends = collection_ESP8266_4M1M
|
||||
build_flags = ${collection_ESP8266_4M1M.build_flags}
|
||||
-DFEATURE_ADC_VCC=1
|
||||
-DPLUGIN_BUILD_COLLECTION_D
|
||||
-DCOLLECTION_USE_RTTTL
|
||||
-DCOLLECTION_FEATURE_RTTTL
|
||||
|
||||
[env:collection_E_ESP8266_4M1M_VCC]
|
||||
extends = collection_ESP8266_4M1M
|
||||
build_flags = ${collection_ESP8266_4M1M.build_flags}
|
||||
-DFEATURE_ADC_VCC=1
|
||||
-DPLUGIN_BUILD_COLLECTION_E
|
||||
-DCOLLECTION_USE_RTTTL
|
||||
-DCOLLECTION_FEATURE_RTTTL
|
||||
|
||||
[env:collection_F_ESP8266_4M1M_VCC]
|
||||
extends = collection_ESP8266_4M1M
|
||||
build_flags = ${collection_ESP8266_4M1M.build_flags}
|
||||
-DFEATURE_ADC_VCC=1
|
||||
-DPLUGIN_BUILD_COLLECTION_F
|
||||
-DCOLLECTION_USE_RTTTL
|
||||
-DCOLLECTION_FEATURE_RTTTL
|
||||
|
||||
[env:collection_G_ESP8266_4M1M_VCC]
|
||||
extends = collection_ESP8266_4M1M
|
||||
build_flags = ${collection_ESP8266_4M1M.build_flags}
|
||||
-DFEATURE_ADC_VCC=1
|
||||
-DPLUGIN_BUILD_COLLECTION_G
|
||||
-DCOLLECTION_USE_RTTTL
|
||||
-DCOLLECTION_FEATURE_RTTTL
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user