From e6bd10f05aba32021175f656e3d4278ead15c629 Mon Sep 17 00:00:00 2001
From: Brandon Harvey <bharvey88@users.noreply.github.com>
Date: Fri, 6 Mar 2026 17:18:20 -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-2.yaml | 3 +++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Integrations/ESPHome/Core.yaml b/Integrations/ESPHome/Core.yaml
index 9ce4ded..fc36704 100644
--- a/Integrations/ESPHome/Core.yaml
+++ b/Integrations/ESPHome/Core.yaml
@@ -786,8 +786,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-2.yaml b/Integrations/ESPHome/MSR-2.yaml
index 31c827d..0c2f39f 100644
--- a/Integrations/ESPHome/MSR-2.yaml
+++ b/Integrations/ESPHome/MSR-2.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();
   - priority: -10

From db71fea7cc707065e06b8e93a3784d92ab9b05ca Mon Sep 17 00:00:00 2001
From: Brandon Harvey <bharvey88@users.noreply.github.com>
Date: Fri, 6 Mar 2026 18:24:58 -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-2.yaml.
Add publish at priority 500 to MSR-2_BLE and MSR-2_Factory.
---
 Integrations/ESPHome/MSR-2.yaml         | 6 ++++--
 Integrations/ESPHome/MSR-2_BLE.yaml     | 5 +++++
 Integrations/ESPHome/MSR-2_Factory.yaml | 5 +++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/Integrations/ESPHome/MSR-2.yaml b/Integrations/ESPHome/MSR-2.yaml
index 0c2f39f..78fdd46 100644
--- a/Integrations/ESPHome/MSR-2.yaml
+++ b/Integrations/ESPHome/MSR-2.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();
   - priority: -10
     then:
       - if:
diff --git a/Integrations/ESPHome/MSR-2_BLE.yaml b/Integrations/ESPHome/MSR-2_BLE.yaml
index 393acd9..480104e 100644
--- a/Integrations/ESPHome/MSR-2_BLE.yaml
+++ b/Integrations/ESPHome/MSR-2_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}"
   - priority: -10
     then:
       - if:
diff --git a/Integrations/ESPHome/MSR-2_Factory.yaml b/Integrations/ESPHome/MSR-2_Factory.yaml
index e4353c9..04b3aae 100644
--- a/Integrations/ESPHome/MSR-2_Factory.yaml
+++ b/Integrations/ESPHome/MSR-2_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}"
   - priority: -10
     then:
       - if: