Updates to support ESPHome 2022.8.0 (#41)

2024-08-30 18:12:19 +00:00 · 2022-08-26 19:03:39 -05:00 · 2022-08-26 19:03:39 -05:00 · 1af1341879
commit 1af1341879
parent dc50d93909
24 changed files with 43 additions and 42 deletions
--- a/components/tuya_dimmer_as_fan/tuya_dimmer_as_fan.cpp
+++ b/components/tuya_dimmer_as_fan/tuya_dimmer_as_fan.cpp
@ -1,6 +1,5 @@
 #include "tuya_dimmer_as_fan.h"
 #include "esphome/core/log.h"
-#include "esphome/components/fan/fan_helpers.h"

 namespace esphome {
 namespace tuya {
--- a/devices/basement-bathroom-light-fan.yaml
+++ b/devices/basement-bathroom-light-fan.yaml
@ -8,7 +8,7 @@ substitutions:
  ap_wifi_pwd: !secret basement-bathroom-light-fan-ap-pwd

 packages:
-  device_base: !include ../packages/device_base.yaml
+  device_base: !include ../packages/device_base_esp8266.yaml

 external_components:
  - source:
@ -76,7 +76,6 @@ sensor:
    name: Basement Bathroom Light
    power_id: light_power
    method: left
-    min_save_interval: 10min

 time:
  - platform: homeassistant
--- a/devices/basement-bathroom-sensor.yaml
+++ b/devices/basement-bathroom-sensor.yaml
@ -8,7 +8,7 @@ substitutions:
  ap_wifi_pwd: !secret basement-bathroom-sensor-ap-pwd

 packages:
-  device_base: !include ../packages/device_base.yaml
+  device_base: !include ../packages/device_base_esp8266.yaml

 esphome:
  on_boot:
--- a/devices/basement-bathroom-shower-light-heater.yaml
+++ b/devices/basement-bathroom-shower-light-heater.yaml
@ -8,7 +8,7 @@ substitutions:
  ap_wifi_pwd: !secret basement-bathroom-shower-light-heater-ap-pwd

 packages:
-  device_base: !include ../packages/device_base.yaml
+  device_base: !include ../packages/device_base_esp8266.yaml

 external_components:
  - source:
@ -81,12 +81,10 @@ sensor:
    name: Basement Shower Light
    power_id: light_power
    method: left
-    min_save_interval: 10min
  - platform: total_daily_energy
    name: Basement Bathroom Heater
    power_id: heat_power
    method: left
-    min_save_interval: 10min

 time:
  - platform: homeassistant
--- a/devices/coffee-maker.yaml
+++ b/devices/coffee-maker.yaml
@ -8,7 +8,7 @@ substitutions:
  ap_wifi_pwd: !secret coffee-maker-ap-pwd

 packages:
-  device_base: !include ../packages/device_base.yaml
+  device_base: !include ../packages/device_base_esp8266.yaml

 binary_sensor:
  - platform: gpio
--- a/devices/fire-pit-fountain.yaml
+++ b/devices/fire-pit-fountain.yaml
@ -8,7 +8,7 @@ substitutions:
  ap_wifi_pwd: !secret fire-pit-fountain-ap-pwd

 packages:
-  device_base: !include ../packages/device_base.yaml
+  device_base: !include ../packages/device_base_esp8266.yaml

 binary_sensor:
  - platform: gpio
--- a/devices/garage-fridge.yaml
+++ b/devices/garage-fridge.yaml
@ -2,15 +2,14 @@ substitutions:
  device_id: garage-fridge
  device_name: Garage Fridge
  board: m5stack-atom
-  framework_type: esp-idf
  ip_address: !secret garage-fridge-ip
  ota_pwd: !secret garage-fridge-ota-pwd
  api_pwd: !secret garage-fridge-api-pwd
  ap_wifi_pwd: !secret garage-fridge-ap-pwd
+  log_baud_rate: '0'

 packages:
-  device_base: !include ../packages/esp32_device_base.yaml
-  logger: !include ../packages/logger/logger_no_serial.yaml
+  device_base: !include ../packages/device_base_esp32.yaml

 wifi:
  power_save_mode: light
--- a/devices/master-bath-hum-temp-sensor.yaml
+++ b/devices/master-bath-hum-temp-sensor.yaml
@ -8,7 +8,7 @@ substitutions:
  ap_wifi_pwd: !secret master-bath-hum-temp-sensor-ap-pwd

 packages:
-  device_base: !include ../packages/device_base.yaml
+  device_base: !include ../packages/device_base_esp8266.yaml

 binary_sensor:
  - platform: template
--- a/devices/master-bed.yaml
+++ b/devices/master-bed.yaml
@ -8,7 +8,7 @@ substitutions:
  ap_wifi_pwd: !secret master-bed-ap-pwd

 packages:
-  device_base: !include ../packages/device_base.yaml
+  device_base: !include ../packages/device_base_esp8266.yaml

 esphome:
  includes:
--- a/devices/patio-lights.yaml
+++ b/devices/patio-lights.yaml
@ -8,7 +8,7 @@ substitutions:
  ap_wifi_pwd: !secret patio-lights-ap-pwd

 packages:
-  device_base: !include ../packages/device_base.yaml
+  device_base: !include ../packages/device_base_esp8266.yaml

 external_components:
  - source:
@ -43,7 +43,6 @@ sensor:
    name: ${device_name}
    power_id: power
    method: left
-    min_save_interval: 10min

 time:
  - platform: homeassistant
--- a/devices/pool-and-patio-lights.yaml
+++ b/devices/pool-and-patio-lights.yaml
@ -8,7 +8,7 @@ substitutions:
  ap_wifi_pwd: !secret pool-and-patio-lights-ap-pwd

 packages:
-  device_base: !include ../packages/device_base.yaml
+  device_base: !include ../packages/device_base_esp8266.yaml

 external_components:
  - source:
@ -79,7 +79,6 @@ sensor:
    icon: mdi:flash
    power_id: pool_light_power
    method: left
-    min_save_interval: 10min

 status_led:
  pin:
--- a/devices/pool-pumps.yaml
+++ b/devices/pool-pumps.yaml
@ -8,7 +8,7 @@ substitutions:
  ap_wifi_pwd: !secret pool-pumps-ap-pwd

 packages:
-  device_base: !include ../packages/device_base.yaml
+  device_base: !include ../packages/device_base_esp8266.yaml

 external_components:
  - source:
@ -99,13 +99,15 @@ sensor:
    icon: mdi:flash
    power_id: pool_pump_power
    method: left
-    min_save_interval: 10min
+    filters:
+      - throttle: 1min
  - platform: total_daily_energy
    name: "Pool Cleaner Total Daily Energy"
    icon: mdi:flash
    power_id: pool_cleaner_power
    method: left
-    min_save_interval: 10min
+    filters:
+      - throttle: 1min

 status_led:
  pin:
--- a/packages/device_base.yaml
+++ b/packages/device_base.yaml
@ -1,10 +1,11 @@
 substitutions:
  log_level: none
+  log_baud_rate: '115200'
  wifi_ssid: !secret wifi-ssid
  wifi_password: !secret wifi-password
  ip_subnet: !secret ip-subnet
  ip_gateway: !secret ip-gateway
-  platform: esp8266
+  flash_write_interval: 10min

 esphome:
  name: ${device_id}
@ -13,6 +14,9 @@ esphome:
 ${platform}:
  board: ${board}

+preferences:
+  flash_write_interval: ${flash_write_interval}
+
 packages:
  wifi:             !include wifi/wifi.yaml
  api:              !include api/api.yaml
--- a/packages/device_base_esp32.yaml
+++ b/packages/device_base_esp32.yaml
@ -1,6 +1,6 @@
 substitutions:
  platform: esp32
-  framework_type: arduino
+  framework_type: esp-idf

 esp32:
  framework:
--- a/packages/device_base_esp8266.yaml
+++ b/packages/device_base_esp8266.yaml
@ -0,0 +1,8 @@
+substitutions:
+  platform: esp8266
+
+esp8266:
+  restore_from_flash: true
+
+packages:
+  base:   !include device_base.yaml
--- a/packages/feit_dimmer.yaml
+++ b/packages/feit_dimmer.yaml
@ -10,8 +10,7 @@ external_components:
    components: [ espsense ]

 packages:
-  base:   !include device_base.yaml
-  logger: !include logger/logger_no_serial.yaml
+  base:   !include device_base_esp8266.yaml
  uart:   !include uart/tuya.yaml

 espsense:
@ -26,7 +25,6 @@ sensor:
    icon: mdi:flash
    power_id: power
    method: left
-    min_save_interval: 10min

 time:
  - platform: homeassistant
--- a/packages/feit_dimmer_as_fan.yaml
+++ b/packages/feit_dimmer_as_fan.yaml
@ -1,5 +1,6 @@
 substitutions:
  board: esp01_1m
+  log_baud_rate: '0'

 external_components:
  - source:
@ -10,8 +11,7 @@ external_components:
    components: [ espsense ]

 packages:
-  base:   !include device_base.yaml
-  logger: !include logger/logger_no_serial.yaml
+  base:   !include device_base_esp8266.yaml
  uart:   !include uart/tuya.yaml

 espsense:
@ -37,7 +37,6 @@ sensor:
    name: ${device_name}
    power_id: power
    method: left
-    min_save_interval: 10min

 time:
  - platform: homeassistant
--- a/packages/feit_dimmer_without_power.yaml
+++ b/packages/feit_dimmer_without_power.yaml
@ -8,8 +8,7 @@ external_components:
    components: [ tuya_light_plus ]

 packages:
-  base:   !include device_base.yaml
-  logger: !include logger/logger_no_serial.yaml
+  base:   !include device_base_esp8266.yaml
  uart:   !include uart/tuya.yaml

 tuya:
--- a/packages/logger/logger.yaml
+++ b/packages/logger/logger.yaml
@ -1,2 +1,3 @@
 logger:
  level: ${log_level}
+  baud_rate: ${log_baud_rate}
--- a/packages/logger/logger_no_serial.yaml
+++ b/packages/logger/logger_no_serial.yaml
@ -1,3 +0,0 @@
-logger:
-  level: ${log_level}
-  baud_rate: 0
--- a/packages/shelly_1l.yaml
+++ b/packages/shelly_1l.yaml
@ -11,7 +11,7 @@ external_components:
    components: [ espsense ]

 packages:
-  base:   !include device_base.yaml
+  base:   !include device_base_esp8266.yaml
  logger: !include logger/logger.yaml

 binary_sensor:
@ -60,7 +60,6 @@ sensor:
    name: ${device_name}
    power_id: light_power
    method: left
-    min_save_interval: 10min

 status_led:
  pin: GPIO0
--- a/packages/topgreener_smart_plug.yaml
+++ b/packages/topgreener_smart_plug.yaml
@ -2,14 +2,14 @@
 substitutions:
  board: esp01_1m
  restore_mode: ALWAYS_ON
+  log_baud_rate: '0'

 external_components:
  - source: github://cbpowell/ESPSense
    components: [ espsense ]

 packages:
-  base:   !include device_base.yaml
-  logger: !include logger/logger_no_serial.yaml
+  base:   !include device_base_esp8266.yaml

 binary_sensor:
  - platform: gpio
@ -51,7 +51,6 @@ sensor:
    icon: mdi:flash
    power_id: power
    method: trapezoid
-    min_save_interval: 10min

 status_led:
  pin:
--- a/packages/topgreener_smart_plug_as_fan.yaml
+++ b/packages/topgreener_smart_plug_as_fan.yaml
@ -2,14 +2,14 @@
 substitutions:
  board: esp01_1m
  restore_mode: ALWAYS_ON
+  log_baud_rate: '0'

 external_components:
  - source: github://cbpowell/ESPSense
    components: [ espsense ]

 packages:
-  base:   !include device_base.yaml
-  logger: !include logger/logger_no_serial.yaml
+  base:   !include device_base_esp8266.yaml

 binary_sensor:
  - platform: gpio
@ -61,7 +61,6 @@ sensor:
    name: ${device_name}
    power_id: power
    method: trapezoid
-    min_save_interval: 10min

 status_led:
  pin:
--- a/packages/uart/tuya.yaml
+++ b/packages/uart/tuya.yaml
@ -1,3 +1,6 @@
+substitutions:
+  log_baud_rate: '0'
+
 uart:
  rx_pin: GPIO3
  tx_pin: GPIO1