Fix includes

This commit is contained in:
ChNussbaum 2019-12-30 19:44:42 -06:00
parent bba03c156d
commit 111051b70f
15 changed files with 48 additions and 32 deletions

View File

@ -3,6 +3,10 @@ substitutions:
device_name:
platform:
board:
ip_address: !secret _ip
ota_pwd: !secret _ota_pwd
api_pwd: !secret _api_pwd
ap_wifi_pwd: !secret _ap_wifi_pwd
esphome:
<<: !include common/esphome.yaml
@ -11,13 +15,15 @@ esphome:
<<: !include common/logger.yaml
binary_sensor:
<<: !include common/binary_sensors.yaml
- !include common/binary_sensor/status.yaml
sensor:
<<: !include common/sensors.yaml
- !include common/sensor/uptime.yaml
- !include common/sensor/wifi.yaml
switch:
<<: !include common/switches.yaml
- !include common/switch/restart.yaml
text_sensor:
<<: !include common/text_sensors.yaml
- !include common/text_sensor/version.yaml
- !include common/text_sensor/wifi.yaml

View File

@ -3,6 +3,10 @@ substitutions:
device_name: Coffee Maker
platform: ESP8266
board: nodemcuv2
ip_address: !secret coffee_maker_ip
ota_pwd: !secret coffee_maker_ota_pwd
api_pwd: !secret coffee_maker_api_pwd
ap_wifi_pwd: !secret coffee_maker_ap_wifi_pwd
esphome:
<<: !include common/esphome.yaml
@ -11,7 +15,7 @@ esphome:
<<: !include common/logger.yaml
binary_sensor:
<<: !include common/binary_sensors.yaml
- !include common/binary_sensor/status.yaml
- platform: gpio
id: power_light
pin:
@ -80,13 +84,15 @@ interval:
}
sensor:
<<: !include common/sensors.yaml
- !include common/sensor/uptime.yaml
- !include common/sensor/wifi.yaml
switch:
<<: !include common/switches.yaml
- !include common/switch/restart.yaml
- platform: template
id: power_switch
name: "Coffee Maker"
icon: mdi:coffee
lambda: 'return id(power_light).state;'
turn_on_action:
then:
@ -113,6 +119,7 @@ switch:
- platform: template
id: bold_switch
name: "Coffee Maker Bold Setting"
icon: mdi:coffee
lambda: 'return id(bold_light).state;'
turn_on_action:
then:
@ -138,4 +145,5 @@ switch:
inverted: true
text_sensor:
<<: !include common/text_sensors.yaml
- !include common/text_sensor/version.yaml
- !include common/text_sensor/wifi.yaml

View File

@ -1,2 +1,3 @@
api:
password: !secret ${device_id}_api_pwd:
password: ${api_pwd}

View File

@ -1 +0,0 @@
- !include common/binary_sensor/status.yaml

View File

@ -1,2 +1,2 @@
ota:
password: !secret ${device_id}_ota_pwd:
password: ${ota_pwd}

View File

@ -1,2 +1,2 @@
- platform: uptime
name: ${device_name} Uptime
platform: uptime
name: ${device_name} Uptime

View File

@ -1,2 +1,2 @@
- platform: wifi_signal
name: ${device_name} WiFi Signal
platform: wifi_signal
name: ${device_name} WiFi Signal

View File

@ -1,2 +0,0 @@
- !include common/sensor/uptime.yaml
- !include common/sensor/wifi.yaml

View File

@ -1,3 +1,3 @@
- platform: restart
id: restart
name: Restart ${device_name}
platform: restart
id: reboot
name: Restart ${device_name}

View File

@ -1 +0,0 @@
- !include common/switch/restart.yaml

View File

@ -1,2 +1,2 @@
- platform: version
name: ${device_name} Version
platform: version
name: ${device_name} Version

View File

@ -1,3 +1,4 @@
platform: wifi_info
ip_address:
name: ${device_name} IP Address
name: ${device_name} IP Address
icon: mdi:ip-network

View File

@ -1,2 +0,0 @@
- !include common/text_sensor/version.yaml
- !include common/text_sensor/wifi.yaml

View File

@ -2,11 +2,11 @@ wifi:
ssid: !secret wifi_ssid
password: !secret wifi_password
manual_ip:
static_ip: !secret ${device_id}_ip
static_ip: ${ip_address}
subnet: !secret ip_subnet
gateway: !secret ip_gateway
ap:
ssid: ${device_id}
password: !secret ${device_id}_cp_pwd
password: ${ap_wifi_pwd}
captive_portal:

View File

@ -3,6 +3,10 @@ substitutions:
device_name: Master Bed
platform: ESP8266
board: nodemcuv2
ip_address: !secret master_bed_ip
ota_pwd: !secret master_bed_ota_pwd
api_pwd: !secret master_bed_api_pwd
ap_wifi_pwd: !secret master_bed_ap_wifi_pwd
esphome:
<<: !include common/esphome.yaml
@ -13,7 +17,7 @@ esphome:
<<: !include common/logger.yaml
binary_sensor:
<<: !include common/binary_sensors.yaml
- !include common/binary_sensor/status.yaml
- platform: custom
lambda: |-
auto bedSensor = new BedSensor();
@ -31,7 +35,8 @@ binary_sensor:
device_class: occupancy
sensor:
<<: !include common/sensors.yaml
- !include common/sensor/uptime.yaml
- !include common/sensor/wifi.yaml
- platform: template
name: "Master Bed Count"
id: master_bed_count
@ -41,7 +46,8 @@ sensor:
return id(melissa_in_bed).state + id(chris_in_bed).state + id(someone_in_bed).state;
switch:
<<: !include common/switches.yaml
- !include common/switch/restart.yaml
text_sensor:
<<: !include common/text_sensors.yaml
- !include common/text_sensor/version.yaml
- !include common/text_sensor/wifi.yaml