Reorganize configs into packages

.gitignore

@@ -8,4 +8,4 @@
 **/src/
 **/platformio.ini
 **/partitions.csv
-/secrets.yaml
+secrets.yaml

bathroomheater.yaml

@@ -8,15 +8,8 @@ esphome:
   includes:
   - zehnder.h
 
-esp8266:
-  board: nodemcuv2
-
-logger:
-
-mqtt:
-  broker: homeassistant
-  username: esphome
-  password: !secret mqtt_password
+packages:
+  device_base: !include templates/esp8266.yaml
 
 dallas:
 - pin: D1
@@ -24,7 +17,6 @@ dallas:
 sensor:
 - platform: dallas
   address: 0x0401212E565C7428
-  name: "Bathroom Heater Temperature"
   id: bathroom_heater_temperature
 
 remote_transmitter:
@@ -49,11 +41,3 @@ interval:
   then:
     # Periodically remind heater about the current setting.
     lambda: static_cast<Zehnder*>(id(bathroom_heater))->retransmit();
-
-ota:
-  password: !secret ota_password
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
-  domain: ""

blinds.yaml

@@ -8,16 +8,9 @@ esphome:
   includes:
   - somfy.h
 
-esp8266:
-  board: nodemcuv2
-
-logger:
-
-mqtt:
-  broker: homeassistant
-  username: esphome
-  password: !secret mqtt_password
-  id: mqtt_client
+packages:
+  device_base: !include templates/esp8266.yaml
+  mqtt: !include templates/mqtt.yaml
 
 globals:
 - id: somfy_remote_id_base
@@ -36,7 +29,7 @@ cover:
       auto cover = new SomfyRTS(
         rfPin,
         id(somfy_remote_id_base) + i,
-        id(mqtt_client));
+        id(mqtt_homeassistant));
       blinds.push_back(cover);
       App.register_component(cover);
     }
@@ -57,11 +50,3 @@ cover:
   - name: "Living Room window"
   - name: "Guest East window"
   - name: "Guest East door"
-
-ota:
-  password: !secret ota_password
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
-  domain: ""

boiler.yaml

@@ -5,10 +5,8 @@ esphome:
     name: dasfoo.boiler
     version: "1.0"
 
-esp8266:
-  board: nodemcuv2
-
-logger:
+packages:
+  device_base: !include templates/esp8266.yaml
 
 i2c:
   sda: D3
@@ -36,11 +34,6 @@ display:
       it.circle(112, 16, 12);
     }
 
-mqtt:
-  broker: homeassistant
-  username: esphome
-  password: !secret mqtt_password
-
 dallas:
 - pin: D1
 
@@ -54,7 +47,6 @@ sensor:
 
 - platform: adc
   pin: A0
-  name: "Furnace LED brightness"
   update_interval: 1s
   id: furnace_led_brightness
 
@@ -66,11 +58,3 @@ binary_sensor:
   threshold: 0.7
   filters:
   - invert:
-
-ota:
-  password: !secret ota_password
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
-  domain: ""

btproxy.yaml

@@ -6,14 +6,8 @@ esphome:
     name: dasfoo.btproxy
     version: "1.0"
 
-esp32:
-  board: esp32-poe
-  # Required for BLE.
-  framework:
-    type: esp-idf
-
-# Enable logging.
-logger:
+packages:
+  device_base: !include templates/esp32-poe.yaml
 
 # Allow HA to use our proxy.
 # Don't enable MQTT as the device will be "discovered" twice.
@@ -33,14 +27,3 @@ bluetooth_proxy:
 button:
 - platform: restart
   name: "btproxy Restart"
-
-ota:
-  password: !secret ota_password
-
-ethernet:
-  type: LAN8720
-  mdc_pin: GPIO23
-  mdio_pin: GPIO18
-  clk_mode: GPIO17_OUT
-  phy_addr: 0
-  power_pin: GPIO12

ruuvi.yaml

@@ -5,19 +5,9 @@ esphome:
     name: dasfoo.ruuvi
     version: "1.0"
 
-esp32:
-  board: esp32-poe
-  # Required for BLE.
-  framework:
-    type: esp-idf
-
-# Enable logging
-logger:
-
-mqtt:
-  broker: homeassistant
-  username: esphome
-  password: !secret mqtt_password
+packages:
+  device_base: !include templates/esp32-poe.yaml
+  mqtt: !include templates/mqtt.yaml
 
 # Required for ruuvitag.
 esp32_ble_tracker:
@@ -47,14 +37,3 @@ sensor:
     name: "Outdoor West Acceleration"
   battery_voltage:
     name: "Outdoor West Sensor Battery Voltage"
-
-ota:
-  password: !secret ota_password
-
-ethernet:
-  type: LAN8720
-  mdc_pin: GPIO23
-  mdio_pin: GPIO18
-  clk_mode: GPIO17_OUT
-  phy_addr: 0
-  power_pin: GPIO12

secrets.yaml.sample

@@ -0,0 +1 @@
+somfy_remote_id_base: "11111"

templates/esp32-poe.yaml

@@ -0,0 +1,21 @@
+esp32:
+  board: esp32-poe
+  # Required for BLE.
+  framework:
+    type: esp-idf
+
+status_led:
+  pin: GPIO2
+
+ethernet:
+  type: LAN8720
+  mdc_pin: GPIO23
+  mdio_pin: GPIO18
+  clk_mode: GPIO17_OUT
+  phy_addr: 0
+  power_pin: GPIO12
+
+logger:
+
+packages:
+  ota: !include ota.yaml

templates/esp8266.yaml

@@ -0,0 +1,19 @@
+esp8266:
+  board: nodemcuv2
+
+packages:
+  wifi: !include wifi.yaml
+  ota: !include ota.yaml
+  mqtt: !include mqtt.yaml
+
+logger:
+
+status_led:
+  pin:
+    # There are 2 LEDs on NodeMCU v2, one next to the WiFi
+    # antenna, another near the power socket / RST button.
+    # The one at WiFi is connected to UART so it blinks on
+    # flash, thus we will use the other one for status.
+    # https://lowvoltage.github.io/2017/07/09/Onboard-LEDs-NodeMCU-Got-Two
+    number: GPIO16
+    inverted: true

templates/mqtt.yaml

@@ -0,0 +1,5 @@
+mqtt:
+  broker: homeassistant
+  username: esphome
+  password: !secret mqtt_password
+  id: mqtt_homeassistant

templates/ota.yaml

@@ -0,0 +1,2 @@
+ota:
+  password: !secret ota_password

templates/secrets.yaml.sample

@@ -0,0 +1,4 @@
+wifi_ssid: IoT
+wifi_password: "IoT$eKuRe"
+ota_password: "OTA_ALS0_SECCUR"
+mqtt_password: "ttqm"

templates/wifi.yaml

@@ -0,0 +1,4 @@
+wifi:
+  ssid: !secret wifi_ssid
+  password: !secret wifi_password
+  domain: ""

watermeter.yaml

@@ -5,20 +5,8 @@ esphome:
     name: dasfoo.watermeter
     version: "1.0"
 
-esp8266:
-  board: nodemcuv2
-
-logger:
-
-mqtt:
-  broker: homeassistant
-  username: esphome
-  password: !secret mqtt_password
-
-status_led:
-  pin:
-    number: D4  # WiFi LED.
-    inverted: true
+packages:
+  device_base: !include templates/esp8266.yaml
 
 sensor:
 - platform: pulse_meter
@@ -38,11 +26,3 @@ sensor:
     unit_of_measurement: "L"
     device_class: "water"
     state_class: "total_increasing"
-
-ota:
-  password: !secret ota_password
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
-  domain: ""