esphome device updates

2025-09-20 15:18:46 +12:00
parent a27b79fbd9
commit 1e1d0571d9
32 changed files with 3756 additions and 1188 deletions
@@ -34,18 +34,18 @@ substitutions:
  api_key: !secret esp-api_key # unfortunately you can't use substitutions inside secrets names
  ota_pass: !secret esp-ota_pass # unfortunately you can't use substitutions inside secrets names
  static_ip_address: !secret esp-laundrylights_ip
-  #mqtt_local_command_main_topic: !secret mqtt_local_command_main_topic
-  #mqtt_local_status_main_topic: !secret mqtt_local_status_main_topic
+  mqtt_command_main_topic: !secret mqtt_command_main_topic
+  mqtt_status_main_topic: !secret mqtt_status_main_topic

  # Device Settings
  #relay_icon: "mdi:lightbulb-group"
  log_level: "INFO" # Define logging level: NONE, ERROR, WARN, INFO, DEBUG (Default), VERBOSE, VERY_VERBOSE
  update_interval: "60s" # update time for for general sensors etc

-  # MQTT Controls
-  #mqtt_device_name: "bedroom2-ceilingfan"
-  #mqtt_local_command_topic: "${mqtt_local_command_main_topic}/${mqtt_device_name}" # Topic we will use to command this locally without HA
-  #mqtt_local_status_topic: "${mqtt_local_status_main_topic}/${mqtt_device_name}" # Topic we will use to view status locally without HA
+  # MQTT REMOTE Controls
+  mqtt_remote1_device_name: "3dprinter-power"
+  mqtt_remote1_command_topic: "${mqtt_command_main_topic}/${mqtt_remote1_device_name}" # Topic we will use to command this locally without HA
+  mqtt_remote1_status_topic: "${mqtt_status_main_topic}/${mqtt_remote1_device_name}" # Topic we will use to view status locally without HA

  # Switch Naming
  switch_1_name: "Laundry Lights"
@@ -58,29 +58,45 @@ substitutions:
 # https://esphome.io/components/packages.html
 ##########################################################################################
 packages:
+  ##################################################
+  # MANDATORY packages (won't compile without them!)
+  ##################################################
+
+  #### WIFI, Network (Static/DHCP/IPV6 etc), Fallback AP, Safemode ####
  common_wifi: !include
    file: common/network_common.yaml
    vars:
      local_device_name: "${device_name}"
      local_static_ip_address: "${static_ip_address}"
      local_ota_pass: "${ota_pass}"
+
+  ##################################################
+  # OPTIONAL packages (comment if you don't want them)
+  ##################################################   
+
+  #### HOME ASSISTANT API (choose encryption or no encryption options) ####
  common_api: !include
    file: common/api_common.yaml
+    #file: common/api_common_noencryption.yaml
    vars:
      local_api_key: "${api_key}"
-  #common_webportal: !include
-  #  file: common/webportal_common.yaml
+
+  #### MQTT ####
  common_mqtt: !include
    file: common/mqtt_common.yaml
    vars:
      local_device_name: "${device_name}"
-  common_sntp: !include
-    file: common/sntp_common.yaml
-  common_general_sensors: !include
-    file: common/sensors_common.yaml
-    vars:
-      local_friendly_name: "${friendly_name}"
-      local_update_interval: "${update_interval}"
+  
+  #### WEB PORTAL ####
+  common_webportal: !include common/webportal_common.yaml
+  #### SNTP (Only use if you want/need accurate timeclocks) ####
+  common_sntp:      !include common/sntp_common.yaml
+
+  #### DIAGNOSTICS Sensors ####
+  diag_basic:       !include common/include_basic_diag_sensors.yaml
+  diag_more:        !include common/include_more_diag_sensors.yaml
+  diag_debug:       !include common/include_debug_diag_sensors.yaml
+  #diag_resetcount:  !include common/include_resetcount_diag_sensors.yaml

 #########################################################################################
 # ESPHome
@@ -127,6 +143,20 @@ status_led:
    number: GPIO2
    inverted: yes

+#########################################################################################
+# GLOBAL VARIABLES
+# 
+#########################################################################################
+globals:
+  - id: remote1_state
+    type: bool
+    restore_value: no
+    initial_value: 'false'
+  - id: remote1_known
+    type: bool
+    restore_value: no
+    initial_value: 'false'
+
 #########################################################################################
 # BINARY SENSORS
 # https://esphome.io/components/binary_sensor/
@@ -145,20 +175,76 @@ binary_sensor:
    pin:
      number: GPIO05
      mode: INPUT
-      inverted: True
+      inverted: true
    name: "Button 2: ${switch_2_name}"
-    on_press:
-      - switch.toggle: Relay_2
+    on_multi_click:
+      # SINGLE CLICK: quick tap -> toggle Relay_2
+      - timing:
+          - ON for at most 0.5s
+          - OFF for at least 0.5s
+        then:
+          - if:
+              condition:
+                lambda: 'return id(Relay_2).state;'
+              then:
+                - switch.turn_off: Relay_2
+              else:
+                - switch.turn_on: Relay_2
+      # HOLD: pressed for 2s or more -> toggle remote; default to ON if unknown
+      - timing:
+          - ON for at least 2s
+        then:
+          - if:
+              condition:
+                lambda: 'return id(remote1_known) && id(remote1_state);'  # known AND currently ON
+              then:
+                - mqtt.publish:
+                    topic: "${mqtt_remote1_command_topic}"
+                    payload: "OFF"
+                    retain: false
+              else:
+                - mqtt.publish:
+                    topic: "${mqtt_remote1_command_topic}"
+                    payload: "ON"
+                    retain: false

-# KS-811-2 is a double only
-#  - platform: gpio
-#    pin:
-#      number: GPIO4
-#      mode: INPUT
-#      inverted: True
-#    name: "Button 3: ${switch_3_name}"
-#    on_press:
-#      - switch.toggle: Relay_3
+#########################################################################################
+# TEXT SENSORS
+# 
+#########################################################################################
+text_sensor:
+  - platform: mqtt_subscribe
+    id: remote1_status
+    internal: true
+    topic: "${mqtt_remote1_status_topic}"
+    on_value:
+      then:
+        - lambda: |-
+            // copy, trim whitespace, uppercase
+            std::string s = x;
+            // trim leading/trailing whitespace
+            auto notspace = [](int ch){ return !std::isspace(ch); };
+            s.erase(s.begin(), std::find_if(s.begin(), s.end(), notspace));
+            s.erase(std::find_if(s.rbegin(), s.rend(), notspace).base(), s.end());
+            for (auto &c : s) c = (char)toupper(c);
+
+            bool recognized = false;
+            if (s == "ON" || s == "1" || s == "TRUE") {
+              id(remote1_state) = true;
+              id(remote1_known) = true;
+              recognized = true;
+            } else if (s == "OFF" || s == "0" || s == "FALSE") {
+              id(remote1_state) = false;
+              id(remote1_known) = true;
+              recognized = true;
+            } else {
+              // unknown payload (e.g. "ONLINE", "OFFLINE", JSON, etc.)
+              id(remote1_known) = false;
+            }
+            ESP_LOGI("remote1_status", "Parsed status='%s' -> known=%s state=%s",
+                     s.c_str(),
+                     id(remote1_known) ? "true" : "false",
+                     id(remote1_state) ? "ON" : "OFF");

 #########################################################################################
 # SWITCH COMPONENT
@@ -175,10 +261,5 @@ switch:
    pin: GPIO12
    id: Relay_2

-# KS-811-2 is a double only
-#  - platform: gpio
-#    name: "Relay 3: ${switch_3_name}"
-#    pin: GPIO14
-#    id: Relay_3