From 08ef83973099fcc4ce0dbed892d63564dba78384 Mon Sep 17 00:00:00 2001
From: dfcarvajal <diego.fdezcarvajal@emtmadrid.es>
Date: Sun, 27 Dec 2020 17:22:00 +0100
Subject: [PATCH] Modificaciones Lovelace Varias

---
 lovelace/cocina.yaml    |   6 +-
 lovelace/consumos.yaml  | 374 +++++++++++++++++++++++++---------------
 lovelace/estado.yaml    |  27 +--
 lovelace/pasillo.yaml   |   7 +-
 lovelace/principal.yaml |   2 +-
 lovelace/salon.yaml     | 133 +++++++++-----
 lovelace/varios.yaml    |   5 -
 7 files changed, 344 insertions(+), 210 deletions(-)

diff --git a/lovelace/cocina.yaml b/lovelace/cocina.yaml
index 750099f..6889e3b 100644
--- a/lovelace/cocina.yaml
+++ b/lovelace/cocina.yaml
@@ -39,14 +39,14 @@ cards:
               name: Estado
             toggle: true
             type: 'custom:multiple-entity-row'
-          - entity: switch.everspring_an158_plug_in_meter_appliance_module_switch
+          - entity: switch.campana_extractora
             icon: 'mdi:weather-windy'
             name: Campana Extractora
             primary:
-              entity: sensor.everspring_an158_plug_in_meter_appliance_module_power
+              entity: sensor.campana_extractora_power
               name: Actual
             secondary:
-              entity: sensor.everspring_an158_plug_in_meter_appliance_module_energy
+              entity: sensor.campana_extractora_energy
               name: Acumulado
             toggle: true
             type: 'custom:multiple-entity-row'
diff --git a/lovelace/consumos.yaml b/lovelace/consumos.yaml
index 7287445..442542d 100644
--- a/lovelace/consumos.yaml
+++ b/lovelace/consumos.yaml
@@ -1,36 +1,132 @@
 badges: []
 cards:
   - cards:
-        - cards:
-            - entity: sensor.consumo_general
-              max: 3400
-              min: 0
-              name: Consumo Actual
-              severity:
-                green: 200
-                red: 3000
-                yellow: 1000
-              theme: default
-              type: gauge
-              unit: W
-            - entities:
-                - entities:
-                    - sensor.consumo_general
-                  hours_to_show: 24
-                  type: 'custom:hui-history-graph-card'
-                - entity: sensor.consumo_general_factor_potencia
-                  name: Factor Potencia
-                  primary:
-                    entity: sensor.consumo_general_potencia_activa 
-                    name: Activa
-                  secondary:
-                    entity: sensor.consumo_general_potencia_reactiva
-                    name: Reactiva
-                  hide_state: true
-                  type: 'custom:multiple-entity-row'
-              head: sensor.consumo_general_amperios
-              type: 'custom:fold-entity-row'
-          type: vertical-stack
+#        - cards:
+        - entities:
+            - entity: sensor.maximetro
+              color_thresholds:
+                - value: 1000
+                  color: "#AEC622"
+                - value: 1500
+                  color: "#DEA50D"
+                - value: 2500
+                  color: "#FF0000"
+          aggregate_func: max
+          show:
+            state: true
+            labels: true
+            extrema: false
+            average: false
+          line_width: 1
+          name: Maximetro
+          icon: mdi:electron-framework
+          hours_to_show: 24
+          points_per_hour: 4
+          type: 'custom:mini-graph-card'
+        - entities:
+            - entity: sensor.maximetro
+              color_thresholds:
+                - value: 1000
+                  color: "#AEC622"
+                - value: 1500
+                  color: "#DEA50D"
+                - value: 2500
+                  color: "#FF0000"
+          aggregate_func: max
+          show:
+            name: false
+            icon: false
+            state: false
+            labels: true
+            extrema: false
+            average: false
+          line_width: 1
+          name: Maximetro
+          icon: mdi:electron-framework
+          hours_to_show: 1
+          points_per_hour: 60
+          type: 'custom:mini-graph-card'
+#        - entities:
+#            - entity: sensor.consumo_general
+#              color_thresholds:
+#                - value: 1000
+#                  color: "#f39c12"
+#                - value: 2000
+#                  color: "#d35400"
+#                - value: 3000
+#                  color: "#c0392b"
+ #         show:
+ #           labels: true
+ #           extrema: true
+ #           average: true
+ #         line_width: 1
+ #         name: Consumo
+ #         icon: mdi:electron-framework
+ #         hours_to_show: 24
+ #         points_per_hour: 6
+ #         type: 'custom:mini-graph-card'
+        - break
+        - entities:
+            - entity: sensor.consumo_calefaccion
+              name: Calefacción
+            - entity: sensor.consumo_luces
+              name: Luces
+            - entity: sensor.consumo_persianas
+              name: Persianas
+            - entity: sensor.consumo_coche_electrico
+              name: Coche
+            - entity: sensor.consumo_horno
+              name: Horno
+            - entity: sensor.consumo_nevera
+              name: Nevera
+            - entity: sensor.consumo_lavavajillas
+              name: Lavavajillas
+            - entity: sensor.consumo_lavadora
+              name: Lavadora
+            - entity: sensor.consumo_varios_1
+              name: Varios 1
+            - entity: sensor.consumo_varios_2
+              name: Varios 2
+            - entity: sensor.consumo_humedos
+              name: Humedos
+          name: Dispositivos
+          icon: mdi:electron-framework
+          show:
+            labels: true
+          line_width: 1
+          hours_to_show: 24
+          points_per_hour: 4
+          tap_action: none
+          type: 'custom:mini-graph-card'
+#            - entity: sensor.consumo_general
+#              max: 3400
+#              min: 0
+#              name: Consumo Actual
+#              severity:
+#                green: 200
+#                red: 3000
+#                yellow: 1000
+#              theme: default
+#              type: gauge
+#              unit: W
+#            - entities:
+#                - entities:
+#                    - sensor.consumo_general
+#                  hours_to_show: 24
+#                  type: 'custom:hui-history-graph-card'
+#                - entity: sensor.consumo_general_factor_potencia
+#                  name: Factor Potencia
+#                  primary:
+#                    entity: sensor.consumo_general_potencia_activa 
+#                    name: Activa
+#                  secondary:
+#                    entity: sensor.consumo_general_potencia_reactiva
+#                    name: Reactiva
+#                  hide_state: true
+#                  type: 'custom:multiple-entity-row'
+#              head: sensor.consumo_general_amperios
+#              type: 'custom:fold-entity-row'
+#          type: vertical-stack
         - entities:
             - entity: sensor.consumo_calefaccion
               name: Calefacción
@@ -58,120 +154,128 @@ cards:
           refresh_interval: 60
           title: Consumos
           type: history-graph
-        - break
         - entities:
-            - entity: sensor.consumo_varios_1
+            - entity: sensor.consumo_diario_general
               primary:
-                entity: sensor.consumo_diario_varios_1
+                entity: sensor.coste_consumo_diario
                 name: Diario
               secondary:
-                entity: sensor.consumo_diario_integracion_varios_1
-                name: Integración
-              type: 'custom:multiple-entity-row'
-            - entity: sensor.consumo_varios_2
-              primary:
-                entity: sensor.consumo_diario_varios_2
-                name: Diario
-              secondary:
-                entity: sensor.consumo_diario_integracion_varios_2
-                name: Integración
-              type: 'custom:multiple-entity-row' 
-            - entity: sensor.consumo_humedos
-              primary:
-                entity: sensor.consumo_diario_humedos
-                name: Diario
-              secondary:
-                entity: sensor.consumo_diario_integracion_humedos
-                name: Integración
-              type: 'custom:multiple-entity-row'
-            - entity: sensor.consumo_horno
-              primary:
-                entity: sensor.consumo_diario_horno
-                name: Diario
-              secondary:
-                entity: sensor.consumo_diario_integracion_horno
-                name: Integración
-              type: 'custom:multiple-entity-row'
-            - entity: sensor.consumo_nevera
-              primary:
-                entity: sensor.consumo_diario_nevera
-                name: Diario
-              secondary:
-                entity: sensor.consumo_diario_integracion_nevera
-                name: Integración
-              type: 'custom:multiple-entity-row'
-            - entity: sensor.consumo_lavavajillas
-              primary:
-                entity: sensor.consumo_diario_lavavajillas
-                name: Diario
-              secondary:
-                entity: sensor.consumo_diario_integracion_lavavajillas
-                name: Integración
-              type: 'custom:multiple-entity-row'
-            - entity: sensor.consumo_lavadora
-              primary:
-                entity: sensor.consumo_diario_lavadora
-                name: Diario
-              secondary:
-                entity: sensor.consumo_diario_integracion_lavadora
-                name: Integración
-              type: 'custom:multiple-entity-row'
-            - entity: sensor.consumo_calefaccion
-              primary:
-                entity: sensor.consumo_diario_calefaccion
-                name: Diario
-              secondary:
-                entity: sensor.consumo_diario_integracion_calefaccion
-                name: Integración
-              type: 'custom:multiple-entity-row'
-            - entity: sensor.consumo_luces
-              primary:
-                entity: sensor.consumo_diario_luces
-                name: Diario
-              secondary:
-                entity: sensor.consumo_diario_integracion_luces
-                name: Integración
-              type: 'custom:multiple-entity-row'
-            - entity: sensor.consumo_persianas
-              primary:
-                entity: sensor.consumo_diario_persianas
-                name: Diario
-              secondary:
-                entity: sensor.consumo_diario_integracion_persianas
-                name: Integración
-              type: 'custom:multiple-entity-row'
-            - entity: sensor.consumo_coche_electrico
-              primary:
-                entity: sensor.consumo_diario_coche_electrico
-                name: Diario
-              secondary:
-                entity: sensor.consumo_diario_integracion_coche_electrico
-                name: Integración
+                entity: sensor.coste_consumo_mensual
+                name: Mensual
               type: 'custom:multiple-entity-row'
           type: entities
           show_header_toggle: false
-          title: Consumos Varios
+          title: Datos Generales de Consumo
         - entities:
-            - sensor.consumo_general
-            - sensor.consumo_integrado_general
-            - sensor.periodo_consumo_diario_general_punta
-            - sensor.periodo_consumo_diario_general_valle
-            - sensor.periodo_consumo_mensual_general_punta
-            - sensor.periodo_consumo_mensual_general_valle
-            - sensor.consumo_diario_general
-            - sensor.consumo_mensual_general
-          type: entities
-        - entities:
-            - sensor.consumo_varios_2
-            - sensor.periodo_consumo_diario_varios_2_punta
-            - sensor.periodo_consumo_diario_varios_2_valle
-            - sensor.periodo_consumo_mensual_varios_2_punta
-            - sensor.periodo_consumo_mensual_varios_2_valle
-            - sensor.consumo_bruto_diario_varios_2
-            - sensor.consumo_bruto_mensual_varios_2
-            - sensor.consumo_integrado_diario_varios_2
-            - sensor.consumo_integrado_mensual_varios_2
+            - entity: input_number.potencia
           type: entities
+          show_header_toggle: false
+
+#        - entities:
+#            - entity: sensor.consumo_varios_1
+#              primary:
+#                entity: sensor.consumo_diario_varios_1
+#                name: Diario
+#              secondary:
+#                entity: sensor.consumo_diario_integracion_varios_1
+#                name: Integración
+#              type: 'custom:multiple-entity-row'
+#            - entity: sensor.consumo_varios_2
+#              primary:
+#                entity: sensor.consumo_diario_varios_2
+#                name: Diario
+#              secondary:
+#                entity: sensor.consumo_diario_integracion_varios_2
+#                name: Integración
+#              type: 'custom:multiple-entity-row' 
+#            - entity: sensor.consumo_humedos
+#              primary:
+#                entity: sensor.consumo_diario_humedos
+#                name: Diario
+#              secondary:
+#                entity: sensor.consumo_diario_integracion_humedos
+#                name: Integración
+#              type: 'custom:multiple-entity-row'
+#            - entity: sensor.consumo_horno
+#              primary:
+#                entity: sensor.consumo_diario_horno
+#                name: Diario
+#              secondary:
+#                entity: sensor.consumo_diario_integracion_horno
+#                name: Integración
+#              type: 'custom:multiple-entity-row'
+#            - entity: sensor.consumo_nevera
+#              primary:
+#                entity: sensor.consumo_diario_nevera
+#                name: Diario
+#              secondary:
+#                entity: sensor.consumo_diario_integracion_nevera
+#                name: Integración
+#              type: 'custom:multiple-entity-row'
+#            - entity: sensor.consumo_lavavajillas
+#              primary:
+#                entity: sensor.consumo_diario_lavavajillas
+#                name: Diario
+#              secondary:
+#                entity: sensor.consumo_diario_integracion_lavavajillas
+#                name: Integración
+#              type: 'custom:multiple-entity-row'
+#            - entity: sensor.consumo_lavadora
+#              primary:
+#                entity: sensor.consumo_diario_lavadora
+#                name: Diario
+#              secondary:
+#                entity: sensor.consumo_diario_integracion_lavadora
+#                name: Integración
+#              type: 'custom:multiple-entity-row'
+#            - entity: sensor.consumo_calefaccion
+#              primary:
+#                entity: sensor.consumo_diario_calefaccion
+#                name: Diario
+#              secondary:
+#                entity: sensor.consumo_diario_integracion_calefaccion
+#                name: Integración
+#              type: 'custom:multiple-entity-row'
+#            - entity: sensor.consumo_luces
+#              primary:
+#                entity: sensor.consumo_diario_luces
+#                name: Diario
+#              secondary:
+#                entity: sensor.consumo_diario_integracion_luces
+#                name: Integración
+#              type: 'custom:multiple-entity-row'
+#            - entity: sensor.consumo_persianas
+#              primary:
+#                entity: sensor.consumo_diario_persianas
+#                name: Diario
+#              secondary:
+#                entity: sensor.consumo_diario_integracion_persianas
+#                name: Integración
+#              type: 'custom:multiple-entity-row'
+#            - entity: sensor.consumo_coche_electrico
+#              primary:
+#                entity: sensor.consumo_diario_coche_electrico
+#                name: Diario
+#              secondary:
+#                entity: sensor.consumo_diario_integracion_coche_electrico
+#                name: Integración
+#              type: 'custom:multiple-entity-row'
+#          type: entities
+#          show_header_toggle: false
+#          title: Consumos Varios
+#        - entities:
+#            - sensor.coste_consumo_diario
+#            - sensor.coste_consumo_mensual
+#            - sensor.consumo_general
+#            - sensor.maximetro
+#            - sensor.consumo_integrado_general
+#            - sensor.periodo_consumo_diario_general_punta
+#            - sensor.periodo_consumo_diario_general_valle
+#            - sensor.periodo_consumo_mensual_general_punta
+#            - sensor.periodo_consumo_mensual_general_valle
+#            - sensor.consumo_diario_general
+#            - sensor.consumo_mensual_general
+#          type: entities
     layout: vertical
     type: "custom:layout-card"    
 icon: 'mdi:gauge'
diff --git a/lovelace/estado.yaml b/lovelace/estado.yaml
index 7343fa8..ff58885 100644
--- a/lovelace/estado.yaml
+++ b/lovelace/estado.yaml
@@ -4,6 +4,8 @@ cards:
       - entities:
           - entity: sensor.consumo_general
             name: Consumo Eléctrico
+          - entity: lock.casa
+            name: Cerradura puerta Entrada
           - entities:
               - sensor.temperatura_salon
               - sensor.temperatura_exterior
@@ -23,26 +25,6 @@ cards:
             type: 'custom:multiple-entity-row'
           - entity: sensor.openweather_coslada
             name: Tiempo Exterior
-          - entities:
-              - entities:
-                  - entity: sensor.wireless_router_archer_c7_kbyte_sec_received
-                    name: kbytes/sec recibidos
-                  - entity: sensor.wireless_router_archer_c7_kbyte_sec_sent
-                    name: kbytes/sec enviados
-                hours_to_show: 2
-                type: 'custom:hui-history-graph-card'
-            head:
-              entity: sensor.wireless_router_archer_c7_kbyte_sec_received
-              hide_state: true
-              name: Tranferencia
-              primary:
-                entity: sensor.wireless_router_archer_c7_kbyte_sec_received
-                name: Recibido
-              secondary:
-                entity: sensor.wireless_router_archer_c7_kbyte_sec_sent
-                name: Enviado
-              type: 'custom:multiple-entity-row'
-            type: 'custom:fold-entity-row'
         type: entities
       - card:
           title: Luces Encendidas & Desactivadas
@@ -171,7 +153,7 @@ cards:
                       - binary_sensor.puerta_tendedero
                     hours_to_show: 1
                     type: 'custom:hui-history-graph-card'
-                head:
+                head: 
                   entity: binary_sensor.puerta_tendedero
                   secondary_info: last-changed
                 type: 'custom:fold-entity-row'
@@ -229,6 +211,9 @@ cards:
               - entity: switch.coche_electrico
                 icon: 'mdi:car'
                 name: Coche
+              - entity: input_boolean.deshabilitar_automatizaciones
+                icon: 'mdi:power-off'
+                name: Deshabilitar Automatizaciones
             head:
               label: Interruptores Generales
               type: section
diff --git a/lovelace/pasillo.yaml b/lovelace/pasillo.yaml
index ee466b5..00ece83 100644
--- a/lovelace/pasillo.yaml
+++ b/lovelace/pasillo.yaml
@@ -43,10 +43,9 @@ cards:
       - break
       - entities:
           - entities:
-              - entity: sensor.wifi_opengateway_esp32
-              - entity: sensor.opengateway_lora
-            head:
-              entity: binary_sensor.openmqttgateway
+              - sensor.wifi_opengateway_esp32
+              - sensor.opengateway_lora
+            head: binary_sensor.openmqttgateway
             type: 'custom:fold-entity-row'
         type: entities
     layout: vertical
diff --git a/lovelace/principal.yaml b/lovelace/principal.yaml
index 10c8827..3c95cd5 100644
--- a/lovelace/principal.yaml
+++ b/lovelace/principal.yaml
@@ -57,7 +57,7 @@ cards:
       buttons:
         - data:
             entity_id: >-
-              switch.television_principal_switch
+              switch.television_principal
           icon: 'mdi:power'
           id: switch.toggle
           type: service
diff --git a/lovelace/salon.yaml b/lovelace/salon.yaml
index 75f2fdd..bb617d9 100644
--- a/lovelace/salon.yaml
+++ b/lovelace/salon.yaml
@@ -25,6 +25,8 @@ cards:
         show_header_toggle: false
         type: entities
       - entities:
+          - entity: input_boolean.reunion_salon
+            name: Reunión salon
           - entities:
               - entity: binary_sensor.luz_salon_entrada_nightlight
                 name: Modo Noche
@@ -82,14 +84,97 @@ cards:
         type: entities
       - break
       - entities:
-          - entity: switch.arbol_navidad
-            name: Árbol de Navidad
-          - entity: sensor.consumo_arbol_navidad
-            name: Consumo Árbol de Navidad
-          - entity: sensor.consumo_diario_arbol_navidad
-            name: Consumo Diaro Árbol de Navidad
+          - entity: device_tracker.7c_bb_8a_6a_33_cd
+            name: Nintendo
+        type: entities
+      - entities:
+        name: Plantas Salón
+        entity: plant.salon
+        type: plant-status
+      - entities:
+          - entities:
+              - entity: switch.arbol_navidad
+                name: Árbol de Navidad
+              - entity: sensor.consumo_arbol_navidad
+                name: Consumo Árbol de Navidad
+              - entity: sensor.consumo_diario_arbol_navidad
+                name: Consumo Diaro Árbol de Navidad
+            show_header_toggle: false
+            type: entities
+            head:
+              label: Arbol de Navidad
+              type: section
+            type: 'custom:fold-entity-row'
+#          - entities:
+#              - entity: sensor.plantas_salon_humedad
+#                name: Humedad
+#              - entity: sensor.plantas_salon_iluminacion
+#                name: Luminosidad
+#              - entity: sensor.plantas_salon_fertilizante
+#                name: Fertilizante
+#              - entity: sensor.plantas_salon_temperatura
+#                name: Temperatura
+#            show_header_toggle: false
+#            type: entities
+#            head:
+#              label: Plantas
+#              type: section
+#            type: 'custom:fold-entity-row'
+          - entities:
+              - entity: sensor.plantas_salon_humedad
+              - entities:
+                  - entity: script.apagar_encender_humidificador
+                    icon: 'mdi:power'
+                    name: ON/OFF
+                  - entity: script.mas_humidificador
+                    icon: 'mdi:plus'
+                    name: Más
+                  - entity: script.menos_humidificador
+                    icon: 'mdi:minus'
+                    name: Menos
+                  - entity: script.display_humidificador
+                    icon: 'mdi:television'
+                    name: Display
+                  - entity: script.calentador_humidificador
+                    icon: 'mdi:radiator'
+                    name: Calentador
+                  - entity: script.luz_humidificador
+                    icon: 'mdi:lightbulb-outline'
+                    name: Luz
+                  - entity: script.control_humedad_humidificador
+                    icon: 'mdi:cloud-outline'
+                    name: Humedad
+                  - entity: script.tiempo_humidificador
+                    icon: 'mdi:clock'
+                    name: Tiempo
+                  - entity: script.niebla_humidificador
+                    icon: 'mdi:shower-head'
+                    name: Fuerza Niebla
+                show_state: false
+                title: Humidificador
+                type: glance
+            show_header_toggle: false
+            type: entities
+            head:
+              label: Humidificador 
+              type: section
+            type: 'custom:fold-entity-row'
+          - entities:
+              - entity: media_player.television_samsung
+                type: 'custom:mini-media-player'
+              - entity: media_player.google_cast
+                type: 'custom:mini-media-player'
+              - entity: input_boolean.bloqueo_multimedia
+              - entity: sensor.television_salon_encendida
+            show_header_toggle: false
+            type: entities
+            head:
+              label: Multimedia
+              type: section
+            type: 'custom:fold-entity-row'
+        title: Dispositivos
         show_header_toggle: false
-        type: entities        
+        type: entities
       - columns: 3
         entities:
           - entity: script.apagar_encender_humidificador
@@ -122,40 +207,6 @@ cards:
         show_state: false
         title: Humidificador
         type: glance
-      - entity: plant.salon
-        name: Plantas del salón
-        type: plant-status
-      - entities:
-          - entities:
-              - entity: switch.greenwave_reality_inc_powernode_6_port_switch_5
-                name: Purificador de Aire
-                primary:
-                  entity: sensor.greenwave_reality_inc_powernode_6_port_power_5
-                  name: Consumo
-                toggle: true
-                type: 'custom:multiple-entity-row'
-              - entity: switch.greenwave_reality_inc_powernode_6_port_switch_6
-                name: Purificador de Aire
-                primary:
-                  entity: sensor.greenwave_reality_inc_powernode_6_port_power_6
-                  name: Consumo
-                toggle: true
-                type: 'custom:multiple-entity-row'
-              - entity: switch.xiaomi_strip_2
-                name: Regleta Principal Mueble
-            head:
-              label: Interruptores
-              type: section
-            type: 'custom:fold-entity-row'
-        type: entities
-      - entities:
-          - entity: media_player.living_room_ue46f6400
-            type: 'custom:mini-media-player'
-          - entity: media_player.google_cast
-            type: 'custom:mini-media-player'
-          - entity: input_boolean.bloqueo_multimedia
-          - entity: sensor.television_salon_encendida
-        type: entities
     layout: vertical
     type: 'custom:layout-card'
 icon: 'mdi:sofa'
diff --git a/lovelace/varios.yaml b/lovelace/varios.yaml
index 5b9f544..426d138 100644
--- a/lovelace/varios.yaml
+++ b/lovelace/varios.yaml
@@ -30,11 +30,6 @@ cards:
       label: Interruptores
       type: section
     type: 'custom:fold-entity-row'
-  - entities:
-      - sensor.greenwave_reality_inc_powernode_6_port_power_5
-      - sensor.greenwave_reality_inc_powernode_6_port_power_6
-    hours to show: 96
-    type: history-graph
 icon: 'mdi:alert-decagram'
 path: Varios
 title: Varios