From b410af4ef3c7cc9eaf54f353433a8946c1ff9b2c Mon Sep 17 00:00:00 2001
From: longranger <longranger.406@gmail.com>
Date: Sun, 3 Jul 2022 08:50:48 -0700
Subject: [PATCH] DF clean-up.

---
 _data/prj-3.yaml  |  8 ++++----
 _data/rack_2.yaml | 16 ++++++++--------
 _data/rack_3.yaml |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/_data/prj-3.yaml b/_data/prj-3.yaml
index 66cf2bd..0f8c545 100644
--- a/_data/prj-3.yaml
+++ b/_data/prj-3.yaml
@@ -5,9 +5,9 @@ substitutions:
   friendly_name: Prj 3
   duct_fan_pin: GPIO14
   duct_fan_name: ${sn} Duct Fan Spd
-  duct_fan_tgt_spd_in_name: ${sn} Duct Fan Tgt Spd In
-  duct_fan_tgt_spd_prj_name: ${sn} Duct Fan Tgt Spd Prj
-  duct_fan_tgt_spd_out_name: ${sn} Duct Fan Tgt Spd Out
+  duct_fan_tgt_spd_in_name: ${sn} DF Tgt Spd In
+  duct_fan_tgt_spd_prj_name: ${sn} DF Tgt Spd Prj
+  duct_fan_tgt_spd_out_name: ${sn} DF Tgt Spd Out
   duct_fan_pwmfreq: 5000Hz
   duct_fan_off_spd: "0.0"
   duct_fan_lo_spd: "1.0"
@@ -42,7 +42,7 @@ globals:
 <<: !include .wifi-oss.yaml
 
 esphome:
-  name: prj3
+  name: ${dn}
   platform: ESP32
   board: esp32doit-devkit-v1
   on_boot:
diff --git a/_data/rack_2.yaml b/_data/rack_2.yaml
index 2010164..dce68b7 100644
--- a/_data/rack_2.yaml
+++ b/_data/rack_2.yaml
@@ -28,16 +28,16 @@ substitutions:
   dallas_update_interval: 30s
 
 globals:
-  - id: duct_fan_off_spd
+  - id: duct_fan_off_spd_id
     type: float
     initial_value: ${duct_fan_off_spd}
-  - id: duct_fan_lo_spd
+  - id: duct_fan_lo_spd_id
     type: float
     initial_value: ${duct_fan_lo_spd}
-  - id: duct_fan_vent_spd
+  - id: duct_fan_vent_spd_id
     type: float
     initial_value: ${duct_fan_vent_spd}
-  - id: duct_fan_hi_spd
+  - id: duct_fan_hi_spd_id
     type: float
     initial_value: ${duct_fan_hi_spd}
 
@@ -143,10 +143,10 @@ number:
       lo_temp = id(thermostat_out_id).target_temperature_low;
       hi_temp = id(thermostat_out_id).target_temperature_high;
       curtemp = id(dallas_out_id).state;
-      off_spd = id(duct_fan_off_spd);
-      lo_spd = id(duct_fan_lo_spd);
-      vent_spd = id(duct_fan_vent_spd);
-      hi_spd = id(duct_fan_hi_spd);
+      off_spd = id(duct_fan_off_spd_id);
+      lo_spd = id(duct_fan_lo_spd_id);
+      vent_spd = id(duct_fan_vent_spd_id);
+      hi_spd = id(duct_fan_hi_spd_id);
       ESP_LOGD("fan_speed", "DEBUG Ventilate House: %d", id(ventilate_house).state);
       ESP_LOGD("fan_speed", "DEBUG Current Temp: %f", curtemp);
       ESP_LOGD("fan_speed", "DEBUG Thermostat State: %d", id(thermostat_on_id).state);
diff --git a/_data/rack_3.yaml b/_data/rack_3.yaml
index 703bf05..7161c1c 100644
--- a/_data/rack_3.yaml
+++ b/_data/rack_3.yaml
@@ -43,7 +43,7 @@ globals:
 <<: !include .wifi-oss.yaml
 
 esphome:
-  name: rack_3
+  name: ${dn}
   platform: ESP32
   board: esp32doit-devkit-v1
   on_boot: