From 5bc7f2d661e5ffb5699849da5c9218cdc2971749 Mon Sep 17 00:00:00 2001 From: Chris Nussbaum Date: Wed, 15 Feb 2023 13:42:51 -0600 Subject: [PATCH] Update to Folder Structure Required by ESPHome Container (#43) * Move device files from devices folder to root * Update relative file references to match new relative paths * Update README with new folder structure --- README.md | 18 +++++++++--------- ...an.yaml => basement-bathroom-light-fan.yaml | 4 ++-- ...ensor.yaml => basement-bathroom-sensor.yaml | 2 +- ... basement-bathroom-shower-light-heater.yaml | 4 ++-- ...asement-fridge.yaml => basement-fridge.yaml | 2 +- ...ghts-1.yaml => basement-stair-lights-1.yaml | 2 +- ...ghts-2.yaml => basement-stair-lights-2.yaml | 2 +- devices/basement-tv.yaml => basement-tv.yaml | 2 +- devices/coffee-maker.yaml => coffee-maker.yaml | 2 +- .../computer-light.yaml => computer-light.yaml | 2 +- devices/.gitignore | 0 devices/secrets.yaml | 1 - ...g-room-light.yaml => dining-room-light.yaml | 2 +- devices/emporia-vue2.yaml => emporia-vue2.yaml | 2 +- ...y-room-light.yaml => family-room-light.yaml | 2 +- .../family-room-tv.yaml => family-room-tv.yaml | 2 +- ...pit-fountain.yaml => fire-pit-fountain.yaml | 2 +- ...-lights-1.yaml => front-entry-lights-1.yaml | 2 +- ...-lights-2.yaml => front-entry-lights-2.yaml | 2 +- devices/front-lights.yaml => front-lights.yaml | 2 +- .../garage-fridge.yaml => garage-fridge.yaml | 2 +- .../garage-lights.yaml => garage-lights.yaml | 2 +- ...-bar-lights.yaml => kitchen-bar-lights.yaml | 2 +- .../kitchen-fridge.yaml => kitchen-fridge.yaml | 2 +- ...able-light.yaml => kitchen-table-light.yaml | 2 +- ...room-lights.yaml => living-room-lights.yaml | 2 +- ...aster-bath-fan.yaml => master-bath-fan.yaml | 2 +- ...or.yaml => master-bath-hum-temp-sensor.yaml | 2 +- ...-lights-1.yaml => master-bath-lights-1.yaml | 2 +- ...-lights-2.yaml => master-bath-lights-2.yaml | 2 +- devices/master-bed.yaml => master-bed.yaml | 2 +- ...rk-equipment.yaml => network-equipment.yaml | 2 +- devices/office-light.yaml => office-light.yaml | 2 +- packages/feit_dimmer.yaml | 2 +- packages/feit_dimmer_as_fan.yaml | 2 +- packages/feit_dimmer_without_power.yaml | 2 +- packages/shelly_1l.yaml | 2 +- devices/patio-lights.yaml => patio-lights.yaml | 4 ++-- ...o-lights.yaml => pool-and-patio-lights.yaml | 4 ++-- devices/pool-pumps.yaml => pool-pumps.yaml | 4 ++-- ...on.yaml => scripture_of_the_day_mayson.yaml | 2 +- ...a.yaml => scripture_of_the_day_melissa.yaml | 2 +- ...test.yaml => scripture_of_the_day_test.yaml | 4 ++-- devices/sump-pump.yaml => sump-pump.yaml | 2 +- ...ashing-machine.yaml => washing-machine.yaml | 2 +- 45 files changed, 57 insertions(+), 58 deletions(-) rename devices/basement-bathroom-light-fan.yaml => basement-bathroom-light-fan.yaml (93%) rename devices/basement-bathroom-sensor.yaml => basement-bathroom-sensor.yaml (98%) rename devices/basement-bathroom-shower-light-heater.yaml => basement-bathroom-shower-light-heater.yaml (94%) rename devices/basement-fridge.yaml => basement-fridge.yaml (80%) rename devices/basement-stair-lights-1.yaml => basement-stair-lights-1.yaml (96%) rename devices/basement-stair-lights-2.yaml => basement-stair-lights-2.yaml (94%) rename devices/basement-tv.yaml => basement-tv.yaml (78%) rename devices/coffee-maker.yaml => coffee-maker.yaml (98%) rename devices/computer-light.yaml => computer-light.yaml (93%) delete mode 100644 devices/.gitignore delete mode 100644 devices/secrets.yaml rename devices/dining-room-light.yaml => dining-room-light.yaml (93%) rename devices/emporia-vue2.yaml => emporia-vue2.yaml (98%) rename devices/family-room-light.yaml => family-room-light.yaml (93%) rename devices/family-room-tv.yaml => family-room-tv.yaml (80%) rename devices/fire-pit-fountain.yaml => fire-pit-fountain.yaml (94%) rename devices/front-entry-lights-1.yaml => front-entry-lights-1.yaml (93%) rename devices/front-entry-lights-2.yaml => front-entry-lights-2.yaml (91%) rename devices/front-lights.yaml => front-lights.yaml (93%) rename devices/garage-fridge.yaml => garage-fridge.yaml (97%) rename devices/garage-lights.yaml => garage-lights.yaml (84%) rename devices/kitchen-bar-lights.yaml => kitchen-bar-lights.yaml (93%) rename devices/kitchen-fridge.yaml => kitchen-fridge.yaml (80%) rename devices/kitchen-table-light.yaml => kitchen-table-light.yaml (93%) rename devices/living-room-lights.yaml => living-room-lights.yaml (93%) rename devices/master-bath-fan.yaml => master-bath-fan.yaml (82%) rename devices/master-bath-hum-temp-sensor.yaml => master-bath-hum-temp-sensor.yaml (95%) rename devices/master-bath-lights-1.yaml => master-bath-lights-1.yaml (93%) rename devices/master-bath-lights-2.yaml => master-bath-lights-2.yaml (91%) rename devices/master-bed.yaml => master-bed.yaml (98%) rename devices/network-equipment.yaml => network-equipment.yaml (81%) rename devices/office-light.yaml => office-light.yaml (93%) rename devices/patio-lights.yaml => patio-lights.yaml (89%) rename devices/pool-and-patio-lights.yaml => pool-and-patio-lights.yaml (95%) rename devices/pool-pumps.yaml => pool-pumps.yaml (96%) rename devices/scripture_of_the_day_mayson.yaml => scripture_of_the_day_mayson.yaml (63%) rename devices/scripture_of_the_day_melissa.yaml => scripture_of_the_day_melissa.yaml (64%) rename devices/scripture_of_the_day_test.yaml => scripture_of_the_day_test.yaml (91%) rename devices/sump-pump.yaml => sump-pump.yaml (77%) rename devices/washing-machine.yaml => washing-machine.yaml (80%) diff --git a/README.md b/README.md index 86b842f..9a07e45 100644 --- a/README.md +++ b/README.md @@ -10,14 +10,14 @@ Home Assistant is open source home automation that puts local control and privac ## Folder Structure -* `build` - Technically not included in the repo but all of my devices are configured with this as their build path -* `components` - Custom components -* `custom` - Other custom code that are not components -* `devices` - Yaml files for my devices -* `images` - Pictures of some of my devices -* `other` - Other misc files -* `packages` - Shared packages used by my devices -* `scripts` - Couple of PowerShell scripts for managing the repo +* `/` - Yaml files for my devices and other core files +* `/build` - Technically not included in the repo but all of my devices are configured with this as their build path +* `/components` - Custom components +* `/custom` - Other custom code that are not components +* `/images` - Pictures of some of my devices +* `/other` - Other misc files +* `/packages` - Shared packages used by my devices +* `/scripts` - Couple of PowerShell scripts for managing the repo ## Secrets Management @@ -30,7 +30,7 @@ I have been working on updating most of my custom code into components that can ### Binary Light With Power This an enhanced version of the standard [binary light](https://esphome.io/components/light/binary.html) component that adds an option to include a sensor to report current power usage based on a configured wattage of the light(s) it controls. More details on how to use this component are available [here](./components/binary_light_with_power/README.md). -### GPIO Light With Power +### GPIO Switch With Power This an enhanced version of the standard [gpio switch](https://esphome.io/components/switch/gpio.html) component that adds an option to include a sensor to report current power usage based on a configured wattage of the device(s) it controls. More details on how to use this component are available [here](./components/gpio_switch_with_power/README.md). ### Pool Controller diff --git a/devices/basement-bathroom-light-fan.yaml b/basement-bathroom-light-fan.yaml similarity index 93% rename from devices/basement-bathroom-light-fan.yaml rename to basement-bathroom-light-fan.yaml index 6cda377..fe4b1ae 100644 --- a/devices/basement-bathroom-light-fan.yaml +++ b/basement-bathroom-light-fan.yaml @@ -8,12 +8,12 @@ substitutions: ap_wifi_pwd: !secret basement-bathroom-light-fan-ap-pwd packages: - device_base: !include ../packages/device_base_esp8266.yaml + device_base: !include ./packages/device_base_esp8266.yaml external_components: - source: type: local - path: ../components + path: ./components components: [ binary_light_with_power ] binary_sensor: diff --git a/devices/basement-bathroom-sensor.yaml b/basement-bathroom-sensor.yaml similarity index 98% rename from devices/basement-bathroom-sensor.yaml rename to basement-bathroom-sensor.yaml index 2e59e7f..24a5448 100644 --- a/devices/basement-bathroom-sensor.yaml +++ b/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_esp8266.yaml + device_base: !include ./packages/device_base_esp8266.yaml esphome: on_boot: diff --git a/devices/basement-bathroom-shower-light-heater.yaml b/basement-bathroom-shower-light-heater.yaml similarity index 94% rename from devices/basement-bathroom-shower-light-heater.yaml rename to basement-bathroom-shower-light-heater.yaml index a091a64..c917dfd 100644 --- a/devices/basement-bathroom-shower-light-heater.yaml +++ b/basement-bathroom-shower-light-heater.yaml @@ -8,12 +8,12 @@ substitutions: ap_wifi_pwd: !secret basement-bathroom-shower-light-heater-ap-pwd packages: - device_base: !include ../packages/device_base_esp8266.yaml + device_base: !include ./packages/device_base_esp8266.yaml external_components: - source: type: local - path: ../components + path: ./components components: [ binary_light_with_power, gpio_switch_with_power ] binary_sensor: diff --git a/devices/basement-fridge.yaml b/basement-fridge.yaml similarity index 80% rename from devices/basement-fridge.yaml rename to basement-fridge.yaml index 215ef8d..103b6fa 100644 --- a/devices/basement-fridge.yaml +++ b/basement-fridge.yaml @@ -7,4 +7,4 @@ substitutions: ap_wifi_pwd: !secret basement-fridge-ap-pwd packages: - feit_dimmer: !include ../packages/topgreener_smart_plug.yaml + feit_dimmer: !include ./packages/topgreener_smart_plug.yaml diff --git a/devices/basement-stair-lights-1.yaml b/basement-stair-lights-1.yaml similarity index 96% rename from devices/basement-stair-lights-1.yaml rename to basement-stair-lights-1.yaml index 8fad6e9..abc508d 100644 --- a/devices/basement-stair-lights-1.yaml +++ b/basement-stair-lights-1.yaml @@ -15,7 +15,7 @@ script: entity_id: switch.basement_tv, switch.xbox, light.basement_tv, light.basement, light.bar, switch.pool_table_light, light.basement_bathroom_light, light.basement_shower_light packages: - feit_dimmer: !include ../packages/feit_dimmer.yaml + feit_dimmer: !include ./packages/feit_dimmer.yaml light: - platform: tuya_light_plus diff --git a/devices/basement-stair-lights-2.yaml b/basement-stair-lights-2.yaml similarity index 94% rename from devices/basement-stair-lights-2.yaml rename to basement-stair-lights-2.yaml index e31b765..6d1f0d7 100644 --- a/devices/basement-stair-lights-2.yaml +++ b/basement-stair-lights-2.yaml @@ -15,7 +15,7 @@ script: entity_id: switch.basement_tv, switch.xbox, light.basement_tv, light.basement, light.bar, switch.pool_table_light, light.basement_bathroom_light, light.basement_shower_light packages: - feit_dimmer: !include ../packages/feit_dimmer_without_power.yaml + feit_dimmer: !include ./packages/feit_dimmer_without_power.yaml light: - platform: tuya_light_plus diff --git a/devices/basement-tv.yaml b/basement-tv.yaml similarity index 78% rename from devices/basement-tv.yaml rename to basement-tv.yaml index c97e842..255e02c 100644 --- a/devices/basement-tv.yaml +++ b/basement-tv.yaml @@ -7,4 +7,4 @@ substitutions: ap_wifi_pwd: !secret basement-tv-ap-pwd packages: - feit_dimmer: !include ../packages/topgreener_smart_plug.yaml + feit_dimmer: !include ./packages/topgreener_smart_plug.yaml diff --git a/devices/coffee-maker.yaml b/coffee-maker.yaml similarity index 98% rename from devices/coffee-maker.yaml rename to coffee-maker.yaml index 810e42f..b90ab93 100644 --- a/devices/coffee-maker.yaml +++ b/coffee-maker.yaml @@ -8,7 +8,7 @@ substitutions: ap_wifi_pwd: !secret coffee-maker-ap-pwd packages: - device_base: !include ../packages/device_base_esp8266.yaml + device_base: !include ./packages/device_base_esp8266.yaml binary_sensor: - platform: gpio diff --git a/devices/computer-light.yaml b/computer-light.yaml similarity index 93% rename from devices/computer-light.yaml rename to computer-light.yaml index 6996646..fbaa036 100644 --- a/devices/computer-light.yaml +++ b/computer-light.yaml @@ -7,7 +7,7 @@ substitutions: ap_wifi_pwd: !secret computer-light-ap-pwd packages: - feit_dimmer: !include ../packages/feit_dimmer.yaml + feit_dimmer: !include ./packages/feit_dimmer.yaml light: - platform: tuya_light_plus diff --git a/devices/.gitignore b/devices/.gitignore deleted file mode 100644 index e69de29..0000000 diff --git a/devices/secrets.yaml b/devices/secrets.yaml deleted file mode 100644 index 8bf34eb..0000000 --- a/devices/secrets.yaml +++ /dev/null @@ -1 +0,0 @@ -<<: !include ../secrets.yaml diff --git a/devices/dining-room-light.yaml b/dining-room-light.yaml similarity index 93% rename from devices/dining-room-light.yaml rename to dining-room-light.yaml index 2a2f4a6..eb2c8df 100644 --- a/devices/dining-room-light.yaml +++ b/dining-room-light.yaml @@ -7,7 +7,7 @@ substitutions: ap_wifi_pwd: !secret dining-room-light-ap-pwd packages: - feit_dimmer: !include ../packages/feit_dimmer.yaml + feit_dimmer: !include ./packages/feit_dimmer.yaml light: - platform: tuya_light_plus diff --git a/devices/emporia-vue2.yaml b/emporia-vue2.yaml similarity index 98% rename from devices/emporia-vue2.yaml rename to emporia-vue2.yaml index 8d3ac37..095047f 100644 --- a/devices/emporia-vue2.yaml +++ b/emporia-vue2.yaml @@ -8,7 +8,7 @@ substitutions: ap_wifi_pwd: !secret emporia-vue2-ap-pwd packages: - device_base: !include ../packages/device_base_esp32.yaml + device_base: !include ./packages/device_base_esp32.yaml wifi: power_save_mode: light diff --git a/devices/family-room-light.yaml b/family-room-light.yaml similarity index 93% rename from devices/family-room-light.yaml rename to family-room-light.yaml index 391e8c7..1f9afad 100644 --- a/devices/family-room-light.yaml +++ b/family-room-light.yaml @@ -7,7 +7,7 @@ substitutions: ap_wifi_pwd: !secret family-room-light-ap-pwd packages: - feit_dimmer: !include ../packages/feit_dimmer.yaml + feit_dimmer: !include ./packages/feit_dimmer.yaml light: - platform: tuya_light_plus diff --git a/devices/family-room-tv.yaml b/family-room-tv.yaml similarity index 80% rename from devices/family-room-tv.yaml rename to family-room-tv.yaml index 79a71b5..abf499b 100644 --- a/devices/family-room-tv.yaml +++ b/family-room-tv.yaml @@ -7,4 +7,4 @@ substitutions: ap_wifi_pwd: !secret family-room-tv-ap-pwd packages: - feit_dimmer: !include ../packages/topgreener_smart_plug.yaml + feit_dimmer: !include ./packages/topgreener_smart_plug.yaml diff --git a/devices/fire-pit-fountain.yaml b/fire-pit-fountain.yaml similarity index 94% rename from devices/fire-pit-fountain.yaml rename to fire-pit-fountain.yaml index 42823c2..6998e59 100644 --- a/devices/fire-pit-fountain.yaml +++ b/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_esp8266.yaml + device_base: !include ./packages/device_base_esp8266.yaml binary_sensor: - platform: gpio diff --git a/devices/front-entry-lights-1.yaml b/front-entry-lights-1.yaml similarity index 93% rename from devices/front-entry-lights-1.yaml rename to front-entry-lights-1.yaml index a021240..85cc618 100644 --- a/devices/front-entry-lights-1.yaml +++ b/front-entry-lights-1.yaml @@ -7,7 +7,7 @@ substitutions: ap_wifi_pwd: !secret front-entry-lights-ap-pwd packages: - feit_dimmer: !include ../packages/feit_dimmer.yaml + feit_dimmer: !include ./packages/feit_dimmer.yaml light: - platform: tuya_light_plus diff --git a/devices/front-entry-lights-2.yaml b/front-entry-lights-2.yaml similarity index 91% rename from devices/front-entry-lights-2.yaml rename to front-entry-lights-2.yaml index fad974a..214b4bd 100644 --- a/devices/front-entry-lights-2.yaml +++ b/front-entry-lights-2.yaml @@ -7,7 +7,7 @@ substitutions: ap_wifi_pwd: !secret front-entry-lights-2-ap-pwd packages: - feit_dimmer: !include ../packages/feit_dimmer_without_power.yaml + feit_dimmer: !include ./packages/feit_dimmer_without_power.yaml light: - platform: tuya_light_plus diff --git a/devices/front-lights.yaml b/front-lights.yaml similarity index 93% rename from devices/front-lights.yaml rename to front-lights.yaml index fe7bcf3..5446235 100644 --- a/devices/front-lights.yaml +++ b/front-lights.yaml @@ -7,7 +7,7 @@ substitutions: ap_wifi_pwd: !secret front-lights-ap-pwd packages: - feit_dimmer: !include ../packages/feit_dimmer.yaml + feit_dimmer: !include ./packages/feit_dimmer.yaml light: - platform: tuya_light_plus diff --git a/devices/garage-fridge.yaml b/garage-fridge.yaml similarity index 97% rename from devices/garage-fridge.yaml rename to garage-fridge.yaml index 5bf9f20..a30e8d6 100644 --- a/devices/garage-fridge.yaml +++ b/garage-fridge.yaml @@ -9,7 +9,7 @@ substitutions: log_baud_rate: '0' packages: - device_base: !include ../packages/device_base_esp32.yaml + device_base: !include ./packages/device_base_esp32.yaml wifi: power_save_mode: light diff --git a/devices/garage-lights.yaml b/garage-lights.yaml similarity index 84% rename from devices/garage-lights.yaml rename to garage-lights.yaml index 326e3e6..5a58c6b 100644 --- a/devices/garage-lights.yaml +++ b/garage-lights.yaml @@ -8,4 +8,4 @@ substitutions: light_wattage: '378' packages: - shelly_1l: !include ../packages/shelly_1l.yaml + shelly_1l: !include ./packages/shelly_1l.yaml diff --git a/devices/kitchen-bar-lights.yaml b/kitchen-bar-lights.yaml similarity index 93% rename from devices/kitchen-bar-lights.yaml rename to kitchen-bar-lights.yaml index c08cdc6..7657444 100644 --- a/devices/kitchen-bar-lights.yaml +++ b/kitchen-bar-lights.yaml @@ -7,7 +7,7 @@ substitutions: ap_wifi_pwd: !secret kitchen-bar-lights-ap-pwd packages: - feit_dimmer: !include ../packages/feit_dimmer.yaml + feit_dimmer: !include ./packages/feit_dimmer.yaml light: - platform: tuya_light_plus diff --git a/devices/kitchen-fridge.yaml b/kitchen-fridge.yaml similarity index 80% rename from devices/kitchen-fridge.yaml rename to kitchen-fridge.yaml index fc33cbd..1fd88f4 100644 --- a/devices/kitchen-fridge.yaml +++ b/kitchen-fridge.yaml @@ -7,4 +7,4 @@ substitutions: ap_wifi_pwd: !secret kitchen-fridge-ap-pwd packages: - feit_dimmer: !include ../packages/topgreener_smart_plug.yaml + feit_dimmer: !include ./packages/topgreener_smart_plug.yaml diff --git a/devices/kitchen-table-light.yaml b/kitchen-table-light.yaml similarity index 93% rename from devices/kitchen-table-light.yaml rename to kitchen-table-light.yaml index 3c58652..9d65f48 100644 --- a/devices/kitchen-table-light.yaml +++ b/kitchen-table-light.yaml @@ -7,7 +7,7 @@ substitutions: ap_wifi_pwd: !secret kitchen-table-light-ap-pwd packages: - feit_dimmer: !include ../packages/feit_dimmer.yaml + feit_dimmer: !include ./packages/feit_dimmer.yaml light: - platform: tuya_light_plus diff --git a/devices/living-room-lights.yaml b/living-room-lights.yaml similarity index 93% rename from devices/living-room-lights.yaml rename to living-room-lights.yaml index b8c6f3a..9357de2 100644 --- a/devices/living-room-lights.yaml +++ b/living-room-lights.yaml @@ -7,7 +7,7 @@ substitutions: ap_wifi_pwd: !secret living-room-lights-ap-pwd packages: - feit_dimmer: !include ../packages/feit_dimmer.yaml + feit_dimmer: !include ./packages/feit_dimmer.yaml light: - platform: tuya_light_plus diff --git a/devices/master-bath-fan.yaml b/master-bath-fan.yaml similarity index 82% rename from devices/master-bath-fan.yaml rename to master-bath-fan.yaml index cc7d184..50f6590 100644 --- a/devices/master-bath-fan.yaml +++ b/master-bath-fan.yaml @@ -8,4 +8,4 @@ substitutions: fan_wattage: "26.6" packages: - device_base: !include ../packages/feit_dimmer_as_fan.yaml + device_base: !include ./packages/feit_dimmer_as_fan.yaml diff --git a/devices/master-bath-hum-temp-sensor.yaml b/master-bath-hum-temp-sensor.yaml similarity index 95% rename from devices/master-bath-hum-temp-sensor.yaml rename to master-bath-hum-temp-sensor.yaml index d8957c3..224bc5e 100644 --- a/devices/master-bath-hum-temp-sensor.yaml +++ b/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_esp8266.yaml + device_base: !include ./packages/device_base_esp8266.yaml binary_sensor: - platform: template diff --git a/devices/master-bath-lights-1.yaml b/master-bath-lights-1.yaml similarity index 93% rename from devices/master-bath-lights-1.yaml rename to master-bath-lights-1.yaml index 1971818..59c3575 100644 --- a/devices/master-bath-lights-1.yaml +++ b/master-bath-lights-1.yaml @@ -7,7 +7,7 @@ substitutions: ap_wifi_pwd: !secret master-bath-lights-ap-pwd packages: - feit_dimmer: !include ../packages/feit_dimmer.yaml + feit_dimmer: !include ./packages/feit_dimmer.yaml light: - platform: tuya_light_plus diff --git a/devices/master-bath-lights-2.yaml b/master-bath-lights-2.yaml similarity index 91% rename from devices/master-bath-lights-2.yaml rename to master-bath-lights-2.yaml index cde7005..ea341d0 100644 --- a/devices/master-bath-lights-2.yaml +++ b/master-bath-lights-2.yaml @@ -7,7 +7,7 @@ substitutions: ap_wifi_pwd: !secret master-bath-lights-2-ap-pwd packages: - feit_dimmer: !include ../packages/feit_dimmer_without_power.yaml + feit_dimmer: !include ./packages/feit_dimmer_without_power.yaml light: - platform: tuya_light_plus diff --git a/devices/master-bed.yaml b/master-bed.yaml similarity index 98% rename from devices/master-bed.yaml rename to master-bed.yaml index b86c7e7..e629bc6 100644 --- a/devices/master-bed.yaml +++ b/master-bed.yaml @@ -8,7 +8,7 @@ substitutions: ap_wifi_pwd: !secret master-bed-ap-pwd packages: - device_base: !include ../packages/device_base_esp8266.yaml + device_base: !include ./packages/device_base_esp8266.yaml esphome: includes: diff --git a/devices/network-equipment.yaml b/network-equipment.yaml similarity index 81% rename from devices/network-equipment.yaml rename to network-equipment.yaml index b5142a7..bfbb3c1 100644 --- a/devices/network-equipment.yaml +++ b/network-equipment.yaml @@ -7,4 +7,4 @@ substitutions: ap_wifi_pwd: !secret network-equipment-ap-pwd packages: - feit_dimmer: !include ../packages/topgreener_smart_plug.yaml + feit_dimmer: !include ./packages/topgreener_smart_plug.yaml diff --git a/devices/office-light.yaml b/office-light.yaml similarity index 93% rename from devices/office-light.yaml rename to office-light.yaml index 405a09d..aebbd79 100644 --- a/devices/office-light.yaml +++ b/office-light.yaml @@ -7,7 +7,7 @@ substitutions: ap_wifi_pwd: !secret office-light-ap-pwd packages: - feit_dimmer: !include ../packages/feit_dimmer.yaml + feit_dimmer: !include ./packages/feit_dimmer.yaml light: - platform: tuya_light_plus diff --git a/packages/feit_dimmer.yaml b/packages/feit_dimmer.yaml index 689e2e4..0b7665f 100644 --- a/packages/feit_dimmer.yaml +++ b/packages/feit_dimmer.yaml @@ -4,7 +4,7 @@ substitutions: external_components: - source: type: local - path: ../components + path: ./components components: [ tuya_light_plus ] packages: diff --git a/packages/feit_dimmer_as_fan.yaml b/packages/feit_dimmer_as_fan.yaml index fde44b5..6bbad95 100644 --- a/packages/feit_dimmer_as_fan.yaml +++ b/packages/feit_dimmer_as_fan.yaml @@ -5,7 +5,7 @@ substitutions: external_components: - source: type: local - path: ../components + path: ./components components: [ tuya_dimmer_as_fan ] packages: diff --git a/packages/feit_dimmer_without_power.yaml b/packages/feit_dimmer_without_power.yaml index f21bede..adb4ce1 100644 --- a/packages/feit_dimmer_without_power.yaml +++ b/packages/feit_dimmer_without_power.yaml @@ -4,7 +4,7 @@ substitutions: external_components: - source: type: local - path: ../components + path: ./components components: [ tuya_light_plus ] packages: diff --git a/packages/shelly_1l.yaml b/packages/shelly_1l.yaml index 2116d6e..16116a1 100644 --- a/packages/shelly_1l.yaml +++ b/packages/shelly_1l.yaml @@ -5,7 +5,7 @@ substitutions: external_components: - source: type: local - path: ../components + path: ./components components: [ binary_light_with_power ] packages: diff --git a/devices/patio-lights.yaml b/patio-lights.yaml similarity index 89% rename from devices/patio-lights.yaml rename to patio-lights.yaml index b18c905..f797e70 100644 --- a/devices/patio-lights.yaml +++ b/patio-lights.yaml @@ -8,12 +8,12 @@ substitutions: ap_wifi_pwd: !secret patio-lights-ap-pwd packages: - device_base: !include ../packages/device_base_esp8266.yaml + device_base: !include ./packages/device_base_esp8266.yaml external_components: - source: type: local - path: ../components + path: ./components components: [ binary_light_with_power ] light: diff --git a/devices/pool-and-patio-lights.yaml b/pool-and-patio-lights.yaml similarity index 95% rename from devices/pool-and-patio-lights.yaml rename to pool-and-patio-lights.yaml index 424b97d..0c130b0 100644 --- a/devices/pool-and-patio-lights.yaml +++ b/pool-and-patio-lights.yaml @@ -8,12 +8,12 @@ substitutions: ap_wifi_pwd: !secret pool-and-patio-lights-ap-pwd packages: - device_base: !include ../packages/device_base_esp8266.yaml + device_base: !include ./packages/device_base_esp8266.yaml external_components: - source: type: local - path: ../components + path: ./components components: [ treo_led_pool_light, binary_light_with_power ] binary_sensor: diff --git a/devices/pool-pumps.yaml b/pool-pumps.yaml similarity index 96% rename from devices/pool-pumps.yaml rename to pool-pumps.yaml index 85b4f3a..3fc01c3 100644 --- a/devices/pool-pumps.yaml +++ b/pool-pumps.yaml @@ -8,12 +8,12 @@ substitutions: ap_wifi_pwd: !secret pool-pumps-ap-pwd packages: - device_base: !include ../packages/device_base_esp8266.yaml + device_base: !include ./packages/device_base_esp8266.yaml external_components: - source: type: local - path: ../components + path: ./components components: [ pool_controller ] i2c: diff --git a/devices/scripture_of_the_day_mayson.yaml b/scripture_of_the_day_mayson.yaml similarity index 63% rename from devices/scripture_of_the_day_mayson.yaml rename to scripture_of_the_day_mayson.yaml index ae0d3a5..8bcf0b2 100644 --- a/devices/scripture_of_the_day_mayson.yaml +++ b/scripture_of_the_day_mayson.yaml @@ -3,4 +3,4 @@ substitutions: device_name: Scripture of the Day Mayson packages: - device_base: !include ../packages/scripture_of_the_day.yaml + device_base: !include ./packages/scripture_of_the_day.yaml diff --git a/devices/scripture_of_the_day_melissa.yaml b/scripture_of_the_day_melissa.yaml similarity index 64% rename from devices/scripture_of_the_day_melissa.yaml rename to scripture_of_the_day_melissa.yaml index bc16c41..3fef000 100644 --- a/devices/scripture_of_the_day_melissa.yaml +++ b/scripture_of_the_day_melissa.yaml @@ -3,4 +3,4 @@ substitutions: device_name: Scripture of the Day Melissa packages: - device_base: !include ../packages/scripture_of_the_day.yaml + device_base: !include ./packages/scripture_of_the_day.yaml diff --git a/devices/scripture_of_the_day_test.yaml b/scripture_of_the_day_test.yaml similarity index 91% rename from devices/scripture_of_the_day_test.yaml rename to scripture_of_the_day_test.yaml index ff19db9..a0962bd 100644 --- a/devices/scripture_of_the_day_test.yaml +++ b/scripture_of_the_day_test.yaml @@ -15,8 +15,8 @@ esphome: build_path: ../build/${device_id} packages: - wifi: !include ../packages/wifi/wifi_dhcp.yaml - logger: !include ../packages/logger/logger.yaml + wifi: !include ./packages/wifi/wifi_dhcp.yaml + logger: !include ./packages/logger/logger.yaml external_components: - source: diff --git a/devices/sump-pump.yaml b/sump-pump.yaml similarity index 77% rename from devices/sump-pump.yaml rename to sump-pump.yaml index 1b54172..cbb91c2 100644 --- a/devices/sump-pump.yaml +++ b/sump-pump.yaml @@ -7,4 +7,4 @@ substitutions: ap_wifi_pwd: !secret sump-pump-ap-pwd packages: - feit_dimmer: !include ../packages/topgreener_smart_plug.yaml + feit_dimmer: !include ./packages/topgreener_smart_plug.yaml diff --git a/devices/washing-machine.yaml b/washing-machine.yaml similarity index 80% rename from devices/washing-machine.yaml rename to washing-machine.yaml index 6407b2e..85971fa 100644 --- a/devices/washing-machine.yaml +++ b/washing-machine.yaml @@ -7,4 +7,4 @@ substitutions: ap_wifi_pwd: !secret washing-machine-ap-pwd packages: - feit_dimmer: !include ../packages/topgreener_smart_plug.yaml + feit_dimmer: !include ./packages/topgreener_smart_plug.yaml