cleanup new ota configuration and move it to the core package

konnected-io · Jun 18, 2024 · b388fec · b388fec
1 parent 09f9721
commit b388fec
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 80 deletions.
diff --git a/alarm-panel-esp8266.yaml b/alarm-panel-esp8266.yaml
@@ -134,10 +134,3 @@ logger:
 # Enables the native API for Home Assistant
 # more: https://esphome.io/components/api.html
 api:
-
-#### 
-# OTA UPDATES
-# Enables over-the-air updates
-# more: https://esphome.io/components/ota.html
-ota:
-  - platform: esphome
diff --git a/alarm-panel-pro-esp32-ethernet.yaml b/alarm-panel-pro-esp32-ethernet.yaml
@@ -152,10 +152,3 @@ logger:
 # Enables the native API for Home Assistant
 # more: https://esphome.io/components/api.html
 api:
-
-#### 
-# OTA UPDATES
-# Enables over-the-air updates
-# more: https://esphome.io/components/ota.html
-ota:
-  - platform: esphome
diff --git a/alarm-panel-pro-esp32-local-alarm.yaml b/alarm-panel-pro-esp32-local-alarm.yaml
@@ -426,10 +426,3 @@ api:
             else:
               - state_machine.transition: failed_code
 
-
-#### 
-# OTA UPDATES
-# Enables over-the-air updates
-# more: https://esphome.io/components/ota.html
-ota:
-  - platform: esphome
diff --git a/alarm-panel-pro-esp32-wifi.yaml b/alarm-panel-pro-esp32-wifi.yaml
@@ -148,10 +148,3 @@ logger:
 # Enables the native API for Home Assistant
 # more: https://esphome.io/components/api.html
 api:
-
-#### 
-# OTA UPDATES
-# Enables over-the-air updates
-# more: https://esphome.io/components/ota.html
-ota:
-  - platform: esphome
diff --git a/alarm-panel-pro-v1.8-ethernet.yaml b/alarm-panel-pro-v1.8-ethernet.yaml
@@ -162,10 +162,3 @@ logger:
 # Enables the native API for Home Assistant
 # more: https://esphome.io/components/api.html
 api:
-
-#### 
-# OTA UPDATES
-# Enables over-the-air updates
-# more: https://esphome.io/components/ota.html
-ota:
-  - platform: esphome
diff --git a/examples/GDOv2-S-wired-sensor-only.yaml b/examples/GDOv2-S-wired-sensor-only.yaml
@@ -201,16 +201,5 @@ logger:
 # more: https://esphome.io/components/api.html
 api:
 
-#### 
-# OTA UPDATES
-# Enables over-the-air updates
-# more: https://esphome.io/components/ota.html
-ota:
-
-improv_serial:
-
-esp32_improv:
-  authorizer: false
-
 web_server:
   include_internal: true
diff --git a/garage-door-GDOv1-S.yaml b/garage-door-GDOv1-S.yaml
@@ -196,10 +196,3 @@ logger:
 # Enables the native API for Home Assistant
 # more: https://esphome.io/components/api.html
 api:
-
-#### 
-# OTA UPDATES
-# Enables over-the-air updates
-# more: https://esphome.io/components/ota.html
-ota:
-  - platform: esphome
diff --git a/garage-door-GDOv2-Q.yaml b/garage-door-GDOv2-Q.yaml
@@ -118,7 +118,7 @@ packages:
       # WIFI
       # Enables WiFi connectivity and diagnostics. Uncommet below to enable WiFi.
       # wifi: !include packages/wifi.yaml
-      - packages/wifi.yaml
+      - packages/wifi-esp32.yaml
 
       ####
       # WARNING LED
@@ -168,26 +168,13 @@ logger:
     sensor: INFO
     json: INFO
     api: DEBUG
-    esp-idf: VERBOSE
 
 ####
 # NATIVE API
 # Enables the native ESPHome API
 # more: https://esphome.io/components/api.html
 api:
 
-####
-# OTA UPDATES
-# Enables over-the-air updates
-# more: https://esphome.io/components/ota.html
-ota:
-  - platform: esphome
-
-improv_serial:
-
-esp32_improv:
-  authorizer: false
-
 web_server:
 
 esphome:

diff --git a/garage-door-GDOv2-S.yaml b/garage-door-GDOv2-S.yaml
@@ -161,7 +161,7 @@ packages:
       # WIFI
       # Enables WiFi connectivity and diagnostics. Uncommet below to enable WiFi.
       # wifi: !include packages/wifi.yaml
-      - packages/wifi.yaml
+      - packages/wifi-esp32.yaml
 
       ####
       # PRE-CLOSE WARNING
@@ -208,15 +208,6 @@ logger:
 # more: https://esphome.io/components/api.html
 api:
 
-#### 
-# OTA UPDATES
-# Enables over-the-air updates
-# more: https://esphome.io/components/ota.html
-ota:
-  - platform: esphome
-
-improv_serial:
-
 esp32_improv:
   authorizer: false
 

diff --git a/packages/core-esp32-s3.yaml b/packages/core-esp32-s3.yaml
@@ -50,4 +50,12 @@ button:
   - platform: restart
     name: Restart
     id: restart_button
-    entity_category: config
+    entity_category: config
+
+#### 
+# OTA UPDATES
+# Enables over-the-air updates
+# more: https://esphome.io/components/ota.html
+ota:
+  - platform: esphome
+
diff --git a/packages/core-esp32.yaml b/packages/core-esp32.yaml
@@ -47,4 +47,12 @@ button:
     entity_category: config
   # - platform: factory_reset
   #   name: Factory Reset
-  #   entity_category: config
+  #   entity_category: config
+
+#### 
+# OTA UPDATES
+# Enables over-the-air updates
+# more: https://esphome.io/components/ota.html
+ota:
+  - platform: esphome
+
diff --git a/packages/core-esp8266.yaml b/packages/core-esp8266.yaml
@@ -42,4 +42,11 @@ sensor:
 button:
   - platform: restart
     name: Restart
-    entity_category: config
+    entity_category: config
+
+#### 
+# OTA UPDATES
+# Enables over-the-air updates
+# more: https://esphome.io/components/ota.html
+ota:
+  - platform: esphome