From 877fea11acd1a484a18a1ffc6ba8d376363b5250 Mon Sep 17 00:00:00 2001 From: longranger Date: Sat, 9 Jul 2022 12:47:31 -0700 Subject: [PATCH] Total overhaul - still need to rework racks. --- _data/.esp32.yaml | 4 ++-- _data/.esp8266.yaml | 4 ++-- _data/.weather.yaml | 10 +++++----- _data/{fountain-1.yaml => fountain_1.yaml} | 0 _data/{fountain-1-light.yaml => fountain_1_light.yaml} | 0 _data/{fountain-outside.yaml => fountain_outside.yaml} | 0 _data/{prj-3.yaml => prj_3.yaml} | 0 _data/{prj3-duct-fan-pwr.yaml => prj_3_df_pwr.yaml} | 6 +++--- _data/{rack-2-df-pwr.yaml => rack_2_df_pwr.yaml} | 0 _data/{rack-3-cpu-pwr.yaml => rack_3_cpu_pwr.yaml} | 0 _data/{rack-3-df-pwr.yaml => rack_3_df_pwr.yaml} | 0 _data/{tv1-cpu-pwr.yaml => tv1_cpu_pwr.yaml} | 0 _data/{weather-in-1.yaml => weather_in_1.yaml} | 3 ++- _data/{weather-out-n.yaml => weather_out_n.yaml} | 3 ++- _data/{weather-out-s.yaml => weather_out_s.yaml} | 3 ++- 15 files changed, 18 insertions(+), 15 deletions(-) rename _data/{fountain-1.yaml => fountain_1.yaml} (100%) rename _data/{fountain-1-light.yaml => fountain_1_light.yaml} (100%) rename _data/{fountain-outside.yaml => fountain_outside.yaml} (100%) rename _data/{prj-3.yaml => prj_3.yaml} (100%) rename _data/{prj3-duct-fan-pwr.yaml => prj_3_df_pwr.yaml} (60%) rename _data/{rack-2-df-pwr.yaml => rack_2_df_pwr.yaml} (100%) rename _data/{rack-3-cpu-pwr.yaml => rack_3_cpu_pwr.yaml} (100%) rename _data/{rack-3-df-pwr.yaml => rack_3_df_pwr.yaml} (100%) rename _data/{tv1-cpu-pwr.yaml => tv1_cpu_pwr.yaml} (100%) rename _data/{weather-in-1.yaml => weather_in_1.yaml} (84%) rename _data/{weather-out-n.yaml => weather_out_n.yaml} (83%) rename _data/{weather-out-s.yaml => weather_out_s.yaml} (83%) diff --git a/_data/.esp32.yaml b/_data/.esp32.yaml index f991887..568fcf5 100644 --- a/_data/.esp32.yaml +++ b/_data/.esp32.yaml @@ -1,4 +1,4 @@ esphome: - name: "${device_name}" + name: "${dn}" platform: ESP32 - board: esp32doit-devkit-v1 + board: esp32doit-devkit-v1 \ No newline at end of file diff --git a/_data/.esp8266.yaml b/_data/.esp8266.yaml index 4ea2ecf..07e4ee1 100644 --- a/_data/.esp8266.yaml +++ b/_data/.esp8266.yaml @@ -1,4 +1,4 @@ esphome: - name: "${device_name}" + name: "${dn}" platform: ESP8266 - board: esp01_1m + board: esp01_1m \ No newline at end of file diff --git a/_data/.weather.yaml b/_data/.weather.yaml index b9673fc..c45b183 100644 --- a/_data/.weather.yaml +++ b/_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)- diff --git a/_data/fountain-1.yaml b/_data/fountain_1.yaml similarity index 100% rename from _data/fountain-1.yaml rename to _data/fountain_1.yaml diff --git a/_data/fountain-1-light.yaml b/_data/fountain_1_light.yaml similarity index 100% rename from _data/fountain-1-light.yaml rename to _data/fountain_1_light.yaml diff --git a/_data/fountain-outside.yaml b/_data/fountain_outside.yaml similarity index 100% rename from _data/fountain-outside.yaml rename to _data/fountain_outside.yaml diff --git a/_data/prj-3.yaml b/_data/prj_3.yaml similarity index 100% rename from _data/prj-3.yaml rename to _data/prj_3.yaml diff --git a/_data/prj3-duct-fan-pwr.yaml b/_data/prj_3_df_pwr.yaml similarity index 60% rename from _data/prj3-duct-fan-pwr.yaml rename to _data/prj_3_df_pwr.yaml index 5622723..9865638 100644 --- a/_data/prj3-duct-fan-pwr.yaml +++ b/_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 \ No newline at end of file +<<: !include .gosund-wp3.yaml diff --git a/_data/rack-2-df-pwr.yaml b/_data/rack_2_df_pwr.yaml similarity index 100% rename from _data/rack-2-df-pwr.yaml rename to _data/rack_2_df_pwr.yaml diff --git a/_data/rack-3-cpu-pwr.yaml b/_data/rack_3_cpu_pwr.yaml similarity index 100% rename from _data/rack-3-cpu-pwr.yaml rename to _data/rack_3_cpu_pwr.yaml diff --git a/_data/rack-3-df-pwr.yaml b/_data/rack_3_df_pwr.yaml similarity index 100% rename from _data/rack-3-df-pwr.yaml rename to _data/rack_3_df_pwr.yaml diff --git a/_data/tv1-cpu-pwr.yaml b/_data/tv1_cpu_pwr.yaml similarity index 100% rename from _data/tv1-cpu-pwr.yaml rename to _data/tv1_cpu_pwr.yaml diff --git a/_data/weather-in-1.yaml b/_data/weather_in_1.yaml similarity index 84% rename from _data/weather-in-1.yaml rename to _data/weather_in_1.yaml index c92cad6..c711710 100644 --- a/_data/weather-in-1.yaml +++ b/_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 diff --git a/_data/weather-out-n.yaml b/_data/weather_out_n.yaml similarity index 83% rename from _data/weather-out-n.yaml rename to _data/weather_out_n.yaml index 4587416..a7fb85b 100644 --- a/_data/weather-out-n.yaml +++ b/_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 diff --git a/_data/weather-out-s.yaml b/_data/weather_out_s.yaml similarity index 83% rename from _data/weather-out-s.yaml rename to _data/weather_out_s.yaml index 6d2dcef..46b7b85 100644 --- a/_data/weather-out-s.yaml +++ b/_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