From a2fb86aa93a5d78410c873e54f790e822c4c3cca Mon Sep 17 00:00:00 2001
From: ESPHome Device Builder <device-builder@esphome.io>
Date: Mon, 20 Jul 2026 20:37:50 +1200
Subject: [PATCH] Edit esp-downstloungemain.yaml

---
 esphome/esp-downstloungemain.yaml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/esphome/esp-downstloungemain.yaml b/esphome/esp-downstloungemain.yaml
index d775fbd..c3a2a33 100644
--- a/esphome/esp-downstloungemain.yaml
+++ b/esphome/esp-downstloungemain.yaml
@@ -6,6 +6,7 @@
 # https://home.fox.co.nz/gitea/zorruno/zorruno-homeassistant/src/branch/master/esphome/esp-downstloungemain.yaml
 #:########################################################################################:#
 # VERSIONS:
+# v3.7 2026-07-20 Simplified local MQTT command and status topics to the device root
 # v3.6 2026-02-25 Updated yaml to zorruno layout V1.1
 # v3.5 2025-07-28 YAML tidyups
 #:########################################################################################:#
@@ -23,12 +24,12 @@
 #:########################################################################################:#
 # MQTT COMMANDS:
 # - Local command topic (Main Lights):
-#   ${mqtt_local_command_topic}/light1/set
+#   ${mqtt_local_command_topic}
 #     Payload "On"  -> Relay 1 ON
 #     Payload "Off" -> Relay 1 OFF
 #
 # - Local status topic (Main Lights):
-#   ${mqtt_local_status_topic}/light1/state
+#   ${mqtt_local_status_topic}
 #     Payload "On" / "Off" published when Relay 1 changes state
 #:########################################################################################:#
 # OFFLINE NOTES:
@@ -45,7 +46,6 @@
 # - Accurate time is NOT needed (SNTP not needed).
 #:########################################################################################:#
 
-
 #:########################################################################################:#
 # SUBSTITUTIONS: Specific device variable substitutions
 # If NOT using a secrets file, just replace these with the passwords etc (in quotes)
@@ -59,7 +59,7 @@ substitutions:
 
   # Project Naming
   project_name: "Zemismart Technologies.KS-811 Triple"
-  project_version: "v3.6"
+  project_version: "v3.7"
 
   # Passwords & Secrets
   api_key: !secret esp-api_key
@@ -156,11 +156,11 @@ logger:
 mqtt:
   on_message:
     # Main Lights control (Relay 1)
-    - topic: "${mqtt_local_command_topic}/light1/set"
+    - topic: "${mqtt_local_command_topic}"
       payload: "On"
       then:
         - switch.turn_on: relay_1
-    - topic: "${mqtt_local_command_topic}/light1/set"
+    - topic: "${mqtt_local_command_topic}"
       payload: "Off"
       then:
         - switch.turn_off: relay_1
@@ -222,11 +222,11 @@ switch:
     id: relay_1
     on_turn_on:
       - mqtt.publish:
-          topic: "${mqtt_local_status_topic}/light1/state"
+          topic: "${mqtt_local_status_topic}"
           payload: "On"
     on_turn_off:
       - mqtt.publish:
-          topic: "${mqtt_local_status_topic}/light1/state"
+          topic: "${mqtt_local_status_topic}"
           payload: "Off"
 
   # Relay 2 (GPIO12)
@@ -239,4 +239,4 @@ switch:
   - platform: gpio
     name: "Relay 3: ${switch_3_name}"
     pin: GPIO14
-    id: relay_3
\ No newline at end of file
+    id: relay_3