From 032e8cf194d04384337b865afd387ef210312d31 Mon Sep 17 00:00:00 2001 From: John H3ss Date: Wed, 19 Feb 2025 12:06:43 -0700 Subject: [PATCH 1/6] Removing a configuration for the LED to make it compatible with ESPHome 2025.2.0+ --- Integrations/ESPHome/MSR-2.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/Integrations/ESPHome/MSR-2.yaml b/Integrations/ESPHome/MSR-2.yaml index 5930841..9268306 100644 --- a/Integrations/ESPHome/MSR-2.yaml +++ b/Integrations/ESPHome/MSR-2.yaml @@ -498,7 +498,6 @@ light: id: rgb_light name: "RGB Light" pin: GPIO3 - rmt_channel: 0 default_transition_length: 0s chipset: WS2812 num_leds: 3 From f7e404e198ebb3263e37908c56fb1c5e12759268 Mon Sep 17 00:00:00 2001 From: John H3ss Date: Wed, 19 Feb 2025 12:07:12 -0700 Subject: [PATCH 2/6] Updating required ESPHome version --- Integrations/ESPHome/MSR-2.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Integrations/ESPHome/MSR-2.yaml b/Integrations/ESPHome/MSR-2.yaml index 9268306..f083f5f 100644 --- a/Integrations/ESPHome/MSR-2.yaml +++ b/Integrations/ESPHome/MSR-2.yaml @@ -29,7 +29,7 @@ esphome: name: "ApolloAutomation.MSR-2" version: "${version}" - min_version: 2024.6.0 + min_version: 2025.2.0 # Define Board esp32: From cfdf37bb1a233ce3476c7baef75d6dfd74a3544a Mon Sep 17 00:00:00 2001 From: John H3ss Date: Wed, 19 Feb 2025 12:12:26 -0700 Subject: [PATCH 3/6] Bumping version --- Integrations/ESPHome/MSR-2.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Integrations/ESPHome/MSR-2.yaml b/Integrations/ESPHome/MSR-2.yaml index f083f5f..dd95fd0 100644 --- a/Integrations/ESPHome/MSR-2.yaml +++ b/Integrations/ESPHome/MSR-2.yaml @@ -1,7 +1,7 @@ #Define Project substitutions: name: apollo-msr-2 - version: "24.7.15.1" + version: "25.2.19.1" device_description: ${name} made by Apollo Automation - version ${version}. esphome: From 12fab8265f02e880f209641fbd1e76651f11f19e Mon Sep 17 00:00:00 2001 From: John H3ss Date: Wed, 19 Feb 2025 12:14:35 -0700 Subject: [PATCH 4/6] Bumping min_version for remaining yaml files --- Integrations/ESPHome/MSR-2_BLE.yaml | 4 ++-- Integrations/ESPHome/MSR-2_Factory.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Integrations/ESPHome/MSR-2_BLE.yaml b/Integrations/ESPHome/MSR-2_BLE.yaml index d266a57..e665e6a 100644 --- a/Integrations/ESPHome/MSR-2_BLE.yaml +++ b/Integrations/ESPHome/MSR-2_BLE.yaml @@ -23,7 +23,7 @@ esphome: name: "ApolloAutomation.MSR-2" version: "${version}" - min_version: 2024.6.4 + min_version: 2025.2.0 dashboard_import: @@ -47,4 +47,4 @@ packages: ref: main files: - Integrations/ESPHome/Core.yaml - refresh: 0d \ No newline at end of file + refresh: 0d diff --git a/Integrations/ESPHome/MSR-2_Factory.yaml b/Integrations/ESPHome/MSR-2_Factory.yaml index 1e24b47..5111663 100644 --- a/Integrations/ESPHome/MSR-2_Factory.yaml +++ b/Integrations/ESPHome/MSR-2_Factory.yaml @@ -22,7 +22,7 @@ esphome: name: "ApolloAutomation.MSR-2" version: "${version}" - min_version: 2024.6.4 + min_version: 2025.2.0 dashboard_import: @@ -58,4 +58,4 @@ packages: ref: main files: - Integrations/ESPHome/Core.yaml - refresh: 0d \ No newline at end of file + refresh: 0d From 6752db965cf2ac82d4aa830cc6649226f21590d7 Mon Sep 17 00:00:00 2001 From: Trevor Schirmer Date: Thu, 20 Feb 2025 21:25:14 -0500 Subject: [PATCH 5/6] Remove RMT From Core, Updated For Local Core YAML --- Integrations/ESPHome/Core.yaml | 3 +-- Integrations/ESPHome/MSR-2_BLE.yaml | 11 +++++------ Integrations/ESPHome/MSR-2_Factory.yaml | 11 +++++------ 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/Integrations/ESPHome/Core.yaml b/Integrations/ESPHome/Core.yaml index 4179718..7a95d83 100644 --- a/Integrations/ESPHome/Core.yaml +++ b/Integrations/ESPHome/Core.yaml @@ -1,6 +1,6 @@ substitutions: name: apollo-msr-2 - version: "24.7.15.1" + version: "25.2.19.1" device_description: ${name} made by Apollo Automation - version ${version}. esp32: @@ -447,7 +447,6 @@ light: id: rgb_light name: "RGB Light" pin: GPIO3 - rmt_channel: 0 default_transition_length: 0s chipset: WS2812 num_leds: 3 diff --git a/Integrations/ESPHome/MSR-2_BLE.yaml b/Integrations/ESPHome/MSR-2_BLE.yaml index e665e6a..bb5469c 100644 --- a/Integrations/ESPHome/MSR-2_BLE.yaml +++ b/Integrations/ESPHome/MSR-2_BLE.yaml @@ -42,9 +42,8 @@ bluetooth_proxy: active: true packages: - remote_package: - url: https://github.com/ApolloAutomation/MSR-2/ - ref: main - files: - - Integrations/ESPHome/Core.yaml - refresh: 0d + ApolloAutomation.TEMP-1: + url: https://github.com/ApolloAutomation/MSR-2 + ref: beta + files: [Integrations/ESPHome/TEMP-1_Minimal.yaml] + refresh: 1min diff --git a/Integrations/ESPHome/MSR-2_Factory.yaml b/Integrations/ESPHome/MSR-2_Factory.yaml index 5111663..9114083 100644 --- a/Integrations/ESPHome/MSR-2_Factory.yaml +++ b/Integrations/ESPHome/MSR-2_Factory.yaml @@ -53,9 +53,8 @@ ota: packages: - remote_package: - url: https://github.com/ApolloAutomation/MSR-2/ - ref: main - files: - - Integrations/ESPHome/Core.yaml - refresh: 0d + ApolloAutomation.TEMP-1: + url: https://github.com/ApolloAutomation/MSR-2 + ref: beta + files: [Integrations/ESPHome/TEMP-1_Minimal.yaml] + refresh: 1min From 0ba6e6346e83104c10a0087c304897413bbd6588 Mon Sep 17 00:00:00 2001 From: Trevor Schirmer Date: Thu, 20 Feb 2025 21:29:15 -0500 Subject: [PATCH 6/6] Fix Core Package Link --- Integrations/ESPHome/MSR-2_BLE.yaml | 6 +----- Integrations/ESPHome/MSR-2_Factory.yaml | 8 +------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/Integrations/ESPHome/MSR-2_BLE.yaml b/Integrations/ESPHome/MSR-2_BLE.yaml index bb5469c..f411ad6 100644 --- a/Integrations/ESPHome/MSR-2_BLE.yaml +++ b/Integrations/ESPHome/MSR-2_BLE.yaml @@ -42,8 +42,4 @@ bluetooth_proxy: active: true packages: - ApolloAutomation.TEMP-1: - url: https://github.com/ApolloAutomation/MSR-2 - ref: beta - files: [Integrations/ESPHome/TEMP-1_Minimal.yaml] - refresh: 1min + core: !include Core.yaml diff --git a/Integrations/ESPHome/MSR-2_Factory.yaml b/Integrations/ESPHome/MSR-2_Factory.yaml index 9114083..38a3964 100644 --- a/Integrations/ESPHome/MSR-2_Factory.yaml +++ b/Integrations/ESPHome/MSR-2_Factory.yaml @@ -50,11 +50,5 @@ ota: - platform: esphome id: ota_esphome - - packages: - ApolloAutomation.TEMP-1: - url: https://github.com/ApolloAutomation/MSR-2 - ref: beta - files: [Integrations/ESPHome/TEMP-1_Minimal.yaml] - refresh: 1min + core: !include Core.yaml