various tidyups and esphome adds

esphome/esp-arcademachine1.yaml

@@ -25,6 +25,10 @@ substitutions:
   ota_pass: !secret esp-ota_pass # unfortunately you can't use substitutions inside secrets names
   static_ip_address: !secret esp-arcademachine1_ip
 
+  # If we are changing IP addresses, you must update the current IP address here, otherwise it remains
+  # Don't forget to switch it back when changed.
+  current_ip_address: ${static_ip_address}
+
   # Device Settings
   log_level: "NONE" # Define logging level: NONE, ERROR, WARN, INFO, DEBUG (Default), VERBOSE, VERY_VERBOSE
   update_interval: "10s" # update time for for general sensors etc
@@ -49,6 +53,7 @@ packages:
       local_device_name: "${device_name}"
       local_static_ip_address: "${static_ip_address}"
       local_ota_pass: "${ota_pass}"
+      local_current_ip_address: "${current_ip_address}"
 
   ##################################################
   # OPTIONAL packages (comment if you don't want them)
@@ -62,8 +67,8 @@ packages:
       local_api_key: "${api_key}"
   
   #### WEB PORTAL ####
-  #common_webportal: !include
-  #  file: common/webportal_common.yaml
+  common_webportal: !include
+    file: common/webportal_common.yaml
 
   #### MQTT ####
   common_mqtt: !include
@@ -124,8 +129,8 @@ esp8266:
 preferences:
   flash_write_interval: 10min
 
-#mdns:
-#  disabled: True # binary size saving
+mdns:
+  disabled: False # binary size saving
 
 ##########################################################################################    
 # ESPHome Logging Enable
@@ -137,33 +142,6 @@ logger:
   #esp8266_store_log_strings_in_flash: false
   #tx_buffer_size: 64
 
-##########################################################################################
-# Global Variables for use in automations etc
-# https://esphome.io/guides/automations.html?highlight=globals#global-variables
-##########################################################################################
-globals:
-
-  # Tracks the time (in seconds from midnight) at the previous boot
-  - id: last_boot_time_s
-    type: int
-    restore_value: true
-    initial_value: "0"
-
-  # Counts how many consecutive boots have occurred (within X seconds)
-  - id: boot_count
-    type: int
-    restore_value: true
-    initial_value: "0"
-
-  ####################################################
-  # boost_timer: counts minutes in BOOST mode
-  # After 'boost_duration' minutes, revert to TIMER.
-  ####################################################
-  - id: boost_timer
-    type: int
-    restore_value: true
-    initial_value: "0"
-
 ##########################################################################################
 # BINARY SENSORS
 # https://esphome.io/components/binary_sensor/