diff --git a/README.md b/README.md index 9ecc48c..234ca60 100644 --- a/README.md +++ b/README.md @@ -60,6 +60,8 @@ > The following devices are Feit Dimmers: > > * Basement Stair Lights/Basement Stair Lights 2 > > * Computer Light +> > * Dining Room Light > > * Family Room Light +> > * Kitchen Bar Lights > > * Kitchen Table Light > > * Office Light diff --git a/basement_bathroom_light_fan.yaml b/basement_bathroom_light_fan.yaml index 462d94d..2ae6738 100644 --- a/basement_bathroom_light_fan.yaml +++ b/basement_bathroom_light_fan.yaml @@ -23,7 +23,7 @@ binary_sensor: mode: INPUT_PULLUP on_press: then: - - switch.toggle: light + - light.toggle: the_light - platform: gpio id: fan_button pin: @@ -39,10 +39,19 @@ fan: output: fan_output name: "Basement Bathroom Fan" +light: + - platform: binary + id: the_light + name: "Basement Bathroom Light" + output: light_output + output: - platform: gpio id: fan_output pin: 4 + - platform: gpio + id: light_output + pin: 13 sensor: - !include common/sensor/uptime.yaml @@ -55,11 +64,6 @@ status_led: switch: - !include common/switch/restart.yaml - - platform: gpio - id: light - name: "Basement Bathroom Light" - icon: mdi:lightbulb - pin: 13 text_sensor: - !include common/text_sensor/version.yaml diff --git a/basement_bathroom_sensor.yaml b/basement_bathroom_sensor.yaml index cc1b509..6e1016c 100644 --- a/basement_bathroom_sensor.yaml +++ b/basement_bathroom_sensor.yaml @@ -56,12 +56,12 @@ binary_sensor: - homeassistant.service: service: homeassistant.turn_on data: - entity_id: switch.basement_bathroom_light + entity_id: light.basement_bathroom_light else: - homeassistant.service: service: homeassistant.turn_on data: - entity_id: switch.basement_shower_light + entity_id: light.basement_shower_light - platform: template id: motion_delay_30s @@ -107,11 +107,11 @@ binary_sensor: - homeassistant.service: service: homeassistant.turn_off data: - entity_id: switch.basement_bathroom_light + entity_id: light.basement_bathroom_light - homeassistant.service: service: homeassistant.turn_off data: - entity_id: switch.basement_shower_light + entity_id: light.basement_shower_light - homeassistant.service: service: homeassistant.turn_off data: @@ -139,11 +139,11 @@ binary_sensor: - platform: homeassistant id: light - entity_id: switch.basement_bathroom_light + entity_id: light.basement_bathroom_light - platform: homeassistant id: shower_light - entity_id: switch.basement_shower_light + entity_id: light.basement_shower_light - platform: homeassistant id: heat diff --git a/basement_bathroom_shower_light_heater.yaml b/basement_bathroom_shower_light_heater.yaml index 7c182ba..33505c3 100644 --- a/basement_bathroom_shower_light_heater.yaml +++ b/basement_bathroom_shower_light_heater.yaml @@ -23,7 +23,7 @@ binary_sensor: mode: INPUT_PULLUP on_press: then: - - switch.toggle: light + - light.toggle: the_light - platform: gpio id: heater_button pin: @@ -33,6 +33,17 @@ binary_sensor: then: - switch.toggle: heater +light: + - platform: binary + id: the_light + name: "Basement Shower Light" + output: light_output + +output: + - platform: gpio + id: light_output + pin: 13 + sensor: - !include common/sensor/uptime.yaml - !include common/sensor/wifi.yaml @@ -44,11 +55,6 @@ status_led: switch: - !include common/switch/restart.yaml - - platform: gpio - id: light - name: "Basement Shower Light" - icon: mdi:lightbulb - pin: 13 - platform: gpio id: heater name: "Basement Bathroom Heater" diff --git a/common/wifi.yaml b/common/wifi.yaml index 546205e..5fed11c 100644 --- a/common/wifi.yaml +++ b/common/wifi.yaml @@ -2,6 +2,7 @@ wifi: ssid: !secret wifi_ssid password: !secret wifi_password fast_connect: true + power_save_mode: none manual_ip: static_ip: ${ip_address} subnet: !secret ip_subnet diff --git a/dining_room_light.yaml b/dining_room_light.yaml index 86f3974..2f6bfc7 100644 --- a/dining_room_light.yaml +++ b/dining_room_light.yaml @@ -7,38 +7,9 @@ substitutions: ota_pwd: !secret dining_room_light_ota_pwd api_pwd: !secret dining_room_light_api_pwd ap_wifi_pwd: !secret dining_room_light_ap_wifi_pwd + day_brightness: "1" + night_brightness: ".03" + night_auto_off_time: 15min + linked_lights: "" - day_level: '100' - night_level: '10' - -esphome: - <<: !include common/esphome.yaml - includes: - - gosund_sw2_dimmer.h - -<<: !include common/common_gosund_dimmer.yaml -<<: !include common/logger/logger_debug_no_serial.yaml - -binary_sensor: - - !include common/binary_sensor/status.yaml - - !include common/binary_sensor/day_night.yaml - - !include common/binary_sensor/gosund_dimmer_button.yaml - -sensor: - - !include common/sensor/uptime.yaml - - !include common/sensor/wifi.yaml - -switch: - - !include common/switch/restart.yaml - -text_sensor: - - !include common/text_sensor/version.yaml - - !include common/text_sensor/wifi.yaml - -script: - - id: single_tap - then: - - logger.log: "Single Tap" - - id: double_tap - then: - - logger.log: "Double Tap" +<<: !include common/device_tuya_dimmer.yaml diff --git a/kitchen_bar_lights.yaml b/kitchen_bar_lights.yaml new file mode 100644 index 0000000..e4d3cd2 --- /dev/null +++ b/kitchen_bar_lights.yaml @@ -0,0 +1,15 @@ +substitutions: + device_id: kitchen_bar_lights + device_name: Kitchen Bar Lights + platform: ESP8266 + board: esp01_1m + ip_address: !secret kitchen_bar_lights_ip + ota_pwd: !secret kitchen_bar_lights_ota_pwd + api_pwd: !secret kitchen_bar_lights_api_pwd + ap_wifi_pwd: !secret kitchen_bar_lights_ap_wifi_pwd + day_brightness: "1" + night_brightness: ".03" + night_auto_off_time: 15min + linked_lights: "" + +<<: !include common/device_tuya_dimmer.yaml diff --git a/patio_and_pool_lights.yaml b/patio_and_pool_lights.yaml index ace7d5c..146c2ae 100644 --- a/patio_and_pool_lights.yaml +++ b/patio_and_pool_lights.yaml @@ -28,7 +28,7 @@ binary_sensor: - homeassistant.service: service: homeassistant.toggle data: - entity_id: switch.patio_lights + entity_id: light.patio_lights - platform: gpio id: pool_lights_button pin: @@ -48,7 +48,7 @@ binary_sensor: Treo->next_color(); - platform: homeassistant id: patio_lights - entity_id: switch.patio_lights + entity_id: light.patio_lights on_press: then: - switch.turn_on: patio_lights_indicator diff --git a/patio_lights.yaml b/patio_lights.yaml index 6321b1c..5f5983e 100644 --- a/patio_lights.yaml +++ b/patio_lights.yaml @@ -17,18 +17,22 @@ esphome: binary_sensor: - !include common/binary_sensor/status.yaml +light: + - platform: binary + name: "Patio Lights" + output: patio_lights_output + +output: + - platform: gpio + id: patio_lights_output + pin: D1 + sensor: - !include common/sensor/uptime.yaml - !include common/sensor/wifi.yaml switch: - !include common/switch/restart.yaml - - platform: gpio - id: patio_lights - name: "Patio Lights" - icon: mdi:lightbulb - pin: D1 - inverted: false text_sensor: - !include common/text_sensor/version.yaml