Merge branch 'main' into main

tarontop · Jul 14, 2023 · 2df6c3e · 2df6c3e
2 parents 2bf3567 + 4f70577
commit 2df6c3e
Show file tree

Hide file tree

Showing 24 changed files with 554 additions and 342 deletions.
diff --git a/athom-cb02.yaml b/athom-cb02.yaml
@@ -1,12 +1,12 @@
 substitutions:
   device_name: "athom-cb02-switch"
-  friendly_name: "Athom CB02 Switch"
-  project_name: "athom.cb02-switch"
+  project_name: "Athom Technology.Switch Module"
   project_version: "1.1"
   relay_restore_mode: RESTORE_DEFAULT_OFF
 
 esphome:
   name: "${device_name}"
+  friendly_name: ""
   name_add_mac_suffix: true
   project:
     name: "${project_name}"
@@ -16,6 +16,9 @@ esp8266:
   board: esp8285
   restore_from_flash: true
 
+preferences:
+  flash_write_interval: 1min
+
 api:
 
 ota:
@@ -38,14 +41,14 @@ dashboard_import:
 
 binary_sensor:
   - platform: status
-    name: "${friendly_name} Status"
+    name: "Status"
 
   - platform: gpio
     pin:
       number: 3
       mode: INPUT_PULLUP
       inverted: true
-    name: "${friendly_name} Power Button"
+    name: "Power Button"
     disabled_by_default: true
     on_multi_click:
       - timing:
@@ -60,17 +63,20 @@ binary_sensor:
 
 sensor:
   - platform: uptime
-    name: "${friendly_name} Uptime"
-    disabled_by_default: true
+    name: "Uptime Sensor"
 
 button:
   - platform: factory_reset
-    name: Restart with Factory Default Settings
+    name: "Reset"
     id: Reset
 
+  - platform: safe_mode
+    name: "Safe Mode"
+    internal: false
+
 switch:
   - platform: gpio
-    name: "${friendly_name}"
+    name: "Relay"
     pin: GPIO13
     id: relay
     restore_mode: ${relay_restore_mode}
@@ -82,7 +88,7 @@ switch:
 
 light:
   - platform: status_led
-    name: "${friendly_name} Status LED"
+    name: "Status LED"
     id: blue_led
     disabled_by_default: true
     pin:
@@ -92,9 +98,13 @@ light:
 text_sensor:
   - platform: wifi_info
     ip_address:
-      name: "${friendly_name} IP Address"
-      disabled_by_default: true
+      name: "IP Address"
+    ssid:
+      name: "Connected SSID"
+    mac_address:
+      name: "Mac Address"
 
 time:
   - platform: sntp
-    id: my_time
+    id: sntp_time
+
diff --git a/athom-garage-door.yaml b/athom-garage-door.yaml
@@ -1,11 +1,11 @@
 substitutions:
-  name: "athom-garage-door"
-  friendly_name: "Athom Garage Door"
-  project_name: "athom.garage-door"
+  device_name: "athom-garage-door"
+  project_name: "Athom Technology.Garage Door Opener"
   project_version: "1.2"
 
 esphome:
-  name: "${name}"
+  name: "${device_name}"
+  friendly_name: ""
   name_add_mac_suffix: true
   project:
     name: "${project_name}"
@@ -20,6 +20,10 @@ ota:
 
 logger:
 
+
+mdns:
+  disabled: false
+
 web_server:
   port: 80
 
@@ -33,15 +37,14 @@ dashboard_import:
 
 sensor:
   - platform: uptime
-    name: "${friendly_name} Uptime"
-    disabled_by_default: true
+    name: "Uptime Sensor"
 
 binary_sensor:
   - platform: status
-    name: "${friendly_name} Status"
+    name: "Status"
 
   - platform: gpio
-    name: "${friendly_name} Contact"
+    name: "Contact"
     disabled_by_default: true
     device_class: garage_door
     id: contact
@@ -56,7 +59,7 @@ binary_sensor:
       number: GPIO14
       mode: INPUT_PULLUP
       inverted: true
-    name: "${friendly_name} Button"
+    name: "Button"
     disabled_by_default: true
     on_multi_click:
       - timing:
@@ -71,13 +74,17 @@ binary_sensor:
 
 button:
   - platform: factory_reset
-    name: Restart with Factory Default Settings
+    name: "Reset"
     id: Reset
 
+  - platform: safe_mode
+    name: "Safe Mode"
+    internal: false
+
 switch:
   - platform: gpio
     pin: GPIO5
-    name: "${friendly_name} Relay"
+    name: "Relay"
     id: relay
     disabled_by_default: true
     on_turn_on:
@@ -88,15 +95,15 @@ switch:
 
 light:
   - platform: status_led
-    name: "${friendly_name} Status LED"
+    name: "Status LED"
     id: wifi_led
     disabled_by_default: true
     pin: GPIO12
 
 cover:
   - platform: template
     device_class: garage
-    name: "${friendly_name}"
+    name: "Garage Door"
     lambda: "return id(contact).state ? COVER_OPEN : COVER_CLOSED;"
     open_action:
       then:
@@ -118,9 +125,12 @@ cover:
 text_sensor:
   - platform: wifi_info
     ip_address:
-      name: "${friendly_name} IP Address"
-      disabled_by_default: true
+      name: "IP Address"
+    ssid:
+      name: "Connected SSID"
+    mac_address:
+      name: "Mac Address"
 
 time:
   - platform: sntp
-    id: my_time
+    id: sntp_time
diff --git a/athom-ls-4p-3wire.yaml b/athom-ls-4p-3wire.yaml
@@ -1,7 +1,6 @@
 substitutions:
-  name: "athom-ls-4p-3wire"
-  friendly_name: "Athom LED Controller"
-  project_name: "athom.ls-4p-3wire"
+  device_name: "athom-ls-4p-3wire"
+  project_name: "Athom Technology.LS 4P 3Wire"
   project_version: "1.1"
   button_toggle: "true"
   led_restore_mode: RESTORE_DEFAULT_OFF
@@ -10,7 +9,8 @@ substitutions:
   led_chipset: WS2811
 
 esphome:
-  name: "${name}"
+  name: "${device_name}"
+  friendly_name: ""
   name_add_mac_suffix: true
   project:
     name: "${project_name}"
@@ -45,14 +45,14 @@ dashboard_import:
 
 binary_sensor:
   - platform: status
-    name: "${friendly_name} Status"
+    name: "Status"
 
   - platform: gpio
     pin:
       number: 0
       mode: INPUT_PULLUP
       inverted: true
-    name: "${friendly_name} Power Button"
+    name: "Power Button"
     disabled_by_default: true
     on_multi_click:
       - timing:
@@ -67,13 +67,17 @@ binary_sensor:
 
 sensor:
   - platform: uptime
-    name: "${friendly_name} Uptime"
+    name: "Uptime Sensor"
 
 button:
   - platform: factory_reset
-    name: Restart with Factory Default Settings
+    name: "Reset"
     id: Reset
 
+  - platform: safe_mode
+    name: "Safe Mode"
+    internal: false
+
 power_supply:
   - id: relay
     pin: GPIO12
@@ -82,7 +86,7 @@ light:
   - platform: fastled_clockless
     pin: GPIO1
     id: leds
-    name: "${friendly_name}"
+    name: "Light strip controller"
     power_supply: relay
     chipset: ${led_chipset}
     num_leds: ${number_of_leds}
@@ -95,9 +99,12 @@ light:
 text_sensor:
   - platform: wifi_info
     ip_address:
-      name: "${friendly_name} IP Address"
-      disabled_by_default: true
+      name: "IP Address"
+    ssid:
+      name: "Connected SSID"
+    mac_address:
+      name: "Mac Address"
 
 time:
   - platform: sntp
-    id: my_time
+    id: sntp_time
diff --git a/athom-ls-4p-4wire.yaml b/athom-ls-4p-4wire.yaml
@@ -1,7 +1,6 @@
 substitutions:
-  name: "athom-ls-4p-4wire"
-  friendly_name: "Athom LED Controller"
-  project_name: "athom.ls-4p-4wire"
+  device_name: "athom-ls-4p-4wire"
+  project_name: "Athom Technology.LS 4P 4Wire"
   project_version: "1.1"
   button_toggle: "true"
   light_restore_mode: RESTORE_DEFAULT_OFF
@@ -10,7 +9,8 @@ substitutions:
   led_rgb_order: GRB
 
 esphome:
-  name: "${name}"
+  name: "${device_name}"
+  friendly_name: ""
   name_add_mac_suffix: true
   project:
     name: "${project_name}"
@@ -21,7 +21,7 @@ esp8266:
   restore_from_flash: true
   framework:
     version: 2.7.4
-
+    
 api:
 
 ota:
@@ -45,14 +45,14 @@ dashboard_import:
 
 binary_sensor:
   - platform: status
-    name: "${friendly_name} Status"
+    name: "Status"
 
   - platform: gpio
     pin:
       number: 0
       mode: INPUT_PULLUP
       inverted: true
-    name: "${friendly_name} Power Button"
+    name: "Power Button"
     disabled_by_default: true
     on_multi_click:
       - timing:
@@ -64,15 +64,20 @@ binary_sensor:
           - ON for at least 4s
         then:
           - button.press: Reset
+
 sensor:
   - platform: uptime
-    name: "${friendly_name} Uptime"
+    name: "Uptime Sensor"
 
 button:
   - platform: factory_reset
-    name: Restart with Factory Default Settings
+    name: "Reset"
     id: Reset
 
+  - platform: safe_mode
+    name: "Safe Mode"
+    internal: false
+
 power_supply:
   - id: relay
     pin: GPIO12
@@ -82,7 +87,7 @@ light:
     data_pin: GPIO1
     clock_pin: GPIO3
     id: leds
-    name: "${friendly_name}"
+    name: "Light strip controller"
     power_supply: relay
     chipset: ${led_chipset}
     num_leds: ${number_of_leds}
@@ -95,9 +100,12 @@ light:
 text_sensor:
   - platform: wifi_info
     ip_address:
-      name: "${friendly_name} IP Address"
-      disabled_by_default: true
+      name: "IP Address"
+    ssid:
+      name: "Connected SSID"
+    mac_address:
+      name: "Mac Address"
 
 time:
   - platform: sntp
-    id: my_time
+    id: sntp_time