Merge pull request #65 from dexn/main

Fix OTA for ESPHome 2024.6
athom-tech · Jun 21, 2024 · db0a0da · db0a0da
2 parents 3f7cbc8 + 2f2f3c8
commit db0a0da
Show file tree

Hide file tree

Showing 24 changed files with 77 additions and 52 deletions.
diff --git a/athom-cb02.yaml b/athom-cb02.yaml
@@ -1,13 +1,14 @@
 substitutions:
   device_name: "athom-cb02-switch"
   project_name: "Athom Technology.Switch Module"
-  project_version: "1.1"
+  project_version: "1.1.1"
   relay_restore_mode: RESTORE_DEFAULT_OFF
 
 esphome:
   name: "${device_name}"
   friendly_name: ""
   name_add_mac_suffix: true
+  min_version: 2024.6.0
   project:
     name: "${project_name}"
     version: "${project_version}"
@@ -22,6 +23,7 @@ preferences:
 api:
 
 ota:
+  - platform: esphome
 
 logger:
 

diff --git a/athom-garage-door.yaml b/athom-garage-door.yaml
@@ -1,13 +1,13 @@
 substitutions:
   device_name: "athom-garage-door"
   project_name: "Athom Technology.Garage Door Opener"
-  project_version: "1.2"
-
+  project_version: "1.2.1"
 
 esphome:
   name: "${device_name}"
   friendly_name: ""
   name_add_mac_suffix: true
+  min_version: 2024.6.0
   project:
     name: "${project_name}"
     version: "${project_version}"
@@ -18,10 +18,10 @@ esp8266:
 api:
 
 ota:
+  - platform: esphome
 
 logger:
 
-
 mdns:
   disabled: false
 

diff --git a/athom-ls-4p-3wire.yaml b/athom-ls-4p-3wire.yaml
@@ -1,7 +1,7 @@
 substitutions:
   device_name: "athom-ls-4p-3wire"
   project_name: "Athom Technology.LS 4P 3Wire"
-  project_version: "1.1"
+  project_version: "1.1.1"
   button_toggle: "true"
   led_restore_mode: RESTORE_DEFAULT_OFF
   number_of_leds: '150'
@@ -12,6 +12,7 @@ esphome:
   name: "${device_name}"
   friendly_name: ""
   name_add_mac_suffix: true
+  min_version: 2024.6.0
   project:
     name: "${project_name}"
     version: "${project_version}"
@@ -25,6 +26,7 @@ esp8266:
 api:
 
 ota:
+  - platform: esphome
 
 logger:
   baud_rate: 0
@@ -70,7 +72,7 @@ sensor:
     name: "Uptime Sensor"
 
   - platform: wifi_signal
-    name: "${friendly_name} WiFi Signal"
+    name: "WiFi Signal"
     update_interval: 60s
 
 button:

diff --git a/athom-ls-4p-4wire.yaml b/athom-ls-4p-4wire.yaml
@@ -1,7 +1,7 @@
 substitutions:
   device_name: "athom-ls-4p-4wire"
   project_name: "Athom Technology.LS 4P 4Wire"
-  project_version: "1.1"
+  project_version: "1.1.1"
   button_toggle: "true"
   light_restore_mode: RESTORE_DEFAULT_OFF
   number_of_leds: '150'
@@ -12,6 +12,7 @@ esphome:
   name: "${device_name}"
   friendly_name: ""
   name_add_mac_suffix: true
+  min_version: 2024.6.0
   project:
     name: "${project_name}"
     version: "${project_version}"
@@ -25,6 +26,7 @@ esp8266:
 api:
 
 ota:
+  - platform: esphome
 
 logger:
   baud_rate: 0
@@ -70,7 +72,7 @@ sensor:
     name: "Uptime Sensor"
 
   - platform: wifi_signal
-    name: "${friendly_name} WiFi Signal"
+    name: "WiFi Signal"
     update_interval: 60s
 
 button:

diff --git a/athom-mini-switch.yaml b/athom-mini-switch.yaml
@@ -1,13 +1,14 @@
 substitutions:
   device_name: "athom-mini-switch"
   project_name: "Athom Technology.Mini Relay Switch Module"
-  project_version: "1.1"
+  project_version: "1.1.1"
   light_restore_mode: RESTORE_DEFAULT_OFF
 
 esphome:
   name: "${device_name}"
   friendly_name: ""
   name_add_mac_suffix: true
+  min_version: 2024.6.0
   project:
     name: "${project_name}"
     version: "${project_version}"
@@ -22,10 +23,10 @@ preferences:
 api:
 
 ota:
+  - platform: esphome
 
 logger:
 
-
 mdns:
   disabled: false
 

diff --git a/athom-presence-sensor.yaml b/athom-presence-sensor.yaml
@@ -4,12 +4,13 @@ substitutions:
   room: ""
   device_description: "mmwave radar human presence sensor"
   project_name: "Athom Technology.Presence Sensor"
-  project_version: "1.0"
+  project_version: "1.0.1"
 
 esphome:
   name: "${name}"
   friendly_name: "${friendly_name}"
   name_add_mac_suffix: true
+  min_version: 2024.6.0
   project:
     name: "${project_name}"
     version: "${project_version}"
@@ -27,6 +28,7 @@ logger:
 api:
 
 ota:
+  - platform: esphome
 
 mdns:
   disabled: false
@@ -67,7 +69,6 @@ uart:
   #   sequence:
   #     - lambda: UARTDebug::log_string(direction, bytes);
 
-
 binary_sensor:
   - platform: status
     name: "Status"
@@ -116,7 +117,6 @@ binary_sensor:
       then:
         - light.turn_off: led
 
-
   - platform: template
     name: "Occupancy"
     id: occupancy
@@ -158,8 +158,6 @@ switch:
     turn_off_action:
       - uart.write: "sensorStop\r\n"
 
-
-
 number:
   - platform: template
     name: Farthest Detection          #Value range: 1.9 ~ 12m  Default: 6
@@ -184,7 +182,6 @@ number:
       - delay: 500ms
       - switch.turn_on: mmwave_sensor
 
-
   - platform: template
     name: Maintain Sensitivity                 #Value range: 0 ~ 9   Default Maintain sensitivity: 7    Default Trigger sensitivity: 5
     id: Maintain_Sensitivity
@@ -230,7 +227,6 @@ number:
       - delay: 500ms
       - switch.turn_on: mmwave_sensor
 
-
   - platform: template
     name: Detection Delay      #Confirmation delay      Value range: 0 ～ 100  default 0.050 seconds.
     id: Detection_Delay
@@ -277,7 +273,6 @@ number:
       - delay: 500ms
       - switch.turn_on: mmwave_sensor
 
-
   - platform: template
     name: Blockade Time                  #Configure block time        Value range: 1 ～ 255, default 1 seconds.
     id: Blockade_Time
@@ -352,4 +347,3 @@ text_sensor:
 time:
   - platform: sntp
     id: my_time
-
diff --git a/athom-relay-board-x1.yaml b/athom-relay-board-x1.yaml
@@ -1,13 +1,14 @@
 substitutions:
   device_name: "athom-relay-board-x1"
   project_name: "Athom Technology.Relay-Board-X1"
-  project_version: "1.0"
+  project_version: "1.0.1"
   relay_restore_mode: RESTORE_DEFAULT_OFF
 
 esphome:
   name: "${device_name}"
   friendly_name: ""
   name_add_mac_suffix: true
+  min_version: 2024.6.0
   project:
     name: "${project_name}"
     version: "${project_version}"
@@ -22,6 +23,7 @@ preferences:
 api:
 
 ota:
+  - platform: esphome
 
 logger:
 

diff --git a/athom-relay-board-x2.yaml b/athom-relay-board-x2.yaml
@@ -1,14 +1,15 @@
 substitutions:
   device_name: "athom-relay-board-x2"
   project_name: "Athom Technology.Relay-Board-X2"
-  project_version: "1.0"
+  project_version: "1.0.1"
   relay1_restore_mode: RESTORE_DEFAULT_OFF
   relay2_restore_mode: RESTORE_DEFAULT_OFF
 
 esphome:
   name: "${device_name}"
   friendly_name: ""
   name_add_mac_suffix: true
+  min_version: 2024.6.0
   project:
     name: "${project_name}"
     version: "${project_version}"
@@ -23,6 +24,7 @@ preferences:
 api:
 
 ota:
+  - platform: esphome
 
 logger:
 
@@ -46,7 +48,7 @@ sensor:
     name: "Uptime Sensor"
 
   - platform: wifi_signal
-    name: "${friendly_name} WiFi Signal"
+    name: "WiFi Signal"
     update_interval: 60s
 
 button:

diff --git a/athom-relay-board-x4.yaml b/athom-relay-board-x4.yaml
@@ -1,7 +1,7 @@
 substitutions:
   device_name: "athom-relay-board-x4"
   project_name: "Athom Technology.Relay-Board-X4"
-  project_version: "1.0"
+  project_version: "1.0.1"
   relay1_restore_mode: RESTORE_DEFAULT_OFF
   relay2_restore_mode: RESTORE_DEFAULT_OFF
   relay3_restore_mode: RESTORE_DEFAULT_OFF
@@ -11,6 +11,7 @@ esphome:
   name: "${device_name}"
   friendly_name: ""
   name_add_mac_suffix: true
+  min_version: 2024.6.0
   project:
     name: "${project_name}"
     version: "${project_version}"
@@ -25,6 +26,7 @@ preferences:
 api:
 
 ota:
+  - platform: esphome
 
 logger:
 
@@ -105,4 +107,3 @@ text_sensor:
 time:
   - platform: sntp
     id: sntp_time
-
diff --git a/athom-relay-board-x8.yaml b/athom-relay-board-x8.yaml
@@ -1,7 +1,7 @@
 substitutions:
   device_name: "athom-relay-board-x8"
   project_name: "Athom Technology.Relay-Board-X8"
-  project_version: "1.0"
+  project_version: "1.0.1"
   relay1_restore_mode: RESTORE_DEFAULT_OFF
   relay2_restore_mode: RESTORE_DEFAULT_OFF
   relay3_restore_mode: RESTORE_DEFAULT_OFF
@@ -15,6 +15,7 @@ esphome:
   name: "${device_name}"
   friendly_name: ""
   name_add_mac_suffix: true
+  min_version: 2024.6.0
   project:
     name: "${project_name}"
     version: "${project_version}"
@@ -29,6 +30,7 @@ preferences:
 api:
 
 ota:
+  - platform: esphome
 
 logger:
 

diff --git a/athom-rgb-light.yaml b/athom-rgb-light.yaml
@@ -1,13 +1,14 @@
 substitutions:
   device_name: "athom-rgb-light"
   project_name: "Athom Technology.RGB Light Strip Controller"
-  project_version: "1.1"
+  project_version: "1.1.1"
   light_restore_mode: RESTORE_DEFAULT_OFF
 
 esphome:
   name: "${device_name}"
   friendly_name: ""
   name_add_mac_suffix: true
+  min_version: 2024.6.0
   project:
     name: "${project_name}"
     version: "${project_version}"
@@ -22,6 +23,7 @@ preferences:
 api:
 
 ota:
+  - platform: esphome
 
 logger:
   baud_rate: 0
@@ -79,7 +81,6 @@ button:
     name: "Safe Mode"
     internal: false
 
-
 output:
   - platform: esp8266_pwm
     id: red_output

diff --git a/athom-rgbct-light.yaml b/athom-rgbct-light.yaml
@@ -1,7 +1,7 @@
 substitutions:
   device_name: "athom-rgbct-light"
   project_name: "Athom Technology.RGBCCT Bulb"
-  project_version: "1.1"
+  project_version: "1.1.1"
   light_restore_mode: RESTORE_DEFAULT_ON
   color_interlock: 'true'
 
@@ -15,6 +15,7 @@ esphome:
   name: "${device_name}"
   friendly_name: ""
   name_add_mac_suffix: true
+  min_version: 2024.6.0
   project:
     name: "${project_name}"
     version: "${project_version}"
@@ -32,6 +33,7 @@ preferences:
 api:
 
 ota:
+  - platform: esphome
 
 logger: