From 341d8f21f55a6ba3d4cfe97b8dc638fe57e25556 Mon Sep 17 00:00:00 2001
From: Brandon Harvey <bharvey88@users.noreply.github.com>
Date: Fri, 6 Mar 2026 17:16:42 -0600
Subject: [PATCH 1/2] fix: publish firmware version once on boot instead of
 polling

Per ESPHome dev feedback: the version is a compile-time constant, so
publish it once on_boot rather than using a lambda with periodic updates.
---
 Integrations/ESPHome/Core.yaml  | 3 +--
 Integrations/ESPHome/MSR-1.yaml | 3 +++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Integrations/ESPHome/Core.yaml b/Integrations/ESPHome/Core.yaml
index 5c089f6..9f029f5 100644
--- a/Integrations/ESPHome/Core.yaml
+++ b/Integrations/ESPHome/Core.yaml
@@ -692,8 +692,7 @@ text_sensor:
   - platform: template
     name: "Apollo Firmware Version"
     id: apollo_firmware_version
-    lambda: |-
-      return {"${version}"};
+    update_interval: never
     entity_category: "diagnostic"
 
 select:
diff --git a/Integrations/ESPHome/MSR-1.yaml b/Integrations/ESPHome/MSR-1.yaml
index 70b1b00..9982dde 100644
--- a/Integrations/ESPHome/MSR-1.yaml
+++ b/Integrations/ESPHome/MSR-1.yaml
@@ -6,6 +6,9 @@ esphome:
   on_boot:
   - priority: 900.0
     then:
+      - text_sensor.template.publish:
+          id: apollo_firmware_version
+          state: "${version}"
       - lambda: |-
           id(radar_bluetooth).turn_off();
 

From 15c4f1f1e6c219c4eca5b135c2560db4f5bf0e63 Mon Sep 17 00:00:00 2001
From: Brandon Harvey <bharvey88@users.noreply.github.com>
Date: Fri, 6 Mar 2026 18:25:48 -0600
Subject: [PATCH 2/2] fix: move firmware version publish to priority 500 for
 all variants

Move publish from priority 900 to separate 500 block in MSR-1.yaml.
Add publish at priority 500 to MSR-1_BLE and MSR-1_Factory.
---
 Integrations/ESPHome/MSR-1.yaml         | 6 ++++--
 Integrations/ESPHome/MSR-1_BLE.yaml     | 5 +++++
 Integrations/ESPHome/MSR-1_Factory.yaml | 5 +++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/Integrations/ESPHome/MSR-1.yaml b/Integrations/ESPHome/MSR-1.yaml
index 9982dde..5d09baf 100644
--- a/Integrations/ESPHome/MSR-1.yaml
+++ b/Integrations/ESPHome/MSR-1.yaml
@@ -5,12 +5,14 @@ esphome:
   name_add_mac_suffix: true
   on_boot:
   - priority: 900.0
+    then:
+      - lambda: |-
+          id(radar_bluetooth).turn_off();
+  - priority: 500
     then:
       - text_sensor.template.publish:
           id: apollo_firmware_version
           state: "${version}"
-      - lambda: |-
-          id(radar_bluetooth).turn_off();
 
   project:
     name: "ApolloAutomation.MSR-1"
diff --git a/Integrations/ESPHome/MSR-1_BLE.yaml b/Integrations/ESPHome/MSR-1_BLE.yaml
index a1c347b..9db25a0 100644
--- a/Integrations/ESPHome/MSR-1_BLE.yaml
+++ b/Integrations/ESPHome/MSR-1_BLE.yaml
@@ -8,6 +8,11 @@ esphome:
     then:
       - lambda: |-
           id(radar_bluetooth).turn_off();
+  - priority: 500
+    then:
+      - text_sensor.template.publish:
+          id: apollo_firmware_version
+          state: "${version}"
 
   project:
     name: "ApolloAutomation.MSR-1_BLE"
diff --git a/Integrations/ESPHome/MSR-1_Factory.yaml b/Integrations/ESPHome/MSR-1_Factory.yaml
index d48c1e6..ecc54f9 100644
--- a/Integrations/ESPHome/MSR-1_Factory.yaml
+++ b/Integrations/ESPHome/MSR-1_Factory.yaml
@@ -8,6 +8,11 @@ esphome:
     then:
       - lambda: |-
           id(radar_bluetooth).turn_off();
+  - priority: 500
+    then:
+      - text_sensor.template.publish:
+          id: apollo_firmware_version
+          state: "${version}"
 
   project:
     name: "ApolloAutomation.MSR-1_Factory"