From 8d03105cafdf094bfc65e3fdc1d4d5f9c2c1cc24 Mon Sep 17 00:00:00 2001 From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com> Date: Sat, 4 Jan 2025 22:54:08 +0100 Subject: [PATCH] Reorg tests --- .test/common.yaml | 5 ++++ .test/common_ard.yaml | 8 +++++++ .test/common_idf.yaml | 34 +++++++++++++++++++++++++++ .test/common_idf53.yaml | 10 ++++++++ .test/esphome_ard_basic.yaml | 9 +------ .test/esphome_ard_ble_proxy.yaml | 9 +------ .test/esphome_ard_core.yaml | 9 +------ .test/esphome_ard_hw_relays.yaml | 9 +------ .test/esphome_ard_hw_speaker.yaml | 9 +------ .test/esphome_ard_hw_vibration.yaml | 9 +------ .test/esphome_ard_media_player.yaml | 9 +------ .test/esphome_idf53_basic.yaml | 11 +-------- .test/esphome_idf53_ble_proxy.yaml | 11 +-------- .test/esphome_idf53_core.yaml | 11 +-------- .test/esphome_idf53_hw_relays.yaml | 11 +-------- .test/esphome_idf53_hw_speaker.yaml | 11 +-------- .test/esphome_idf53_hw_vibration.yaml | 11 +-------- .test/esphome_idf_basic.yaml | 9 +------ .test/esphome_idf_ble_proxy.yaml | 9 +------ .test/esphome_idf_core.yaml | 9 +------ .test/esphome_idf_hw_relays.yaml | 9 +------ .test/esphome_idf_hw_speaker.yaml | 9 +------ .test/esphome_idf_hw_vibration.yaml | 9 +------ 23 files changed, 76 insertions(+), 164 deletions(-) create mode 100644 .test/common.yaml create mode 100644 .test/common_ard.yaml create mode 100644 .test/common_idf.yaml create mode 100644 .test/common_idf53.yaml diff --git a/.test/common.yaml b/.test/common.yaml new file mode 100644 index 0000000..ef08688 --- /dev/null +++ b/.test/common.yaml @@ -0,0 +1,5 @@ +--- +wifi: + ssid: !secret wifi_ssid + password: !secret wifi_password +... diff --git a/.test/common_ard.yaml b/.test/common_ard.yaml new file mode 100644 index 0000000..fbd0402 --- /dev/null +++ b/.test/common_ard.yaml @@ -0,0 +1,8 @@ +--- +packages: + common: !include common.yaml + +esp32: + framework: + type: arduino +... diff --git a/.test/common_idf.yaml b/.test/common_idf.yaml new file mode 100644 index 0000000..9616d0d --- /dev/null +++ b/.test/common_idf.yaml @@ -0,0 +1,34 @@ +--- +packages: + common: !include common.yaml + +esp32: + framework: + type: esp-idf + sdkconfig_options: + CONFIG_BT_ALLOCATION_FROM_SPIRAM_FIRST: "y" + CONFIG_BT_BLE_DYNAMIC_ENV_MEMORY: "y" + CONFIG_ESP32_REV_MIN_3: "y" + CONFIG_MBEDTLS_DYNAMIC_BUFFER: "y" + CONFIG_MBEDTLS_DYNAMIC_FREE_CA_CERT: "y" + CONFIG_MBEDTLS_DYNAMIC_FREE_CONFIG_DATA: "y" + CONFIG_MBEDTLS_EXTERNAL_MEM_ALLOC: "y" + CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY: "y" + CONFIG_SPIRAM_RODATA: "y" + CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP: "y" + +i2s_audio: !remove + +light: + - id: !extend light_full + platform: esp32_rmt_led_strip + rgb_order: GRB + rmt_channel: 1 + chipset: ws2812 + max_refresh_rate: 33ms + use_psram: false + type: !remove + variant: !remove + +media_player: !remove +... diff --git a/.test/common_idf53.yaml b/.test/common_idf53.yaml new file mode 100644 index 0000000..f2b9b5d --- /dev/null +++ b/.test/common_idf53.yaml @@ -0,0 +1,10 @@ +--- +packages: + common_idf: !include common_idf.yaml + +esp32: + framework: + type: esp-idf + version: 5.3.1 + platform_version: 6.9.0 +... diff --git a/.test/esphome_ard_basic.yaml b/.test/esphome_ard_basic.yaml index 20554a4..505acee 100644 --- a/.test/esphome_ard_basic.yaml +++ b/.test/esphome_ard_basic.yaml @@ -1,13 +1,6 @@ --- packages: + common_arduino: !include common_ard.yaml core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml standard_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard.yaml - -esp32: - framework: - type: arduino - -wifi: - ssid: !secret wifi_ssid - password: !secret wifi_password ... diff --git a/.test/esphome_ard_ble_proxy.yaml b/.test/esphome_ard_ble_proxy.yaml index 86cc07c..097e273 100644 --- a/.test/esphome_ard_ble_proxy.yaml +++ b/.test/esphome_ard_ble_proxy.yaml @@ -1,14 +1,7 @@ --- packages: + common_arduino: !include common_ard.yaml core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml standard_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard.yaml addon_bluetooth_proxy: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_addon_ble_proxy.yaml - -esp32: - framework: - type: arduino - -wifi: - ssid: !secret wifi_ssid - password: !secret wifi_password ... diff --git a/.test/esphome_ard_core.yaml b/.test/esphome_ard_core.yaml index 1b50c90..6b9bdba 100644 --- a/.test/esphome_ard_core.yaml +++ b/.test/esphome_ard_core.yaml @@ -1,12 +1,5 @@ --- packages: + common_arduino: !include common_ard.yaml core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml - -esp32: - framework: - type: arduino - -wifi: - ssid: !secret wifi_ssid - password: !secret wifi_password ... diff --git a/.test/esphome_ard_hw_relays.yaml b/.test/esphome_ard_hw_relays.yaml index 704ac7d..b12f6fe 100644 --- a/.test/esphome_ard_hw_relays.yaml +++ b/.test/esphome_ard_hw_relays.yaml @@ -1,13 +1,6 @@ --- packages: + common_arduino: !include common_ard.yaml core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml standard_hw_relays_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_relays.yaml - -esp32: - framework: - type: arduino - -wifi: - ssid: !secret wifi_ssid - password: !secret wifi_password ... diff --git a/.test/esphome_ard_hw_speaker.yaml b/.test/esphome_ard_hw_speaker.yaml index 62272ca..e054db8 100644 --- a/.test/esphome_ard_hw_speaker.yaml +++ b/.test/esphome_ard_hw_speaker.yaml @@ -1,13 +1,6 @@ --- packages: + common_arduino: !include common_ard.yaml core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml standard_hw_speaker_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_speaker.yaml - -esp32: - framework: - type: arduino - -wifi: - ssid: !secret wifi_ssid - password: !secret wifi_password ... diff --git a/.test/esphome_ard_hw_vibration.yaml b/.test/esphome_ard_hw_vibration.yaml index 5dbacea..b0f06f6 100644 --- a/.test/esphome_ard_hw_vibration.yaml +++ b/.test/esphome_ard_hw_vibration.yaml @@ -1,13 +1,6 @@ --- packages: + common_arduino: !include common_ard.yaml core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml standard_hw_vibration_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_vibration.yaml - -esp32: - framework: - type: arduino - -wifi: - ssid: !secret wifi_ssid - password: !secret wifi_password ... diff --git a/.test/esphome_ard_media_player.yaml b/.test/esphome_ard_media_player.yaml index 9a9f744..f12a529 100644 --- a/.test/esphome_ard_media_player.yaml +++ b/.test/esphome_ard_media_player.yaml @@ -1,15 +1,8 @@ --- packages: + common_arduino: !include common_ard.yaml core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml standard_hw_relays_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_relays.yaml standard_hw_vibration_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_vibration.yaml addon_media_player: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_addon_media_player.yaml - -esp32: - framework: - type: arduino - -wifi: - ssid: !secret wifi_ssid - password: !secret wifi_password ... diff --git a/.test/esphome_idf53_basic.yaml b/.test/esphome_idf53_basic.yaml index 1dabf1f..c420d7f 100644 --- a/.test/esphome_idf53_basic.yaml +++ b/.test/esphome_idf53_basic.yaml @@ -1,15 +1,6 @@ --- packages: + common_idf53: !include common_idf53.yaml core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml standard_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard.yaml - -esp32: - framework: - type: esp-idf - version: 5.3.1 - platform_version: 6.9.0 - -wifi: - ssid: !secret wifi_ssid - password: !secret wifi_password ... diff --git a/.test/esphome_idf53_ble_proxy.yaml b/.test/esphome_idf53_ble_proxy.yaml index b17b6d2..9280dd2 100644 --- a/.test/esphome_idf53_ble_proxy.yaml +++ b/.test/esphome_idf53_ble_proxy.yaml @@ -1,16 +1,7 @@ --- packages: + common_idf53: !include common_idf53.yaml core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml standard_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard.yaml addon_bluetooth_proxy: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_addon_ble_proxy.yaml - -esp32: - framework: - type: esp-idf - version: 5.3.1 - platform_version: 6.9.0 - -wifi: - ssid: !secret wifi_ssid - password: !secret wifi_password ... diff --git a/.test/esphome_idf53_core.yaml b/.test/esphome_idf53_core.yaml index 18239c7..82b38fc 100644 --- a/.test/esphome_idf53_core.yaml +++ b/.test/esphome_idf53_core.yaml @@ -1,14 +1,5 @@ --- packages: + common_idf53: !include common_idf53.yaml core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml - -esp32: - framework: - type: esp-idf - version: 5.3.1 - platform_version: 6.9.0 - -wifi: - ssid: !secret wifi_ssid - password: !secret wifi_password ... diff --git a/.test/esphome_idf53_hw_relays.yaml b/.test/esphome_idf53_hw_relays.yaml index d9f5bd0..628bb79 100644 --- a/.test/esphome_idf53_hw_relays.yaml +++ b/.test/esphome_idf53_hw_relays.yaml @@ -1,15 +1,6 @@ --- packages: + common_idf53: !include common_idf53.yaml core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml standard_hw_relays_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_relays.yaml - -esp32: - framework: - type: esp-idf - version: 5.3.1 - platform_version: 6.9.0 - -wifi: - ssid: !secret wifi_ssid - password: !secret wifi_password ... diff --git a/.test/esphome_idf53_hw_speaker.yaml b/.test/esphome_idf53_hw_speaker.yaml index 651ac37..4b4581f 100644 --- a/.test/esphome_idf53_hw_speaker.yaml +++ b/.test/esphome_idf53_hw_speaker.yaml @@ -1,15 +1,6 @@ --- packages: + common_idf53: !include common_idf53.yaml core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml standard_hw_speaker_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_speaker.yaml - -esp32: - framework: - type: esp-idf - version: 5.3.1 - platform_version: 6.9.0 - -wifi: - ssid: !secret wifi_ssid - password: !secret wifi_password ... diff --git a/.test/esphome_idf53_hw_vibration.yaml b/.test/esphome_idf53_hw_vibration.yaml index d0a5ed3..1bc90ad 100644 --- a/.test/esphome_idf53_hw_vibration.yaml +++ b/.test/esphome_idf53_hw_vibration.yaml @@ -1,15 +1,6 @@ --- packages: + common_idf53: !include common_idf53.yaml core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml standard_hw_vibration_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_vibration.yaml - -esp32: - framework: - type: esp-idf - version: 5.3.1 - platform_version: 6.9.0 - -wifi: - ssid: !secret wifi_ssid - password: !secret wifi_password ... diff --git a/.test/esphome_idf_basic.yaml b/.test/esphome_idf_basic.yaml index ab3d202..d4d0357 100644 --- a/.test/esphome_idf_basic.yaml +++ b/.test/esphome_idf_basic.yaml @@ -1,13 +1,6 @@ --- packages: + common_idf: !include common_idf.yaml core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml standard_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard.yaml - -esp32: - framework: - type: esp-idf - -wifi: - ssid: !secret wifi_ssid - password: !secret wifi_password ... diff --git a/.test/esphome_idf_ble_proxy.yaml b/.test/esphome_idf_ble_proxy.yaml index c972d0f..a72bcdb 100644 --- a/.test/esphome_idf_ble_proxy.yaml +++ b/.test/esphome_idf_ble_proxy.yaml @@ -1,14 +1,7 @@ --- packages: + common_idf: !include common_idf.yaml core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml standard_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard.yaml addon_bluetooth_proxy: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_addon_ble_proxy.yaml - -esp32: - framework: - type: esp-idf - -wifi: - ssid: !secret wifi_ssid - password: !secret wifi_password ... diff --git a/.test/esphome_idf_core.yaml b/.test/esphome_idf_core.yaml index 846889a..6cb4742 100644 --- a/.test/esphome_idf_core.yaml +++ b/.test/esphome_idf_core.yaml @@ -1,12 +1,5 @@ --- packages: + common_idf: !include common_idf.yaml core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml - -esp32: - framework: - type: esp-idf - -wifi: - ssid: !secret wifi_ssid - password: !secret wifi_password ... diff --git a/.test/esphome_idf_hw_relays.yaml b/.test/esphome_idf_hw_relays.yaml index d78b1b4..b746d8a 100644 --- a/.test/esphome_idf_hw_relays.yaml +++ b/.test/esphome_idf_hw_relays.yaml @@ -1,13 +1,6 @@ --- packages: + common_idf: !include common_idf.yaml core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml standard_hw_relays_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_relays.yaml - -esp32: - framework: - type: esp-idf - -wifi: - ssid: !secret wifi_ssid - password: !secret wifi_password ... diff --git a/.test/esphome_idf_hw_speaker.yaml b/.test/esphome_idf_hw_speaker.yaml index 8bcf3ff..2ce797a 100644 --- a/.test/esphome_idf_hw_speaker.yaml +++ b/.test/esphome_idf_hw_speaker.yaml @@ -1,13 +1,6 @@ --- packages: + common_idf: !include common_idf.yaml core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml standard_hw_speaker_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_speaker.yaml - -esp32: - framework: - type: esp-idf - -wifi: - ssid: !secret wifi_ssid - password: !secret wifi_password ... diff --git a/.test/esphome_idf_hw_vibration.yaml b/.test/esphome_idf_hw_vibration.yaml index 8ac9039..30d7358 100644 --- a/.test/esphome_idf_hw_vibration.yaml +++ b/.test/esphome_idf_hw_vibration.yaml @@ -1,13 +1,6 @@ --- packages: + common_idf: !include common_idf.yaml core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml standard_hw_vibration_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_vibration.yaml - -esp32: - framework: - type: esp-idf - -wifi: - ssid: !secret wifi_ssid - password: !secret wifi_password ...