use 'packages' to merge configs

README.md

@@ -4,7 +4,11 @@ Home Grow(n) Monitoring
 
 ## Components
 
-* propbox: Propagator Controller, any ESP32
-* propbox-light: Smart Plug for Lights, e.g. Nous A1T
-* propbox-fan: Smart Plug for Fan, e.g. Nous A1T
-* Xiaomi Mi Temperature and Humidity Monitor 2 (LYWSD03MMC), does what it says on the tin
+* propbox: ESP32 Propagator Controller
+    * BME280 Temperature and Humidity Sensor (3.3V, I2C)
+    * Dallas DS18B20 Temperature Sensor
+* propbox-light: Nous A1T Smart Plug for Light
+* propbox-fan: Nous A1T Smart Plug for Fan
+
+## Configuration
+Copy `secrets.yaml.dist` to `secrets.yaml` and adjust to your preferences.

common.yaml → base.yaml

@@ -15,8 +15,6 @@ preferences:
 
 logger:
   # level: INFO
-  logs:
-    esp32_ble_tracker: INFO
 
 api:
   password: !secret api_password
@@ -42,3 +40,36 @@ web_server:
   # include_internal: true
 
 prometheus:
+
+sensor:
+  - platform: wifi_signal
+    name: "Wifi Signal"
+    update_interval: 60s
+
+  - platform: uptime
+    name: "Device Uptime"
+    update_interval: 60s
+
+text_sensor:
+  - platform: version
+    name: "ESPHome Version"
+    hide_timestamp: true
+
+  - platform: template
+    name: "Device Time"
+    lambda: |-
+      auto str_time = id(sntp_time).now().strftime("%d-%m-%Y %H:%M");
+      return { str_time };
+    update_interval: 60s
+
+  - platform: wifi_info
+    ip_address:
+      name: "Wifi IP Address"
+    ssid:
+      name: "Wifi SSID"
+    bssid:
+      name: "Wifi BSSID"
+
+switch:
+  - platform: restart
+    name: "Device Restart"

include/nous_a1t.yaml

@@ -46,18 +46,6 @@ switch:
     pin: GPIO14
 
 sensor:
-### Default Sensors
-
-  - platform: wifi_signal
-    name: "Wifi Signal"
-    update_interval: 60s
-
-  - platform: uptime
-    name: "Uptime"
-    update_interval: 60s
-
-### Specific Sensors
-
   - platform: total_daily_energy
     name: "Electric Consumption [kWh]"
     power_id: "nous_a1t_watt"

include/text_sensors.yaml

-- platform: wifi_info
-  ip_address:
-    name: "Wifi IP Address"
-  ssid:
-    name: "Wifi SSID"
-  bssid:
-    name: "Wifi BSSID"
-
-- platform: version
-  name: "ESPHome Version"
-  hide_timestamp: true
-
-- platform: template
-  name: "Device Time"
-  lambda: |-
-    auto str_time = id(sntp_time).now().strftime("%d-%m-%Y %H:%M");
-    return { str_time };
-  update_interval: 60s

propbox-fan.yaml

 substitutions:
   devicename: "propbox-fan"
-  domain: "faked.local"
+  domain: !secret domain
   comment: "Propagator Fan Control"
   project_name: "groovy.propbox-fan"
   project_version: "1.0"
@@ -8,9 +8,7 @@ substitutions:
   current_res: "0.00280" # Higher value gives lower watt readout
   voltage_div: "775" # Lower value gives lower voltage readout
 
-<<: !include common.yaml
+packages:
+  device_base: !include base.yaml
 
 <<: !include include/nous_a1t.yaml
-
-text_sensor:
-  !include include/text_sensors.yaml

propbox-light.yaml

 substitutions:
   devicename: "propbox-light"
-  domain: "faked.local"
+  domain: !secret domain
   comment: "Propagator Light Control"
   project_name: "groovy.propbox-light"
   project_version: "1.0"
@@ -8,9 +8,7 @@ substitutions:
   current_res: "0.00280" # Higher value gives lower watt readout
   voltage_div: "775" # Lower value gives lower voltage readout
 
-<<: !include common.yaml
+packages:
+  device_base: !include base.yaml
 
 <<: !include include/nous_a1t.yaml
-
-text_sensor:
-  !include include/text_sensors.yaml

propbox.yaml

 substitutions:
   devicename: "propbox"
-  domain: "faked.local"
+  domain: !secret domain
   comment: "Propagator Monitor"
   project_name: "groovy.propbox"
   project_version: "1.0"
@@ -19,7 +19,8 @@ substitutions:
   schedule_bloom_on: "0 * * * * *"
   schedule_bloom_off: "30 * * * * *"
 
-<<: !include common.yaml
+packages:
+  device_base: !include base.yaml
 
 esp32:
   board: esp32dev
@@ -37,22 +38,7 @@ http_request:
   useragent: esphome/${devicename}
   timeout: 10s
 
-text_sensor:
-  !include include/text_sensors.yaml
-
 sensor:
-### Default Sensors
-
-  - platform: wifi_signal
-    name: "Wifi Signal"
-    update_interval: 60s
-
-  - platform: uptime
-    name: "Device Uptime"
-    update_interval: 60s
-
-### Specific Sensors
-
   - platform: bme280
     address: 0x76
     update_interval: 5s
@@ -133,8 +119,6 @@ select:
     restore_value: true            
 
 switch:
-  - platform: restart
-    name: "Device Restart"
   - platform: template
     id: propbox_light
     name: "Light Status"

secrets.yaml.dist

@@ -2,3 +2,4 @@ wifi_ssid: foo
 wifi_password: bar
 ota_password: baz
 api_password: qux
+domain: example.com