From 8f4a2a94029ae43605ee52b1626456a8bd8feb15 Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Fri, 20 Dec 2024 21:23:28 +0100
Subject: [PATCH] Device name from App

---
 ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml     | 13 ++++++++++---
 ESPHome/TX-Ultimate-Easy-ESPHome_core_api.yaml | 16 +++++++---------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml b/ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
index 7f253bc..715d98b 100644
--- a/ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
+++ b/ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
@@ -89,11 +89,18 @@ script:
   - id: boot_done
     mode: restart
     then:
-      - lambda: send_event_to_ha->execute("boot", "done");
+      - script.execute:
+          id: send_event_to_ha
+          component: boot
+          event: done
 
   - id: boot_initialize
     mode: restart
-    then:  # There's nothing here so far
+    then:
+      - script.execute:
+          id: send_event_to_ha
+          component: boot
+          event: start
     # Extended by:
     #   - HW Buttons
     #   - HW Relays
@@ -109,7 +116,7 @@ script:
     then:
       - lambda: |-
           tx_fw_version->publish_state("${version}");
-          tx_device_name->publish_state("${name}");
+          tx_device_name->publish_state(App.get_name().c_str());
 
 select:
   - id: sl_tx_model_format
diff --git a/ESPHome/TX-Ultimate-Easy-ESPHome_core_api.yaml b/ESPHome/TX-Ultimate-Easy-ESPHome_core_api.yaml
index 43322bc..ff4bb80 100644
--- a/ESPHome/TX-Ultimate-Easy-ESPHome_core_api.yaml
+++ b/ESPHome/TX-Ultimate-Easy-ESPHome_core_api.yaml
@@ -31,13 +31,11 @@ script:
       component: string
       event: string
     then:
-      - lambda: |-
-          esphome::api::CustomAPIDevice ha_event;
-          ha_event.fire_homeassistant_event("esphome.tx_ultimate_easy",
-            {
-              {"device_name", tx_device_name->state.c_str()},
-              {"firmware", "${version}"},
-              {"component", component},
-              {"event", event},
-            });
+      - homeassistant.event:
+          event: esphome.tx_ultimate_easy
+          data:
+            device_name: !lambda return tx_device_name->state.c_str();
+            firmware: ${version}
+            component: !lambda return component.c_str();
+            event: !lambda return event.c_str();
 ...