From 6747c4dbc727fce713b183533a1ff984bcc89890 Mon Sep 17 00:00:00 2001 From: dfcarvajal Date: Mon, 26 Aug 2019 23:38:01 +0200 Subject: [PATCH] Update Consumos y Flora --- ...eral_caldera.yaml => consumo_caldera.yaml} | 6 +- packages/sensor/consumo_coche_electrico.yaml | 6 +- ..._general_luces.yaml => consumo_luces.yaml} | 6 +- ..._persianas.yaml => consumo_persianas.yaml} | 6 +- .../{miflora.yaml => miflora.yaml_disable} | 0 ui-lovelace.yaml | 76 ++++++++++--------- 6 files changed, 54 insertions(+), 46 deletions(-) rename packages/sensor/{consumo_general_caldera.yaml => consumo_caldera.yaml} (70%) rename packages/sensor/{consumo_general_luces.yaml => consumo_luces.yaml} (72%) rename packages/sensor/{consumo_general_persianas.yaml => consumo_persianas.yaml} (71%) rename packages/sensor/{miflora.yaml => miflora.yaml_disable} (100%) diff --git a/packages/sensor/consumo_general_caldera.yaml b/packages/sensor/consumo_caldera.yaml similarity index 70% rename from packages/sensor/consumo_general_caldera.yaml rename to packages/sensor/consumo_caldera.yaml index f5f3642..82e8cfa 100644 --- a/packages/sensor/consumo_general_caldera.yaml +++ b/packages/sensor/consumo_caldera.yaml @@ -1,11 +1,11 @@ sensor: - platform: mqtt - name: "Consumo General Calefacción" + name: "Consumo Calefacción" state_topic: "shellies/shelly4pro-061E6E/relay/2/power" unit_of_measurement: "W" - platform: mqtt - name: "Energia General Calefacción" + name: "Consumo Calefacción Diario" state_topic: "shellies/shelly4pro-061E6E/relay/2/energy" - unit_of_measurement: "KWh" + unit_of_measurement: "kW" value_template: "{{ value | multiply(0.01) | float | round(2)}}" diff --git a/packages/sensor/consumo_coche_electrico.yaml b/packages/sensor/consumo_coche_electrico.yaml index 7e74907..c92e2ac 100644 --- a/packages/sensor/consumo_coche_electrico.yaml +++ b/packages/sensor/consumo_coche_electrico.yaml @@ -1,11 +1,11 @@ sensor: - platform: mqtt - name: "Consumo General Coche Eléctrico" + name: "Consumo Coche Eléctrico" state_topic: "shellies/shelly4pro-061E6E/relay/3/power" unit_of_measurement: "W" - platform: mqtt - name: "Energia General Coche Eléctrico" + name: "Consumo Coche Eléctrico Diario" state_topic: "shellies/shelly4pro-061E6E/relay/3/energy" - unit_of_measurement: "KWh" + unit_of_measurement: "kW" value_template: "{{ value | multiply(0.01) | float | round(2)}}" diff --git a/packages/sensor/consumo_general_luces.yaml b/packages/sensor/consumo_luces.yaml similarity index 72% rename from packages/sensor/consumo_general_luces.yaml rename to packages/sensor/consumo_luces.yaml index af8c01c..075c0d9 100644 --- a/packages/sensor/consumo_general_luces.yaml +++ b/packages/sensor/consumo_luces.yaml @@ -1,11 +1,11 @@ sensor: - platform: mqtt - name: "Consumo General Luces" + name: "Consumo Luces" state_topic: "shellies/shelly4pro-061E6E/relay/0/power" unit_of_measurement: "W" - platform: mqtt - name: "Energia General Luces" + name: "Consumo Luces Diario" state_topic: "shellies/shelly4pro-061E6E/relay/0/energy" - unit_of_measurement: "KWh" + unit_of_measurement: "kW" value_template: "{{ value | multiply(0.01) | float | round(2)}}" diff --git a/packages/sensor/consumo_general_persianas.yaml b/packages/sensor/consumo_persianas.yaml similarity index 71% rename from packages/sensor/consumo_general_persianas.yaml rename to packages/sensor/consumo_persianas.yaml index 203ef25..1c5eaf6 100644 --- a/packages/sensor/consumo_general_persianas.yaml +++ b/packages/sensor/consumo_persianas.yaml @@ -1,11 +1,11 @@ sensor: - platform: mqtt - name: "Consumo General Persianas" + name: "Consumo Persianas" state_topic: "shellies/shelly4pro-061E6E/relay/1/power" unit_of_measurement: "W" - platform: mqtt - name: "Energia General Persianas" + name: "Consumo Persianas Diario" state_topic: "shellies/shelly4pro-061E6E/relay/1/energy" - unit_of_measurement: "KWh" + unit_of_measurement: "kW" value_template: "{{ value | multiply(0.01) | float | round(2)}}" diff --git a/packages/sensor/miflora.yaml b/packages/sensor/miflora.yaml_disable similarity index 100% rename from packages/sensor/miflora.yaml rename to packages/sensor/miflora.yaml_disable diff --git a/ui-lovelace.yaml b/ui-lovelace.yaml index 24f999c..625b38d 100644 --- a/ui-lovelace.yaml +++ b/ui-lovelace.yaml @@ -861,63 +861,71 @@ views: title: General Electricidad type: entities - entities: - - entity: sensor.horno_kw_actuales - name: Horno - - entity: sensor.varios_1_kw_actuales + - entity: sensor.consumo_varios_1 name: UV1 - - entity: sensor.varios_2_kw_actuales + - entity: sensor.consumo_varios_2 name: UV2 - - entity: sensor.humedos_kw_actuales + - entity: sensor.consumo_humedos name: Húmedos - - entity: sensor.lavavajillas_kw_actuales + - entity: sensor.consumo_horno + name: Horno + - entity: sensor.consumo_lavavajillas name: Lavavajillas - - entity: sensor.lavadora_kw_actuales + - entity: sensor.consumo_lavadora name: Lavadora - - entity: sensor.consumo_general_calefaccion + - entity: sensor.consumo_calefaccion name: Calefacción - - entity: sensor.consumo_general_luces + - entity: sensor.consumo_luces name: Luces - - entity: sensor.consumo_general_persianas + - entity: sensor.consumo_persianas name: Persianas - - entity: sensor.consumo_general_coche_electrico + - entity: sensor.consumo_coche_electrico name: Coche title: Energía Consumida Actual type: glance - entities: - - entity: sensor.horno_consumo_diario - name: Horno Hoy - - entity: sensor.humedos_consumo_diario - name: Humedos Hoy - - entity: sensor.lavavajillas_consumo_diario - name: Lavavajillas Hoy - - entity: sensor.lavadora_consumo_diario - name: Lavadora Hoy - - entity: sensor.varios_1_consumo_diario - name: UV1 Hoy - - entity: sensor.varios_2_consumo_diario - name: UV2 Hoy - title: Energía Consumida Fecha + - entity: sensor.consumo_diario_varios_1 + name: UV1 + - entity: sensor.consumo_diario_varios_2 + name: UV2 + - entity: sensor.consumo_diario_humedos + name: Húmedos + - entity: sensor.consumo_diario_horno + name: Horno + - entity: sensor.consumo_diario_lavavajillas + name: Lavavajillas + - entity: sensor.consumo_diario_lavadora + name: Lavadora + - entity: sensor.consumo_diario_calefaccion + name: Calefacción + - entity: sensor.consumo_diario_luces + name: Luces + - entity: sensor.consumo_diario_persianas + name: Persianas + - entity: sensor.consumo_diario_coche_electrico + name: Coche + title: Energía Consumida Hoy type: glance - entities: - - entity: sensor.consumo_general_calefaccion + - entity: sensor.consumo_calefaccion name: Calefacción - - entity: sensor.consumo_general_coche_electrico + - entity: sensor.consumo_coche_electrico name: Coche - - entity: sensor.consumo_general_luces + - entity: sensor.consumo_luces name: Luces - - entity: sensor.consumo_general_persianas + - entity: sensor.consumo_persianas name: Persianas - - entity: sensor.horno_kw_actuales + - entity: sensor.consumo_horno name: Horno - - entity: sensor.humedos_kw_actuales + - entity: sensor.consumo_humedos name: Humedos - - entity: sensor.lavavajillas_kw_actuales + - entity: sensor.consumo_lavavajillas name: Lavavajillas - - entity: sensor.lavadora_kw_actuales + - entity: sensor.consumo_lavadora name: Lavadora - - entity: sensor.varios_1_kw_actuales + - entity: sensor.consumo_varios_1 name: UV1 - - entity: sensor.varios_2_kw_actuales + - entity: sensor.consumo_varios_2 name: UV2 hours_to_show: 12 refresh_interval: 60