Michel2/ESPEasy
1
0
Fork 0
mirror of https://github.com/letscontrolit/ESPEasy.git synced 2026-09-12 01:24:04 +00:00
Code Issues Releases Activity

[Build] Rename TEST builds to COLLECTION to reduce confusion about build-names

Browse Source
This commit is contained in:
Ton Huisman
2022-07-22 21:48:13 +02:00
parent ea1df0b902
commit c3d419f8d6
12 changed files with 542 additions and 486 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platformio_esp32_envs.ini
+51 -50
View File
@@ -90,13 +90,12 @@ board_build.filesystem = littlefs
[esp32_IRExt]
extends = esp32_base
lib_ignore = AS_BH1750
${esp32_always.lib_ignore}
lib_ignore = ${esp32_always.lib_ignore}
ESP32_ping
build_flags = ${esp32_base.build_flags}
-DFEATURE_ARDUINO_OTA
-DPLUGIN_BUILD_NORMAL_IRext
-DTESTING_USE_RTTTL
-DCOLLECTION_USE_RTTTL
lib_deps = ${esp32_base.lib_deps}
LittleFS
@@ -158,74 +157,76 @@ lib_deps = ${esp32_common_LittleFS.lib_deps}
[env:test_A_ESP32_4M316k]
[env:collection_A_ESP32_4M316k]
extends = esp32_common
board = esp32_4M
build_flags = ${esp32_common.build_flags}
-DFEATURE_ARDUINO_OTA
-DPLUGIN_SET_TEST_ESP32
-DTESTING_USE_RTTTL
-DPLUGIN_SET_COLLECTION_ESP32
-DCOLLECTION_USE_RTTTL
[env:test_B_ESP32_4M316k]
[env:collection_B_ESP32_4M316k]
extends = esp32_common
board = esp32_4M
build_flags = ${esp32_common.build_flags}
-DFEATURE_ARDUINO_OTA
-DPLUGIN_SET_TEST_B_ESP32
-DTESTING_USE_RTTTL
-DPLUGIN_SET_COLLECTION_B_ESP32
-DCOLLECTION_USE_RTTTL
[env:test_C_ESP32_4M316k]
[env:collection_C_ESP32_4M316k]
extends = esp32_common
board = esp32_4M
build_flags = ${esp32_common.build_flags}
-DFEATURE_ARDUINO_OTA
-DPLUGIN_SET_TEST_C_ESP32
-DTESTING_USE_RTTTL
-DPLUGIN_SET_COLLECTION_C_ESP32
-DCOLLECTION_USE_RTTTL
[env:test_D_ESP32_4M316k]
[env:collection_D_ESP32_4M316k]
extends = esp32_common
board = esp32_4M
build_flags = ${esp32_common.build_flags}
-DFEATURE_ARDUINO_OTA
-DPLUGIN_SET_TEST_D_ESP32
-DTESTING_USE_RTTTL
-DPLUGIN_SET_COLLECTION_D_ESP32
-DCOLLECTION_USE_RTTTL
[env:test_E_ESP32_4M316k]
[env:collection_E_ESP32_4M316k]
extends = esp32_common
board = esp32_4M
build_flags = ${esp32_common.build_flags}
-DFEATURE_ARDUINO_OTA
-DPLUGIN_SET_TEST_E_ESP32
-DTESTING_USE_RTTTL
-DPLUGIN_SET_COLLECTION_E_ESP32
-DCOLLECTION_USE_RTTTL
[env:test_A_ESP32_IRExt_4M316k]
extends = esp32_IRExt
board = esp32_4M
[env:test_B_ESP32_IRExt_4M316k]
[env:collection_A_ESP32_IRExt_4M316k]
extends = esp32_IRExt
board = esp32_4M
build_flags = ${esp32_IRExt.build_flags}
-DPLUGIN_SET_TEST_B_ESP32
-DPLUGIN_SET_COLLECTION_ESP32
[env:test_C_ESP32_IRExt_4M316k]
[env:collection_B_ESP32_IRExt_4M316k]
extends = esp32_IRExt
board = esp32_4M
build_flags = ${esp32_IRExt.build_flags}
-DPLUGIN_SET_TEST_C_ESP32
-DPLUGIN_SET_COLLECTION_B_ESP32
[env:test_D_ESP32_IRExt_4M316k]
[env:collection_C_ESP32_IRExt_4M316k]
extends = esp32_IRExt
board = esp32_4M
build_flags = ${esp32_IRExt.build_flags}
-DPLUGIN_SET_TEST_D_ESP32
-DPLUGIN_SET_COLLECTION_C_ESP32
[env:test_E_ESP32_IRExt_4M316k]
[env:collection_D_ESP32_IRExt_4M316k]
extends = esp32_IRExt
board = esp32_4M
build_flags = ${esp32_IRExt.build_flags}
-DPLUGIN_SET_TEST_E_ESP32
-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:energy_ESP32_4M316k]
extends = esp32_common
@@ -265,35 +266,35 @@ extends = env:normal_ESP32_4M316k
build_flags = ${env:normal_ESP32_4M316k.build_flags}
-DHAS_ETHERNET
[env:test_A_ESP32_4M316k_ETH]
extends = env:test_A_ESP32_4M316k
build_flags = ${env:test_A_ESP32_4M316k.build_flags}
[env:collection_A_ESP32_4M316k_ETH]
extends = env:collection_A_ESP32_4M316k
build_flags = ${env:collection_A_ESP32_4M316k.build_flags}
-DHAS_ETHERNET
-DTESTING_USE_RTTTL
-DCOLLECTION_USE_RTTTL
[env:test_B_ESP32_4M316k_ETH]
extends = env:test_B_ESP32_4M316k
build_flags = ${env:test_B_ESP32_4M316k.build_flags}
[env:collection_B_ESP32_4M316k_ETH]
extends = env:collection_B_ESP32_4M316k
build_flags = ${env:collection_B_ESP32_4M316k.build_flags}
-DHAS_ETHERNET
-DTESTING_USE_RTTTL
-DCOLLECTION_USE_RTTTL
[env:test_C_ESP32_4M316k_ETH]
extends = env:test_C_ESP32_4M316k
build_flags = ${env:test_C_ESP32_4M316k.build_flags}
[env:collection_C_ESP32_4M316k_ETH]
extends = env:collection_C_ESP32_4M316k
build_flags = ${env:collection_C_ESP32_4M316k.build_flags}
-DHAS_ETHERNET
-DTESTING_USE_RTTTL
-DCOLLECTION_USE_RTTTL
[env:test_D_ESP32_4M316k_ETH]
extends = env:test_D_ESP32_4M316k
build_flags = ${env:test_D_ESP32_4M316k.build_flags}
[env:collection_D_ESP32_4M316k_ETH]
extends = env:collection_D_ESP32_4M316k
build_flags = ${env:collection_D_ESP32_4M316k.build_flags}
-DHAS_ETHERNET
-DTESTING_USE_RTTTL
-DCOLLECTION_USE_RTTTL
[env:test_E_ESP32_4M316k_ETH]
extends = env:test_E_ESP32_4M316k
build_flags = ${env:test_E_ESP32_4M316k.build_flags}
[env:collection_E_ESP32_4M316k_ETH]
extends = env:collection_E_ESP32_4M316k
build_flags = ${env:collection_E_ESP32_4M316k.build_flags}
-DHAS_ETHERNET
-DTESTING_USE_RTTTL
-DCOLLECTION_USE_RTTTL
platformio_esp32s2_envs.ini
+15 -15
View File
@@ -63,40 +63,40 @@ board = esp32s2
lib_deps = ${esp32s2_common.lib_deps}
ServoESP32
[env:test_A_ESP32s2_4M316k]
[env:collection_A_ESP32s2_4M316k]
extends = esp32s2_common
board = esp32s2
build_flags = ${esp32s2_common.build_flags}
-DPLUGIN_SET_TEST_ESP32
-DTESTING_USE_RTTTL
-DPLUGIN_SET_COLLECTION_ESP32
-DCOLLECTION_USE_RTTTL
[env:test_B_ESP32s2_4M316k]
[env:collection_B_ESP32s2_4M316k]
extends = esp32s2_common
board = esp32s2
build_flags = ${esp32s2_common.build_flags}
-DPLUGIN_SET_TEST_B_ESP32
-DTESTING_USE_RTTTL
-DPLUGIN_SET_COLLECTION_B_ESP32
-DCOLLECTION_USE_RTTTL
[env:test_C_ESP32s2_4M316k]
[env:collection_C_ESP32s2_4M316k]
extends = esp32s2_common
board = esp32s2
build_flags = ${esp32s2_common.build_flags}
-DPLUGIN_SET_TEST_C_ESP32
-DTESTING_USE_RTTTL
-DPLUGIN_SET_COLLECTION_C_ESP32
-DCOLLECTION_USE_RTTTL
[env:test_D_ESP32s2_4M316k]
[env:collection_D_ESP32s2_4M316k]
extends = esp32s2_common
board = esp32s2
build_flags = ${esp32s2_common.build_flags}
-DPLUGIN_SET_TEST_D_ESP32
-DTESTING_USE_RTTTL
-DPLUGIN_SET_COLLECTION_D_ESP32
-DCOLLECTION_USE_RTTTL
[env:test_E_ESP32s2_4M316k]
[env:collection_E_ESP32s2_4M316k]
extends = esp32s2_common
board = esp32s2
build_flags = ${esp32s2_common.build_flags}
-DPLUGIN_SET_TEST_E_ESP32
-DTESTING_USE_RTTTL
-DPLUGIN_SET_COLLECTION_E_ESP32
-DCOLLECTION_USE_RTTTL
[env:energy_ESP32s2_4M316k]
platformio_esp82xx_base.ini
+10 -10
View File
@@ -131,16 +131,16 @@ lib_ignore = ${beta_platform.lib_ignore}
LittleFS(esp8266)
;;; TEST *************************************************************
; additional plugins (and dependend code) that is marked as TESTING ;
; Includes "normal" + "testing" plugins ;
; *********************************************************************
;;; COLLECTION ********************************************************
; additional plugins (and dependend code) that is marked as COLLECTION ;
; Includes "normal" + "collection" plugins ;
; **********************************************************************
[testing]
[collection]
platform = ${regular_platform.platform}
platform_packages = ${regular_platform.platform_packages}
build_flags = ${regular_platform.build_flags}
-DPLUGIN_BUILD_TESTING
-DPLUGIN_BUILD_COLLECTION
-DLIMIT_BUILD_SIZE
lib_ignore = ${regular_platform.lib_ignore}
SD(esp8266)
@@ -149,11 +149,11 @@ lib_ignore = ${regular_platform.lib_ignore}
LittleFS(esp8266)
[testing_alt_wifi]
[collection_alt_wifi]
platform = ${regular_platform_alt_wifi.platform}
platform_packages = ${regular_platform_alt_wifi.platform_packages}
build_flags = ${regular_platform_alt_wifi.build_flags}
-DPLUGIN_BUILD_TESTING
-DPLUGIN_BUILD_COLLECTION
-DLIMIT_BUILD_SIZE
lib_ignore = ${regular_platform_alt_wifi.lib_ignore}
SD(esp8266)
@@ -161,11 +161,11 @@ lib_ignore = ${regular_platform_alt_wifi.lib_ignore}
SDFS
LittleFS(esp8266)
[testing_beta]
[collection_beta]
platform = ${beta_platform.platform}
platform_packages = ${beta_platform.platform_packages}
build_flags = ${beta_platform.build_flags}
-DPLUGIN_BUILD_TESTING
-DPLUGIN_BUILD_COLLECTION
-DLIMIT_BUILD_SIZE
lib_ignore = ${beta_platform.lib_ignore}
SD
platformio_esp82xx_envs.ini
+138 -138
View File
@@ -505,37 +505,37 @@ build_flags = ${normal_ir_extended_no_rx.build_flags}
;;; TEST *************************************************************
; additional plugins (and dependend code) that is marked as TESTING ;
; Includes "normal" + "testing" plugins ;
; *********************************************************************
;;; COLLECTION *********************************************************
; additional plugins (and dependend code) that is grouped as COLLECTION ;
; Includes "normal" + "collection" plugins ;
; ***********************************************************************
[testing_ESP8266_4M1M]
[collection_ESP8266_4M1M]
extends = esp8266_4M1M
platform = ${testing.platform}
platform_packages = ${testing.platform_packages}
build_flags = ${testing.build_flags}
platform = ${collection.platform}
platform_packages = ${collection.platform_packages}
build_flags = ${collection.build_flags}
${esp8266_4M1M.build_flags}
[testing_alt_wifi_ESP8266_4M1M]
[collection_alt_wifi_ESP8266_4M1M]
extends = esp8266_4M1M
platform = ${testing_alt_wifi.platform}
platform_packages = ${testing_alt_wifi.platform_packages}
build_flags = ${testing_alt_wifi.build_flags}
platform = ${collection_alt_wifi.platform}
platform_packages = ${collection_alt_wifi.platform_packages}
build_flags = ${collection_alt_wifi.build_flags}
${esp8266_4M1M.build_flags}
[testing_beta_ESP8266_4M1M]
[collection_beta_ESP8266_4M1M]
extends = esp8266_4M1M
platform = ${testing_beta.platform}
platform_packages = ${testing_beta.platform_packages}
build_flags = ${testing_beta.build_flags}
platform = ${collection_beta.platform}
platform_packages = ${collection_beta.platform_packages}
build_flags = ${collection_beta.build_flags}
${esp8266_4M1M.build_flags}
[testing_beta_ESP8266_16M_LittleFS]
[collection_beta_ESP8266_16M_LittleFS]
extends = esp8266_16M
platform = ${testing_beta.platform}
platform_packages = ${testing_beta.platform_packages}
build_flags = ${testing_beta.build_flags}
platform = ${collection_beta.platform}
platform_packages = ${collection_beta.platform_packages}
build_flags = ${collection_beta.build_flags}
${esp8266_16M.build_flags}
-DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22y
board_build.filesystem = littlefs
@@ -547,106 +547,106 @@ lib_ignore = ESP32_ping
HeatpumpIR
[env:test_A_ESP8266_4M1M]
extends = testing_ESP8266_4M1M
build_flags = ${testing_ESP8266_4M1M.build_flags}
-DTESTING_USE_RTTTL
[env:collection_A_ESP8266_4M1M]
extends = collection_ESP8266_4M1M
build_flags = ${collection_ESP8266_4M1M.build_flags}
-DCOLLECTION_USE_RTTTL
[env:test_B_ESP8266_4M1M]
extends = testing_ESP8266_4M1M
build_flags = ${testing_ESP8266_4M1M.build_flags}
-DPLUGIN_BUILD_TESTING_B
[env:collection_B_ESP8266_4M1M]
extends = collection_ESP8266_4M1M
build_flags = ${collection_ESP8266_4M1M.build_flags}
-DPLUGIN_BUILD_COLLECTION_B
[env:test_C_ESP8266_4M1M]
extends = testing_ESP8266_4M1M
build_flags = ${testing_ESP8266_4M1M.build_flags}
-DPLUGIN_BUILD_TESTING_C
-DTESTING_USE_RTTTL
[env:collection_C_ESP8266_4M1M]
extends = collection_ESP8266_4M1M
build_flags = ${collection_ESP8266_4M1M.build_flags}
-DPLUGIN_BUILD_COLLECTION_C
-DCOLLECTION_USE_RTTTL
[env:test_D_ESP8266_4M1M]
extends = testing_ESP8266_4M1M
build_flags = ${testing_ESP8266_4M1M.build_flags}
-DPLUGIN_BUILD_TESTING_D
-DTESTING_USE_RTTTL
[env:collection_D_ESP8266_4M1M]
extends = collection_ESP8266_4M1M
build_flags = ${collection_ESP8266_4M1M.build_flags}
-DPLUGIN_BUILD_COLLECTION_D
-DCOLLECTION_USE_RTTTL
[env:test_E_ESP8266_4M1M]
extends = testing_ESP8266_4M1M
build_flags = ${testing_ESP8266_4M1M.build_flags}
-DPLUGIN_BUILD_TESTING_E
-DTESTING_USE_RTTTL
[env:collection_E_ESP8266_4M1M]
extends = collection_ESP8266_4M1M
build_flags = ${collection_ESP8266_4M1M.build_flags}
-DPLUGIN_BUILD_COLLECTION_E
-DCOLLECTION_USE_RTTTL
; TEST: 4096k version + FEATURE_ADC_VCC ----------
[env:test_A_ESP8266_4M1M_VCC]
extends = testing_ESP8266_4M1M
build_flags = ${testing_ESP8266_4M1M.build_flags}
; COLL: 4096k version + FEATURE_ADC_VCC ----------
[env:collection_A_ESP8266_4M1M_VCC]
extends = collection_ESP8266_4M1M
build_flags = ${collection_ESP8266_4M1M.build_flags}
-DFEATURE_ADC_VCC=true
-DTESTING_USE_RTTTL
-DCOLLECTION_USE_RTTTL
[env:test_B_ESP8266_4M1M_VCC]
extends = testing_ESP8266_4M1M
build_flags = ${testing_ESP8266_4M1M.build_flags}
[env:collection_B_ESP8266_4M1M_VCC]
extends = collection_ESP8266_4M1M
build_flags = ${collection_ESP8266_4M1M.build_flags}
-DFEATURE_ADC_VCC=true
-DPLUGIN_BUILD_TESTING_B
-DPLUGIN_BUILD_COLLECTION_B
[env:test_C_ESP8266_4M1M_VCC]
extends = testing_ESP8266_4M1M
build_flags = ${testing_ESP8266_4M1M.build_flags}
[env:collection_C_ESP8266_4M1M_VCC]
extends = collection_ESP8266_4M1M
build_flags = ${collection_ESP8266_4M1M.build_flags}
-DFEATURE_ADC_VCC=true
-DPLUGIN_BUILD_TESTING_C
-DTESTING_USE_RTTTL
-DPLUGIN_BUILD_COLLECTION_C
-DCOLLECTION_USE_RTTTL
[env:test_D_ESP8266_4M1M_VCC]
extends = testing_ESP8266_4M1M
build_flags = ${testing_ESP8266_4M1M.build_flags}
[env:collection_D_ESP8266_4M1M_VCC]
extends = collection_ESP8266_4M1M
build_flags = ${collection_ESP8266_4M1M.build_flags}
-DFEATURE_ADC_VCC=true
-DPLUGIN_BUILD_TESTING_D
-DTESTING_USE_RTTTL
-DPLUGIN_BUILD_COLLECTION_D
-DCOLLECTION_USE_RTTTL
[env:test_E_ESP8266_4M1M_VCC]
extends = testing_ESP8266_4M1M
build_flags = ${testing_ESP8266_4M1M.build_flags}
[env:collection_E_ESP8266_4M1M_VCC]
extends = collection_ESP8266_4M1M
build_flags = ${collection_ESP8266_4M1M.build_flags}
-DFEATURE_ADC_VCC=true
-DPLUGIN_BUILD_TESTING_E
-DTESTING_USE_RTTTL
-DPLUGIN_BUILD_COLLECTION_E
-DCOLLECTION_USE_RTTTL
;[env:test_A_alt_wifi_ESP8266_4M1M_VCC]
;extends = testing_alt_wifi_ESP8266_4M1M
;build_flags = ${testing_alt_wifi_ESP8266_4M1M.build_flags}
;[env:collection_A_alt_wifi_ESP8266_4M1M_VCC]
;extends = collection_alt_wifi_ESP8266_4M1M
;build_flags = ${collection_alt_wifi_ESP8266_4M1M.build_flags}
; -DFEATURE_ADC_VCC=true
;[env:test_B_alt_wifi_ESP8266_4M1M_VCC]
;extends = testing_alt_wifi_ESP8266_4M1M
;build_flags = ${testing_alt_wifi_ESP8266_4M1M.build_flags}
;[env:collection_B_alt_wifi_ESP8266_4M1M_VCC]
;extends = collection_alt_wifi_ESP8266_4M1M
;build_flags = ${collection_alt_wifi_ESP8266_4M1M.build_flags}
; -DFEATURE_ADC_VCC=true
; -DPLUGIN_BUILD_TESTING_B
; -DPLUGIN_BUILD_COLLECTION_B
;[env:test_C_alt_wifi_ESP8266_4M1M_VCC]
;extends = testing_alt_wifi_ESP8266_4M1M
;build_flags = ${testing_alt_wifi_ESP8266_4M1M.build_flags}
;[env:collection_C_alt_wifi_ESP8266_4M1M_VCC]
;extends = collection_alt_wifi_ESP8266_4M1M
;build_flags = ${collection_alt_wifi_ESP8266_4M1M.build_flags}
; -DFEATURE_ADC_VCC=true
; -DPLUGIN_BUILD_TESTING_C
; -DPLUGIN_BUILD_COLLECTION_C
;[env:test_D_alt_wifi_ESP8266_4M1M_VCC]
;extends = testing_alt_wifi_ESP8266_4M1M
;build_flags = ${testing_alt_wifi_ESP8266_4M1M.build_flags}
;[env:collection_D_alt_wifi_ESP8266_4M1M_VCC]
;extends = collection_alt_wifi_ESP8266_4M1M
;build_flags = ${collection_alt_wifi_ESP8266_4M1M.build_flags}
; -DFEATURE_ADC_VCC=true
; -DPLUGIN_BUILD_TESTING_D
; -DPLUGIN_BUILD_COLLECTION_D
;[env:test_E_alt_wifi_ESP8266_4M1M_VCC]
;extends = testing_alt_wifi_ESP8266_4M1M
;build_flags = ${testing_alt_wifi_ESP8266_4M1M.build_flags}
;[env:collection_E_alt_wifi_ESP8266_4M1M_VCC]
;extends = collection_alt_wifi_ESP8266_4M1M
;build_flags = ${collection_alt_wifi_ESP8266_4M1M.build_flags}
; -DFEATURE_ADC_VCC=true
; -DPLUGIN_BUILD_TESTING_E
; -DPLUGIN_BUILD_COLLECTION_E
; TEST: 4096k version + FEATURE_ADC_VCC + FEATURE_MDNS + FEATURE_SD ----------
; COLL: 4096k version + FEATURE_ADC_VCC + FEATURE_MDNS + FEATURE_SD ----------
; Disabled for now as it does not fit in IRAM and with VCC_SD it does not fit in max. build size
;[env:test_ESP8266_4M1M_VCC_MDNS_SD]
;[env:collection_ESP8266_4M1M_VCC_MDNS_SD]
;extends = esp8266_4M1M
;platform = ${testing.platform}
;platform_packages = ${testing.platform_packages}
;build_flags = ${testing.build_flags}
;platform = ${collection.platform}
;platform_packages = ${collection.platform_packages}
;build_flags = ${collection.build_flags}
; ${esp8266_4M1M.build_flags}
; -DFEATURE_ADC_VCC=true
; -DFEATURE_MDNS
@@ -660,68 +660,68 @@ build_flags = ${testing_ESP8266_4M1M.build_flags}
; HeatpumpIRLittleFS(esp8266)
;[env:test_A_beta_ESP8266_4M1M]
;extends = testing_beta_ESP8266_4M1M
;build_flags = ${testing_beta_ESP8266_4M1M.build_flags}
;[env:collection_A_beta_ESP8266_4M1M]
;extends = collection_beta_ESP8266_4M1M
;build_flags = ${collection_beta_ESP8266_4M1M.build_flags}
; -DLIMIT_BUILD_SIZE
; -DTESTING_USE_RTTTL
; -DCOLLECTION_USE_RTTTL
;[env:test_B_beta_ESP8266_4M1M]
;extends = testing_beta_ESP8266_4M1M
;build_flags = ${testing_beta_ESP8266_4M1M.build_flags}
;[env:collection_B_beta_ESP8266_4M1M]
;extends = collection_beta_ESP8266_4M1M
;build_flags = ${collection_beta_ESP8266_4M1M.build_flags}
; -DLIMIT_BUILD_SIZE
; -DPLUGIN_BUILD_TESTING_B
; -DPLUGIN_BUILD_COLLECTION_B
;[env:test_C_beta_ESP8266_4M1M]
;extends = testing_beta_ESP8266_4M1M
;build_flags = ${testing_beta_ESP8266_4M1M.build_flags}
;[env:collection_C_beta_ESP8266_4M1M]
;extends = collection_beta_ESP8266_4M1M
;build_flags = ${collection_beta_ESP8266_4M1M.build_flags}
; -DLIMIT_BUILD_SIZE
; -DPLUGIN_BUILD_TESTING_C
; -DTESTING_USE_RTTTL
; -DPLUGIN_BUILD_COLLECTION_C
; -DCOLLECTION_USE_RTTTL
;[env:test_D_beta_ESP8266_4M1M]
;extends = testing_beta_ESP8266_4M1M
;build_flags = ${testing_beta_ESP8266_4M1M.build_flags}
;[env:collection_D_beta_ESP8266_4M1M]
;extends = collection_beta_ESP8266_4M1M
;build_flags = ${collection_beta_ESP8266_4M1M.build_flags}
; -DLIMIT_BUILD_SIZE
; -DPLUGIN_BUILD_TESTING_D
; -DTESTING_USE_RTTTL
; -DPLUGIN_BUILD_COLLECTION_D
; -DCOLLECTION_USE_RTTTL
;[env:test_E_beta_ESP8266_4M1M]
;extends = testing_beta_ESP8266_4M1M
;build_flags = ${testing_beta_ESP8266_4M1M.build_flags}
;[env:collection_E_beta_ESP8266_4M1M]
;extends = collection_beta_ESP8266_4M1M
;build_flags = ${collection_beta_ESP8266_4M1M.build_flags}
; -DLIMIT_BUILD_SIZE
; -DPLUGIN_BUILD_TESTING_E
; -DTESTING_USE_RTTTL
; -DTESTING_USE_RTTTL
; -DPLUGIN_BUILD_COLLECTION_E
; -DCOLLECTION_USE_RTTTL
; -DCOLLECTION_USE_RTTTL
; Test: 16M version -- LittleFS --------------
; COLL: 16M version -- LittleFS --------------
; LittleFS is determined by using "LittleFS" in the pio env name
;[env:test_A_beta_ESP8266_16M_LittleFS]
;extends = testing_beta_ESP8266_16M_LittleFS
;build_flags = ${testing_beta_ESP8266_16M_LittleFS.build_flags}
;[env:collection_A_beta_ESP8266_16M_LittleFS]
;extends = collection_beta_ESP8266_16M_LittleFS
;build_flags = ${collection_beta_ESP8266_16M_LittleFS.build_flags}
;[env:test_B_beta_ESP8266_16M_LittleFS]
;extends = testing_beta_ESP8266_16M_LittleFS
;build_flags = ${testing_beta_ESP8266_16M_LittleFS.build_flags}
; -DPLUGIN_BUILD_TESTING_B
;[env:collection_B_beta_ESP8266_16M_LittleFS]
;extends = collection_beta_ESP8266_16M_LittleFS
;build_flags = ${collection_beta_ESP8266_16M_LittleFS.build_flags}
; -DPLUGIN_BUILD_COLLECTION_B
;[env:test_C_beta_ESP8266_16M_LittleFS]
;extends = testing_beta_ESP8266_16M_LittleFS
;build_flags = ${testing_beta_ESP8266_16M_LittleFS.build_flags}
; -DPLUGIN_BUILD_TESTING_C
; -DTESTING_USE_RTTTL
;[env:collection_C_beta_ESP8266_16M_LittleFS]
;extends = collection_beta_ESP8266_16M_LittleFS
;build_flags = ${collection_beta_ESP8266_16M_LittleFS.build_flags}
; -DPLUGIN_BUILD_COLLECTION_C
; -DCOLLECTION_USE_RTTTL
;[env:test_D_beta_ESP8266_16M_LittleFS]
;extends = testing_beta_ESP8266_16M_LittleFS
;build_flags = ${testing_beta_ESP8266_16M_LittleFS.build_flags}
; -DPLUGIN_BUILD_TESTING_D
; -DTESTING_USE_RTTTL
;[env:collection_D_beta_ESP8266_16M_LittleFS]
;extends = collection_beta_ESP8266_16M_LittleFS
;build_flags = ${collection_beta_ESP8266_16M_LittleFS.build_flags}
; -DPLUGIN_BUILD_COLLECTION_D
; -DCOLLECTION_USE_RTTTL
;[env:test_E_beta_ESP8266_16M_LittleFS]
;extends = testing_beta_ESP8266_16M_LittleFS
;build_flags = ${testing_beta_ESP8266_16M_LittleFS.build_flags}
; -DPLUGIN_BUILD_TESTING_E
; -DTESTING_USE_RTTTL
;[env:collection_E_beta_ESP8266_16M_LittleFS]
;extends = collection_beta_ESP8266_16M_LittleFS
;build_flags = ${collection_beta_ESP8266_16M_LittleFS.build_flags}
; -DPLUGIN_BUILD_COLLECTION_E
; -DCOLLECTION_USE_RTTTL
src/ESPEasy-Globals.h
-3
View File
@@ -22,9 +22,6 @@
//(512k is NOT finsihed or tested yet as of v2.0.0-dev6)
//build all plugins that are in test stadium
//#define PLUGIN_BUILD_TESTING
//build all plugins that still are being developed and are broken or incomplete
//#define PLUGIN_BUILD_DEV
src/_C012.cpp
-2
View File
@@ -5,8 +5,6 @@
// ########################### Controller Plugin 012: Blynk #############################################
// #######################################################################################################
// #ifdef PLUGIN_BUILD_TESTING
# include "src/Commands/Blynk.h"
# define CPLUGIN_012
src/_C015.cpp
-2
View File
@@ -18,8 +18,6 @@
//
// https://www.youtube.com/watch?v=5_V_DibOypE
// #ifdef PLUGIN_BUILD_TESTING
// Uncomment this to use ssl connection. This requires more device resources than unencrypted one.
// Also it requires valid server thumbprint string to be entered in plugin settings.
// #define CPLUGIN_015_SSL
src/src/CustomBuild/ESPEasyLimits.h
+1 -1
View File
@@ -86,7 +86,7 @@
# ifdef ESP32
# define DEVICES_MAX 130
#else
#if defined(PLUGIN_BUILD_TESTING) || defined(PLUGIN_BUILD_DEV)
#if defined(PLUGIN_BUILD_COLLECTION) || defined(PLUGIN_BUILD_DEV)
# define DEVICES_MAX 95
# else
# define DEVICES_MAX 60
src/src/CustomBuild/define_plugin_sets.h
+320 -258
View File
@@ -19,7 +19,7 @@ To create/register a plugin, you have to :
either by adding "-DPLUGIN_BUILD_DEV" when compiling, or by momentarly
adding "#define PLUGIN_BUILD_DEV" at the top of the ESPEasy.ino file
- You will then have to push a PR including your plugin + the corret line (#define USES_P777) added to this file
When found stable enough, the maintainer (and only him) will choose to move it to TESTING or STABLE
When found stable enough, the maintainer (and only him) will choose to move it to COLLECTION or NORMAL
*/
//#define FEATURE_SD
@@ -176,8 +176,8 @@ To create/register a plugin, you have to :
#define PLUGIN_BUILD_IR
#endif
#ifdef PLUGIN_BUILD_TESTING_IR
#define PLUGIN_BUILD_TESTING // add testing
#ifdef PLUGIN_BUILD_COLLECTION_IR
#define PLUGIN_BUILD_COLLECTION // add collection
#define PLUGIN_BUILD_IR
#endif
@@ -220,69 +220,81 @@ To create/register a plugin, you have to :
#endif
#ifdef PLUGIN_BUILD_NORMAL_IRext
#define PLUGIN_BUILD_NORMAL // add stable
#define PLUGIN_BUILD_NORMAL // add stable
#if defined(PLUGIN_SET_COLLECTION_ESP32)
#define PLUGIN_DESCR "Collection_A, IR with AC"
#elif defined(PLUGIN_SET_COLLECTION_B_ESP32)
#define PLUGIN_DESCR "Collection_B, IR with AC"
#elif defined(PLUGIN_SET_COLLECTION_C_ESP32)
#define PLUGIN_DESCR "Collection_C, IR with AC"
#elif defined(PLUGIN_SET_COLLECTION_D_ESP32)
#define PLUGIN_DESCR "Collection_D, IR with AC"
#elif defined(PLUGIN_SET_COLLECTION_E_ESP32)
#define PLUGIN_DESCR "Collection_E, IR with AC"
#else
#define PLUGIN_DESCR "Normal, IR with AC"
#define PLUGIN_BUILD_IR_EXTENDED
#endif
#define PLUGIN_BUILD_IR_EXTENDED
#endif
#ifdef PLUGIN_BUILD_DEV
#define PLUGIN_SET_EXPERIMENTAL
#define CONTROLLER_SET_EXPERIMENTAL
#define NOTIFIER_SET_EXPERIMENTAL
#define PLUGIN_BUILD_TESTING // add testing
#define PLUGIN_SET_EXPERIMENTAL
#define CONTROLLER_SET_EXPERIMENTAL
#define NOTIFIER_SET_EXPERIMENTAL
#define PLUGIN_BUILD_COLLECTION // add collection
#endif
#ifdef PLUGIN_BUILD_TESTING
#if !defined(PLUGIN_BUILD_TESTING_B) && !defined(PLUGIN_BUILD_TESTING_C) && !defined(PLUGIN_BUILD_TESTING_D) && !defined(PLUGIN_BUILD_TESTING_E)
#define PLUGIN_DESCR "TEST_A"
#define PLUGIN_SET_TESTING_A
#endif
#define PLUGIN_SET_TESTING
#define CONTROLLER_SET_TESTING
#define NOTIFIER_SET_TESTING
#define PLUGIN_BUILD_NORMAL // add stable
#ifdef PLUGIN_BUILD_COLLECTION
#if !defined(PLUGIN_BUILD_COLLECTION_B) && !defined(PLUGIN_BUILD_COLLECTION_C) && !defined(PLUGIN_BUILD_COLLECTION_D) && !defined(PLUGIN_BUILD_COLLECTION_E)
#define PLUGIN_DESCR "Collection_A"
#define PLUGIN_SET_COLLECTION_A
#endif
#define PLUGIN_SET_COLLECTION
#define CONTROLLER_SET_COLLECTION
#define NOTIFIER_SET_COLLECTION
#define PLUGIN_BUILD_NORMAL // add stable
#endif
#ifdef PLUGIN_BUILD_TESTING_B
#define PLUGIN_DESCR "TEST_B"
#define PLUGIN_SET_TESTING
#define PLUGIN_SET_TESTING_B
#define CONTROLLER_SET_TESTING
#define NOTIFIER_SET_TESTING
#define PLUGIN_BUILD_NORMAL // add stable
#ifdef PLUGIN_BUILD_COLLECTION_B
#define PLUGIN_DESCR "Collection_B"
#define PLUGIN_SET_COLLECTION
#define PLUGIN_SET_COLLECTION_B
#define CONTROLLER_SET_COLLECTION
#define NOTIFIER_SET_COLLECTION
#define PLUGIN_BUILD_NORMAL // add stable
#endif
#ifdef PLUGIN_BUILD_TESTING_C
#define PLUGIN_DESCR "TEST_C"
#define PLUGIN_SET_TESTING
#define PLUGIN_SET_TESTING_C
#define CONTROLLER_SET_TESTING
#define NOTIFIER_SET_TESTING
#define PLUGIN_BUILD_NORMAL // add stable
#ifdef PLUGIN_BUILD_COLLECTION_C
#define PLUGIN_DESCR "Collection_C"
#define PLUGIN_SET_COLLECTION
#define PLUGIN_SET_COLLECTION_C
#define CONTROLLER_SET_COLLECTION
#define NOTIFIER_SET_COLLECTION
#define PLUGIN_BUILD_NORMAL // add stable
#endif
#ifdef PLUGIN_BUILD_TESTING_D
#define PLUGIN_DESCR "TEST_D"
#define PLUGIN_SET_TESTING
#define PLUGIN_SET_TESTING_D
#define CONTROLLER_SET_TESTING
#define NOTIFIER_SET_TESTING
#define PLUGIN_BUILD_NORMAL // add stable
#ifdef PLUGIN_BUILD_COLLECTION_D
#define PLUGIN_DESCR "Collection_D"
#define PLUGIN_SET_COLLECTION
#define PLUGIN_SET_COLLECTION_D
#define CONTROLLER_SET_COLLECTION
#define NOTIFIER_SET_COLLECTION
#define PLUGIN_BUILD_NORMAL // add stable
#endif
#ifdef PLUGIN_BUILD_TESTING_E
#define PLUGIN_DESCR "TEST_E"
#define PLUGIN_SET_TESTING
#define PLUGIN_SET_TESTING_E
#define CONTROLLER_SET_TESTING
#define NOTIFIER_SET_TESTING
#define PLUGIN_BUILD_NORMAL // add stable
#ifdef PLUGIN_BUILD_COLLECTION_E
#define PLUGIN_DESCR "Collection_E"
#define PLUGIN_SET_COLLECTION
#define PLUGIN_SET_COLLECTION_E
#define CONTROLLER_SET_COLLECTION
#define NOTIFIER_SET_COLLECTION
#define PLUGIN_BUILD_NORMAL // add stable
#endif
#ifndef PLUGIN_BUILD_CUSTOM
#ifndef PLUGIN_BUILD_NORMAL
#define PLUGIN_BUILD_NORMAL // defaults to stable, if not custom
#endif
#ifndef PLUGIN_BUILD_NORMAL
#define PLUGIN_BUILD_NORMAL // defaults to stable, if not custom
#endif
#endif
#ifdef PLUGIN_BUILD_NORMAL
@@ -656,106 +668,156 @@ To create/register a plugin, you have to :
#define USES_P028 // BME280
#endif
#ifdef PLUGIN_SET_TEST_ESP32
#if !defined(PLUGIN_SET_TEST_B_ESP32) && !defined(PLUGIN_SET_TEST_C_ESP32) && !defined(PLUGIN_SET_TEST_D_ESP32) && !defined(PLUGIN_SET_TEST_E_ESP32)
#define PLUGIN_DESCR "TEST_A ESP32"
#define PLUGIN_SET_TESTING_A
#ifdef PLUGIN_SET_COLLECTION_ESP32
#if !defined(PLUGIN_SET_COLLECTION_B_ESP32) && !defined(PLUGIN_SET_COLLECTION_C_ESP32) && !defined(PLUGIN_SET_COLLECTION_D_ESP32) && !defined(PLUGIN_SET_COLLECTION_E_ESP32)
#ifndef PLUGIN_DESCR // COLLECTION_A_ESP32_IRExt also passes here
#define PLUGIN_DESCR "Collection_A ESP32"
#endif
#ifndef ESP32
#define ESP32
#endif
#ifdef ESP8266
#undef ESP8266
#endif
// #define PLUGIN_SET_ONLY_SWITCH
#define PLUGIN_SET_TESTING
#define CONTROLLER_SET_STABLE
#define NOTIFIER_SET_STABLE
#define PLUGIN_SET_STABLE // add stable
// See also PLUGIN_SET_TEST_ESP32 section at end,
// where incompatible plugins will be disabled.
// TODO : Check compatibility of plugins for ESP32 board.
#define PLUGIN_SET_COLLECTION_A
#endif
#ifndef ESP32
#define ESP32
#endif
#ifdef ESP8266
#undef ESP8266
#endif
// Undefine contradictionary defines
#ifdef PLUGIN_SET_NONE
#undef PLUGIN_SET_NONE
#endif
#ifdef PLUGIN_SET_ONLY_SWITCH
#undef PLUGIN_SET_ONLY_SWITCH
#endif
#ifdef PLUGIN_SET_ONLY_TEMP_HUM
#undef PLUGIN_SET_ONLY_TEMP_HUM
#endif
#define PLUGIN_SET_COLLECTION
#define CONTROLLER_SET_STABLE
#define NOTIFIER_SET_STABLE
#define PLUGIN_SET_STABLE // add stable
// See also PLUGIN_SET_COLLECTION_ESP32 section at end,
// where incompatible plugins will be disabled.
// TODO : Check compatibility of plugins for ESP32 board.
#endif
#ifdef PLUGIN_SET_TEST_B_ESP32
#define PLUGIN_DESCR "TEST_B ESP32"
#ifndef ESP32
#define ESP32
#endif
#ifdef ESP8266
#undef ESP8266
#endif
// #define PLUGIN_SET_ONLY_SWITCH
#define PLUGIN_SET_TESTING
#define PLUGIN_SET_TESTING_B
#define CONTROLLER_SET_STABLE
#define NOTIFIER_SET_STABLE
#define PLUGIN_SET_STABLE // add stable
// See also PLUGIN_SET_TEST_ESP32 section at end,
// where incompatible plugins will be disabled.
// TODO : Check compatibility of plugins for ESP32 board.
#ifdef PLUGIN_SET_COLLECTION_B_ESP32
#ifndef PLUGIN_DESCR // COLLECTION_B_ESP32_IRExt also passes here
#define PLUGIN_DESCR "Collection_B ESP32"
#endif
#ifndef ESP32
#define ESP32
#endif
#ifdef ESP8266
#undef ESP8266
#endif
// Undefine contradictionary defines
#ifdef PLUGIN_SET_NONE
#undef PLUGIN_SET_NONE
#endif
#ifdef PLUGIN_SET_ONLY_SWITCH
#undef PLUGIN_SET_ONLY_SWITCH
#endif
#ifdef PLUGIN_SET_ONLY_TEMP_HUM
#undef PLUGIN_SET_ONLY_TEMP_HUM
#endif
#define PLUGIN_SET_COLLECTION
#define PLUGIN_SET_COLLECTION_B
#define CONTROLLER_SET_STABLE
#define NOTIFIER_SET_STABLE
#define PLUGIN_SET_STABLE // add stable
// See also PLUGIN_SET_COLLECTION_ESP32 section at end,
// where incompatible plugins will be disabled.
// TODO : Check compatibility of plugins for ESP32 board.
#endif
#ifdef PLUGIN_SET_TEST_C_ESP32
#define PLUGIN_DESCR "TEST_C ESP32"
#ifndef ESP32
#define ESP32
#endif
#ifdef ESP8266
#undef ESP8266
#endif
// #define PLUGIN_SET_ONLY_SWITCH
#define PLUGIN_SET_TESTING
#define PLUGIN_SET_TESTING_C
#define CONTROLLER_SET_STABLE
#define NOTIFIER_SET_STABLE
#define PLUGIN_SET_STABLE // add stable
// See also PLUGIN_SET_TEST_ESP32 section at end,
// where incompatible plugins will be disabled.
// TODO : Check compatibility of plugins for ESP32 board.
#ifdef PLUGIN_SET_COLLECTION_C_ESP32
#ifndef PLUGIN_DESCR // COLLECTION_C_ESP32_IRExt also passes here
#define PLUGIN_DESCR "Collection_C ESP32"
#endif
#ifndef ESP32
#define ESP32
#endif
#ifdef ESP8266
#undef ESP8266
#endif
// Undefine contradictionary defines
#ifdef PLUGIN_SET_NONE
#undef PLUGIN_SET_NONE
#endif
#ifdef PLUGIN_SET_ONLY_SWITCH
#undef PLUGIN_SET_ONLY_SWITCH
#endif
#ifdef PLUGIN_SET_ONLY_TEMP_HUM
#undef PLUGIN_SET_ONLY_TEMP_HUM
#endif
#define PLUGIN_SET_COLLECTION
#define PLUGIN_SET_COLLECTION_C
#define CONTROLLER_SET_STABLE
#define NOTIFIER_SET_STABLE
#define PLUGIN_SET_STABLE // add stable
// See also PLUGIN_SET_COLLECTION_ESP32 section at end,
// where incompatible plugins will be disabled.
// TODO : Check compatibility of plugins for ESP32 board.
#endif
#ifdef PLUGIN_SET_TEST_D_ESP32
#define PLUGIN_DESCR "TEST_D ESP32"
#ifndef ESP32
#define ESP32
#endif
#ifdef ESP8266
#undef ESP8266
#endif
// #define PLUGIN_SET_ONLY_SWITCH
#define PLUGIN_SET_TESTING
#define PLUGIN_SET_TESTING_D
#define CONTROLLER_SET_STABLE
#define NOTIFIER_SET_STABLE
#define PLUGIN_SET_STABLE // add stable
// See also PLUGIN_SET_TEST_ESP32 section at end,
// where incompatible plugins will be disabled.
// TODO : Check compatibility of plugins for ESP32 board.
#ifdef PLUGIN_SET_COLLECTION_D_ESP32
#ifndef PLUGIN_DESCR // COLLECTION_D_ESP32_IRExt also passes here
#define PLUGIN_DESCR "Collection_D ESP32"
#endif
#ifndef ESP32
#define ESP32
#endif
#ifdef ESP8266
#undef ESP8266
#endif
// Undefine contradictionary defines
#ifdef PLUGIN_SET_NONE
#undef PLUGIN_SET_NONE
#endif
#ifdef PLUGIN_SET_ONLY_SWITCH
#undef PLUGIN_SET_ONLY_SWITCH
#endif
#ifdef PLUGIN_SET_ONLY_TEMP_HUM
#undef PLUGIN_SET_ONLY_TEMP_HUM
#endif
#define PLUGIN_SET_COLLECTION
#define PLUGIN_SET_COLLECTION_D
#define CONTROLLER_SET_STABLE
#define NOTIFIER_SET_STABLE
#define PLUGIN_SET_STABLE // add stable
// See also PLUGIN_SET_COLLECTION_ESP32 section at end,
// where incompatible plugins will be disabled.
// TODO : Check compatibility of plugins for ESP32 board.
#endif
#ifdef PLUGIN_SET_TEST_E_ESP32
#define PLUGIN_DESCR "TEST_E ESP32"
#ifndef ESP32
#define ESP32
#endif
#ifdef ESP8266
#undef ESP8266
#endif
// #define PLUGIN_SET_ONLY_SWITCH
#define PLUGIN_SET_TESTING
#define PLUGIN_SET_TESTING_E
#define CONTROLLER_SET_STABLE
#define NOTIFIER_SET_STABLE
#define PLUGIN_SET_STABLE // add stable
// See also PLUGIN_SET_TEST_ESP32 section at end,
// where incompatible plugins will be disabled.
// TODO : Check compatibility of plugins for ESP32 board.
#ifdef PLUGIN_SET_COLLECTION_E_ESP32
#ifndef PLUGIN_DESCR // COLLECTION_E_ESP32_IRExt also passes here
#define PLUGIN_DESCR "Collection_E ESP32"
#endif
#ifndef ESP32
#define ESP32
#endif
#ifdef ESP8266
#undef ESP8266
#endif
// Undefine contradictionary defines
#ifdef PLUGIN_SET_NONE
#undef PLUGIN_SET_NONE
#endif
#ifdef PLUGIN_SET_ONLY_SWITCH
#undef PLUGIN_SET_ONLY_SWITCH
#endif
#ifdef PLUGIN_SET_ONLY_TEMP_HUM
#undef PLUGIN_SET_ONLY_TEMP_HUM
#endif
#define PLUGIN_SET_COLLECTION
#define PLUGIN_SET_COLLECTION_E
#define CONTROLLER_SET_STABLE
#define NOTIFIER_SET_STABLE
#define PLUGIN_SET_STABLE // add stable
// See also PLUGIN_SET_COLLECTION_ESP32 section at end,
// where incompatible plugins will be disabled.
// TODO : Check compatibility of plugins for ESP32 board.
#endif
#ifdef PLUGIN_BUILD_MAX_ESP32
@@ -789,7 +851,7 @@ To create/register a plugin, you have to :
#endif
// See also PLUGIN_SET_MAX section at end, to include any disabled plugins from other definitions
// See also PLUGIN_SET_TEST_ESP32 section at end,
// See also PLUGIN_SET_COLLECTION_ESP32 section at end,
// where incompatible plugins will be disabled.
// TODO : Check compatibility of plugins for ESP32 board.
#endif
@@ -805,7 +867,7 @@ To create/register a plugin, you have to :
#ifdef PLUGIN_SET_VENTUS_W266
#define PLUGIN_SET_ONLY_SWITCH
#define PLUGIN_BUILD_DISABLED
#define USES_P046 // TESTING Hardware P046_VentusW266.ino
#define USES_P046 // Hardware P046_VentusW266.ino
#endif
@@ -881,136 +943,126 @@ To create/register a plugin, you have to :
#endif
/******************************************************************************\
* Main Families **************************************************************
\******************************************************************************/
// NONE #####################################
#ifdef PLUGIN_SET_NONE
#ifdef PLUGIN_SET_STABLE
#undef PLUGIN_SET_STABLE
#endif
#ifdef PLUGIN_SET_TESTING
#undef PLUGIN_SET_TESTING
#endif
#ifdef PLUGIN_SET_TESTING_A
#undef PLUGIN_SET_TESTING_A
#endif
#ifdef PLUGIN_SET_TESTING_B
#undef PLUGIN_SET_TESTING_B
#endif
#ifdef PLUGIN_SET_TESTING_C
#undef PLUGIN_SET_TESTING_C
#endif
#ifdef PLUGIN_SET_TESTING_D
#undef PLUGIN_SET_TESTING_D
#endif
#ifdef PLUGIN_SET_TESTING_E
#undef PLUGIN_SET_TESTING_E
#endif
#ifdef PLUGIN_SET_EXPERIMENTAL
#undef PLUGIN_SET_EXPERIMENTAL
#endif
#ifdef PLUGIN_SET_STABLE
#undef PLUGIN_SET_STABLE
#endif
#ifdef PLUGIN_SET_COLLECTION
#undef PLUGIN_SET_COLLECTION
#endif
#ifdef PLUGIN_SET_COLLECTION_A
#undef PLUGIN_SET_COLLECTION_A
#endif
#ifdef PLUGIN_SET_COLLECTION_B
#undef PLUGIN_SET_COLLECTION_B
#endif
#ifdef PLUGIN_SET_COLLECTION_C
#undef PLUGIN_SET_COLLECTION_C
#endif
#ifdef PLUGIN_SET_COLLECTION_D
#undef PLUGIN_SET_COLLECTION_D
#endif
#ifdef PLUGIN_SET_COLLECTION_E
#undef PLUGIN_SET_COLLECTION_E
#endif
#ifdef PLUGIN_SET_EXPERIMENTAL
#undef PLUGIN_SET_EXPERIMENTAL
#endif
#endif
#ifdef CONTROLLER_SET_NONE
#ifdef CONTROLLER_SET_STABLE
#undef CONTROLLER_SET_STABLE
#endif
#ifdef CONTROLLER_SET_TESTING
#undef CONTROLLER_SET_TESTING
#endif
#ifdef CONTROLLER_SET_EXPERIMENTAL
#undef CONTROLLER_SET_EXPERIMENTAL
#endif
#ifdef CONTROLLER_SET_STABLE
#undef CONTROLLER_SET_STABLE
#endif
#ifdef CONTROLLER_SET_COLLECTION
#undef CONTROLLER_SET_COLLECTION
#endif
#ifdef CONTROLLER_SET_EXPERIMENTAL
#undef CONTROLLER_SET_EXPERIMENTAL
#endif
#endif
#ifdef NOTIFIER_SET_NONE
#ifdef NOTIFIER_SET_STABLE
#undef NOTIFIER_SET_STABLE
#endif
#ifdef NOTIFIER_SET_TESTING
#undef NOTIFIER_SET_TESTING
#endif
#ifdef NOTIFIER_SET_EXPERIMENTAL
#undef NOTIFIER_SET_EXPERIMENTAL
#endif
#ifdef NOTIFIER_SET_STABLE
#undef NOTIFIER_SET_STABLE
#endif
#ifdef NOTIFIER_SET_COLLECTION
#undef NOTIFIER_SET_COLLECTION
#endif
#ifdef NOTIFIER_SET_EXPERIMENTAL
#undef NOTIFIER_SET_EXPERIMENTAL
#endif
#endif
// ALL ###########################################
#ifdef PLUGIN_SET_ALL
#ifndef PLUGIN_SET_STABLE
#define PLUGIN_SET_STABLE
#endif
#ifndef PLUGIN_SET_TESTING
#define PLUGIN_SET_TESTING
#endif
// #ifndef PLUGIN_SET_TESTING_A
// #define PLUGIN_SET_TESTING_A
// #endif
#ifndef PLUGIN_SET_EXPERIMENTAL
#define PLUGIN_SET_EXPERIMENTAL
#endif
#ifndef PLUGIN_SET_STABLE
#define PLUGIN_SET_STABLE
#endif
#ifndef PLUGIN_SET_COLLECTION
#define PLUGIN_SET_COLLECTION
#endif
#ifndef PLUGIN_SET_EXPERIMENTAL
#define PLUGIN_SET_EXPERIMENTAL
#endif
#endif
#ifdef CONTROLLER_SET_ALL
#ifndef CONTROLLER_SET_STABLE
#define CONTROLLER_SET_STABLE
#endif
#ifndef CONTROLLER_SET_TESTING
#define CONTROLLER_SET_TESTING
#endif
#ifndef CONTROLLER_SET_EXPERIMENTAL
#define CONTROLLER_SET_EXPERIMENTAL
#endif
#ifndef CONTROLLER_SET_STABLE
#define CONTROLLER_SET_STABLE
#endif
#ifndef CONTROLLER_SET_COLLECTION
#define CONTROLLER_SET_COLLECTION
#endif
#ifndef CONTROLLER_SET_EXPERIMENTAL
#define CONTROLLER_SET_EXPERIMENTAL
#endif
#endif
#ifdef NOTIFIER_SET_ALL
#ifndef NOTIFIER_SET_STABLE
#define NOTIFIER_SET_STABLE
#endif
#ifndef NOTIFIER_SET_TESTING
#define NOTIFIER_SET_TESTING
#endif
#ifndef NOTIFIER_SET_EXPERIMENTAL
#define NOTIFIER_SET_EXPERIMENTAL
#endif
#ifndef NOTIFIER_SET_STABLE
#define NOTIFIER_SET_STABLE
#endif
#ifndef NOTIFIER_SET_COLLECTION
#define NOTIFIER_SET_COLLECTION
#endif
#ifndef NOTIFIER_SET_EXPERIMENTAL
#define NOTIFIER_SET_EXPERIMENTAL
#endif
#endif
// MAX ###########################################
#ifdef PLUGIN_SET_MAX
#ifndef PLUGIN_SET_STABLE
#define PLUGIN_SET_STABLE
#endif
#ifndef PLUGIN_SET_TESTING
#define PLUGIN_SET_TESTING
#endif
#ifndef PLUGIN_SET_TESTING_A
#define PLUGIN_SET_TESTING_A
#endif
#ifndef PLUGIN_SET_TESTING_B
#define PLUGIN_SET_TESTING_B
#endif
#ifndef PLUGIN_SET_TESTING_C
#define PLUGIN_SET_TESTING_C
#endif
#ifndef PLUGIN_SET_TESTING_D
#define PLUGIN_SET_TESTING_D
#endif
#ifndef PLUGIN_SET_TESTING_E
#define PLUGIN_SET_TESTING_E
#endif
// #ifndef PLUGIN_SET_EXPERIMENTAL
// #define PLUGIN_SET_EXPERIMENTAL
// #endif
#ifndef PLUGIN_SET_STABLE
#define PLUGIN_SET_STABLE
#endif
#ifndef PLUGIN_SET_COLLECTION
#define PLUGIN_SET_COLLECTION
#endif
#ifndef PLUGIN_SET_COLLECTION_A
#define PLUGIN_SET_COLLECTION_A
#endif
#ifndef PLUGIN_SET_COLLECTION_B
#define PLUGIN_SET_COLLECTION_B
#endif
#ifndef PLUGIN_SET_COLLECTION_C
#define PLUGIN_SET_COLLECTION_C
#endif
#ifndef PLUGIN_SET_COLLECTION_D
#define PLUGIN_SET_COLLECTION_D
#endif
#ifndef PLUGIN_SET_COLLECTION_E
#define PLUGIN_SET_COLLECTION_E
#endif
#endif
@@ -1082,7 +1134,7 @@ To create/register a plugin, you have to :
#define USES_P059 // Encoder
#define USES_P063 // TTP229_KeyPad
#define USES_P073 // 7DG
#define USES_P073 // 7DGT
#define USES_P079 // Wemos Motoshield
#endif
@@ -1111,7 +1163,7 @@ To create/register a plugin, you have to :
#endif
#endif
#if defined(PLUGIN_SET_TESTING) || defined(PLUGIN_SET_TESTING_A) || defined(PLUGIN_SET_TESTING_B) || defined(PLUGIN_SET_TESTING_C) || defined(PLUGIN_SET_TESTING_D) || defined(PLUGIN_SET_TESTING_E)
#if defined(PLUGIN_SET_COLLECTION) || defined(PLUGIN_SET_COLLECTION_A) || defined(PLUGIN_SET_COLLECTION_B) || defined(PLUGIN_SET_COLLECTION_C) || defined(PLUGIN_SET_COLLECTION_D) || defined(PLUGIN_SET_COLLECTION_E)
#if !defined(PLUGIN_SET_MAX) && !defined(ESP32)
#ifndef LIMIT_BUILD_SIZE
#define LIMIT_BUILD_SIZE
@@ -1122,8 +1174,8 @@ To create/register a plugin, you have to :
#endif
#endif
// TESTING #####################################
#ifdef PLUGIN_SET_TESTING
// COLLECTIONS #####################################
#ifdef PLUGIN_SET_COLLECTION
#define USES_P045 // MPU6050
#define USES_P047 // I2C_soil_misture
#define USES_P048 // Motoshield_v2
@@ -1153,7 +1205,7 @@ To create/register a plugin, you have to :
#define USES_P089 // Ping
#endif
#ifdef PLUGIN_SET_TESTING_A
#ifdef PLUGIN_SET_COLLECTION_A
#define USES_P067 // HX711_Load_Cell
#define USES_P068 // SHT3x
@@ -1178,7 +1230,7 @@ To create/register a plugin, you have to :
#define USES_P105 // AHT10/20/21
#endif
#ifdef PLUGIN_SET_TESTING_B
#ifdef PLUGIN_SET_COLLECTION_B
#define USES_P069 // LM75A
#define USES_P100 // Pulse Counter - DS2423
@@ -1193,7 +1245,7 @@ To create/register a plugin, you have to :
#define USES_P113 // VL53L1X ToF
#endif
#ifdef PLUGIN_SET_TESTING_C
#ifdef PLUGIN_SET_COLLECTION_C
#define USES_P085 // AcuDC24x
#define USES_P087 // Serial Proxy
@@ -1203,7 +1255,7 @@ To create/register a plugin, you have to :
#define USES_P111 // RC522 RFID reader
#endif
#ifdef PLUGIN_SET_TESTING_D
#ifdef PLUGIN_SET_COLLECTION_D
#define USES_P093 // Mitsubishi Heat Pump
#define USES_P094 // CUL Reader
#ifndef USES_P098
@@ -1221,7 +1273,7 @@ To create/register a plugin, you have to :
#define USES_P127 // CDM7160
#endif
#ifdef PLUGIN_SET_TESTING_E
#ifdef PLUGIN_SET_COLLECTION_E
#define USES_P119 // ITG3205 Gyro
#define USES_P120 // ADXL345 I2C
#define USES_P121 // HMC5883L
@@ -1233,6 +1285,9 @@ To create/register a plugin, you have to :
// Collection of all energy related plugins.
#ifdef PLUGIN_ENERGY_COLLECTION
#ifndef PLUGIN_DESCR
#define PLUGIN_DESCR "Energy"
#endif
#ifndef USES_P025
#define USES_P025 // ADS1115
#endif
@@ -1271,6 +1326,9 @@ To create/register a plugin, you have to :
// Collection of all display plugins. (also NeoPixel)
#ifdef PLUGIN_DISPLAY_COLLECTION
#ifndef PLUGIN_DESCR
#define PLUGIN_DESCR "Display"
#endif
#if !defined(LIMIT_BUILD_SIZE) && (defined(ESP8266) || !(ESP_IDF_VERSION_MAJOR > 3))
#define LIMIT_BUILD_SIZE // Reduce buildsize (on ESP8266 / pre-IDF4.x) to fit in all Display plugins
#endif
@@ -1326,6 +1384,9 @@ To create/register a plugin, you have to :
// Collection of all NeoPixel plugins
#ifdef PLUGIN_NEOPIXEL_COLLECTION
#ifndef PLUGIN_DESCR
#define PLUGIN_DESCR "NeoPixel"
#endif
#ifndef USES_P038
#define USES_P038 // NeoPixel
#endif
@@ -1351,7 +1412,7 @@ To create/register a plugin, you have to :
#endif
#endif
#ifdef CONTROLLER_SET_TESTING
#ifdef CONTROLLER_SET_COLLECTION
#define USES_C011 // Generic HTTP Advanced
#define USES_C012 // Blynk HTTP
#define USES_C014 // homie 3 & 4dev MQTT
@@ -1361,7 +1422,8 @@ To create/register a plugin, you have to :
#endif
#ifdef NOTIFIER_SET_TESTING
#ifdef NOTIFIER_SET_COLLECTION
// To be defined
#endif
@@ -1452,7 +1514,7 @@ To create/register a plugin, you have to :
// Maximized build definition for an ESP(32) with 16MB Flash and 4MB sketch partition
// Add all plugins, controllers and features that don't fit in the TESTING set
// Add all plugins, controllers and features that don't fit in the COLLECTION set
#ifdef PLUGIN_SET_MAX
// Features
#ifndef USE_SERVO
@@ -1775,7 +1837,7 @@ To create/register a plugin, you have to :
#ifdef USES_BLYNK
#undef USES_BLYNK
#endif
#if !defined(PLUGIN_SET_TESTING) && !defined(PLUGIN_SET_SONOFF_POW)
#if !defined(PLUGIN_SET_COLLECTION) && !defined(PLUGIN_SET_SONOFF_POW)
#ifdef USES_P076
#undef USES_P076 // HWL8012 in POW r1
#endif
@@ -1918,8 +1980,8 @@ To create/register a plugin, you have to :
#endif
#endif
// Here we can re-enable specific features in the TESTING sets as we have created some space there by splitting them up
#if defined(TESTING_USE_RTTTL) && (defined(PLUGIN_SET_TESTING_A) || defined(PLUGIN_SET_TESTING_B) || defined(PLUGIN_SET_TESTING_C) || defined(PLUGIN_SET_TESTING_D) || defined(PLUGIN_SET_TESTING_E))
// Here we can re-enable specific features in the COLLECTION sets as we have created some space there by splitting them up
#if defined(COLLECTION_USE_RTTTL) && (defined(PLUGIN_SET_COLLECTION_A) || defined(PLUGIN_SET_COLLECTION_B) || defined(PLUGIN_SET_COLLECTION_C) || defined(PLUGIN_SET_COLLECTION_D) || defined(PLUGIN_SET_COLLECTION_E))
#ifndef USE_RTTTL
#define USE_RTTTL
#endif
@@ -1927,7 +1989,7 @@ To create/register a plugin, you have to :
// By default we enable the SHOW_SYSINFO_JSON when we enable the WEBSERVER_NEW_UI
#ifdef WEBSERVER_NEW_UI
#define SHOW_SYSINFO_JSON
#define SHOW_SYSINFO_JSON
#endif
#endif // CUSTOMBUILD_DEFINE_PLUGIN_SETS_H
src/src/DataStructs/LogStruct.h
+1 -1
View File
@@ -16,7 +16,7 @@
#ifdef USE_SECOND_HEAP
#define LOG_STRUCT_MESSAGE_LINES 60
#else
#if defined(PLUGIN_BUILD_TESTING) || defined(PLUGIN_BUILD_DEV)
#if defined(PLUGIN_BUILD_COLLECTION) || defined(PLUGIN_BUILD_DEV)
#define LOG_STRUCT_MESSAGE_LINES 10
#else
#define LOG_STRUCT_MESSAGE_LINES 15
src/src/Helpers/StringGenerator_System.cpp
+3 -3
View File
@@ -174,9 +174,9 @@ String getPluginDescriptionString() {
#ifdef PLUGIN_BUILD_NORMAL
result += F(" [Normal]");
#endif // ifdef PLUGIN_BUILD_NORMAL
#ifdef PLUGIN_BUILD_TESTING
result += F(" [Testing]");
#endif // ifdef PLUGIN_BUILD_TESTING
#ifdef PLUGIN_BUILD_COLLECTION
result += F(" [Collection]");
#endif // ifdef PLUGIN_BUILD_COLLECTION
#ifdef PLUGIN_BUILD_DEV
result += F(" [Development]");
#endif // ifdef PLUGIN_BUILD_DEV
src/src/PluginStructs/P073_data_struct.h
+3 -3
View File
@@ -27,15 +27,15 @@
# define P073_SCROLL_TEXT // Enable scrolling of 7dtext by default
# define P073_7DBIN_COMMAND // Enable input of binary data via 7dbin,uint8_t,... command
# ifndef PLUGIN_SET_TESTING
# ifndef PLUGIN_SET_COLLECTION
// # define P073_DEBUG // Leave out some debugging on demand, activates extra log info in the debug
# else // ifndef PLUGIN_SET_TESTING
# else // ifndef PLUGIN_SET_COLLECTION
# undef P073_7DDT_COMMAND // Optionally activate if .bin file space is really problematic, to remove the 7ddt command
# undef P073_EXTRA_FONTS // Optionally activate if .bin file space is really problematic, to remove the font selection and 7dfont command
# undef P073_SCROLL_TEXT // Optionally activate if .bin file space is really problematic, to remove the scrolling text feature
# undef P073_7DBIN_COMMAND // Optionally activate if .bin file space is really problematic, to remove the 7dbin command
# endif // ifndef PLUGIN_SET_TESTING
# endif // ifndef PLUGIN_SET_COLLECTION
# define TM1637_POWER_ON B10001000
# define TM1637_POWER_OFF B10000000