esphome device updates

esphome/esp-3dprinterpow.yaml

@@ -17,47 +17,69 @@
 # If NOT using a secrets file, just replace these with the passwords etc (in quotes)
 #############################################
 substitutions:
-  device_name: "esp-3dprinterpow" # Reference name for the device in the system.
-  project_name: "Sonoff Technologies.POW R1" # Project Details 
-  project_version: "v1"  # Project V denotes release of yaml file, allowing checking of deployed vs latest version
-  entity_prefix: "Load" # Simple device name where we want to prefix a sensor or switch, eg "Load" Current. 
+  # Device Naming
+  device_name: "esp-3dprinterpow"
   friendly_name: "3D Printer Power"
   description_comment: "3D Printer inline monitor and switch override using a Sonoff Pow R1."
-  device_area: "Laundry" # Allows ESP device to be automatically linked to an 'Area' in Home Assistant.  
-  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-3dprinterpow_ip
+  device_area: "Bedroom 3" # Allows ESP device to be automatically linked to an 'Area' in Home Assistant. 
+
+  # Project Naming
+  project_name: "Sonoff Technologies.POW R1" # Project Details 
+  project_version: "v1"  # Project V denotes release of yaml file, allowing checking of deployed vs latest version
+  
+  # Passwords & Secrets
+  api_key: !secret esp-api_key
+  ota_pass: !secret esp-ota_pass 
+  static_ip_address: !secret esp-3dprinterpow_ip # unfortunately you can't use substitutions inside secrets names
+  mqtt_command_main_topic: !secret mqtt_command_main_topic
+  mqtt_status_main_topic: !secret mqtt_status_main_topic
+
+  # MQTT LOCAL Controls
+  mqtt_local_device_name: "3dprinter-power"
+  mqtt_local_command_topic: "${mqtt_command_main_topic}/${mqtt_local_device_name}" # Topic we will use to command this locally without HA
+  mqtt_local_status_topic: "${mqtt_status_main_topic}/${mqtt_local_device_name}" # Topic we will use to view status locally without HA
+  
+  # Device Settings
   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
+  entity_prefix: "Load" # Simple device name where we want to prefix a sensor or switch, eg "Load" Current. 
 
 ##########################################################################################
 # PACKAGES: Included Common Packages
 # https://esphome.io/components/packages.html
 ##########################################################################################
 packages:
+  #### 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}"
+
+  #### 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
@@ -71,10 +93,10 @@ esphome:
   project:
     name: "${project_name}"
     version: "${project_version}"
-  #on_boot:       
-    #priority: 200
-    #then:
-    #  - switch.turn_on: "virtual_button"
+  on_boot:
+    priority: -10
+    then:
+      - script.execute: publish_state_burst
 
 #############################################
 # ESP Platform and Framework
@@ -95,6 +117,24 @@ logger:
   #esp8266_store_log_strings_in_flash: false
   #tx_buffer_size: 64
 
+##########################################################################################
+# MQTT COMMANDS
+# This adds device-specific MQTT command triggers to the common MQTT configuration.
+##########################################################################################
+mqtt:
+  on_message:
+    # Switch control from MQTT
+    - topic: "${mqtt_local_command_topic}"
+      payload: "ON"
+      then:
+      - switch.turn_on: relay
+      - light.turn_on:  led
+    - topic: "${mqtt_local_command_topic}"
+      payload: "OFF"
+      then:
+      - switch.turn_off: relay
+      - light.turn_off:  led
+
 #############################################
 # STATUS LED
 # https://esphome.io/components/status_led.html
@@ -164,10 +204,22 @@ switch:
     turn_off_action:
       - switch.turn_off: relay
       - light.turn_off: led
+
   - platform: gpio
     id: relay
     pin: GPIO12
-    #restore_mode: ALWAYS_ON # Or RESTORE_DEFAULT_ON/RESTORE_DEFAULT_OFF
+    restore_mode: RESTORE_DEFAULT_ON
+    # restore_mode: ALWAYS_ON  # Or RESTORE_DEFAULT_ON/RESTORE_DEFAULT_OFF
+    on_turn_on:
+      - mqtt.publish:
+          topic: "${mqtt_local_status_topic}"
+          payload: "ON"
+          retain: false
+    on_turn_off:
+      - mqtt.publish:
+          topic: "${mqtt_local_status_topic}"
+          payload: "OFF"
+          retain: false
 
 output:
   - platform: esp8266_pwm
@@ -180,4 +232,18 @@ light:
   - platform: monochromatic
     name: Status LED
     output: pow_blue_led
-    id: led
+    id: led
+
+script:
+  - id: publish_state_burst
+    mode: restart
+    then:
+      - repeat:
+          count: 5
+          then:
+            - mqtt.publish:
+                topic: "${mqtt_local_status_topic}"
+                payload: !lambda 'return id(relay).state ? "ON" : "OFF";'
+                retain: false
+                qos: 1
+            - delay: 5s