Total overhaul - still need to rework racks.

_data/.esp32.yaml

@@ -1,4 +1,4 @@
 esphome:
-  name: "${device_name}"
+  name: "${dn}"
   platform: ESP32
-  board: esp32doit-devkit-v1
+  board: esp32doit-devkit-v1

_data/.esp8266.yaml

@@ -1,4 +1,4 @@
 esphome:
-  name: "${device_name}"
+  name: "${dn}"
   platform: ESP8266
-  board: esp01_1m
+  board: esp01_1m

_data/.weather.yaml

@@ -7,19 +7,19 @@ i2c:
 sensor:
   - platform: bme280
     temperature:
-      name: Temp${dn}
+      name: Temp${sn}
       id: bme280_temperature
     pressure:
-      name: Press${dn}
+      name: Press${sn}
       id: bme280_pressure
     humidity:
-      name: HumidityRel${dn}
+      name: HumidityRel${sn}
       id: bme280_humidity
     address: 0x76
     update_interval: 15s
   # Templates from https://esphome.io/cookbook/bme280_environment.html
   - platform: template
-    name: HumidityAbs${dn}
+    name: HumidityAbs${sn}
     lambda: |-
       const float mw = 18.01534;    // molar mass of water g/mol
       const float r = 8.31447215;   // Universal gas constant J/mol/K
@@ -31,7 +31,7 @@ sensor:
     icon: 'mdi:water'
     unit_of_measurement: 'g/m³'
   - platform: template
-    name: DewPt${dn}
+    name: DewPt${sn}
     lambda: |-
       return (243.5*(log(id(bme280_humidity).state/100)+((17.67*id(bme280_temperature).state)/
       (243.5+id(bme280_temperature).state)))/(17.67-log(id(bme280_humidity).state/100)-

_data/prj_3_df_pwr.yaml

@@ -1,10 +1,10 @@
 substitutions:
-  device_name: "prj3-duct-fan-pwr"
-  dn: "prj3_duct_fan_pwr"
+  device_name: "prj-3-df-pwr"
+  dn: "prj_3_df_pwr"
   friendly_name: "Prj 3 Duct Fan Pwr"
 
 <<: !include .common.yaml
 <<: !include .esp8266.yaml
 <<: !include .wifi-oss.yaml
 
-<<: !include .gosund-wp3.yaml
+<<: !include .gosund-wp3.yaml

_data/weather_in_1.yaml

@@ -1,6 +1,7 @@
 substitutions:
   device_name: weather-in-1
-  dn: In1
+  dn: weather_in_1
+  sn: In1
 
 <<: !include .common.yaml
 <<: !include .esp8266.yaml

_data/weather_out_n.yaml

@@ -1,6 +1,7 @@
 substitutions:
   device_name: weather-out-n
-  dn: OutN
+  dn: weather_out_n
+  sn: OutN
 
 <<: !include .common.yaml
 <<: !include .esp8266.yaml

_data/weather_out_s.yaml

@@ -1,6 +1,7 @@
 substitutions:
   device_name: weather-out-s
-  dn: OutS
+  dn: weather_out_s
+  sn: OutS
 
 <<: !include .common.yaml
 <<: !include .esp8266.yaml