From 350de3ab371f116906520c72ff9cc12aecca0968 Mon Sep 17 00:00:00 2001 From: dfcarvajal Date: Sat, 6 Jul 2019 11:05:16 +0000 Subject: [PATCH] FIX loging binary_sensor --- .storage/lovelace | 139 ++++++++++-------- customize.yaml | 2 + packages/binary_sensor/movimiento_cocina.yaml | 14 ++ .../movimiento_habitacion_estudio.yaml | 0 .../movimiento_habitacion_mia.yaml | 2 + .../movimiento_habitacion_noha.yaml | 2 + .../movimiento_habitacion_principal.yaml | 2 + .../movimiento_pasillo_entrada.yaml | 2 + .../movimiento_pasillo_habitaciones.yaml | 2 + packages/binary_sensor/puerta_entrada.yaml | 2 + packages/binary_sensor/puerta_tendedero.yaml | 2 + packages/core/ssdp.yaml | 1 + packages/core/zeroconf.yaml | 1 + packages/light/cocina.yaml | 4 + packages/light/led_cocina.yaml | 5 + packages/light/salon_entrada.yaml | 4 + packages/light/salon_television.yaml | 4 + packages/sensor/{tiempo => }/darksky.yaml | 0 packages/sensor/{tiempo => }/estaciones.yaml | 0 packages/sensor/{tiempo => }/openweather.yaml | 0 packages/sensor/temperatura_salon.yaml | 1 + packages/timer/luzcocina.yaml | 3 + packages/timer/luzledcocina.yaml | 3 + packages/vacuum/aspiradora.yaml | 4 + 24 files changed, 136 insertions(+), 63 deletions(-) create mode 100644 packages/binary_sensor/movimiento_cocina.yaml rename packages/{sensor/movimiento => binary_sensor}/movimiento_habitacion_estudio.yaml (100%) rename packages/{sensor/movimiento => binary_sensor}/movimiento_habitacion_mia.yaml (79%) rename packages/{sensor/movimiento => binary_sensor}/movimiento_habitacion_noha.yaml (79%) rename packages/{sensor/movimiento => binary_sensor}/movimiento_habitacion_principal.yaml (79%) rename packages/{sensor/movimiento => binary_sensor}/movimiento_pasillo_entrada.yaml (79%) rename packages/{sensor/movimiento => binary_sensor}/movimiento_pasillo_habitaciones.yaml (79%) create mode 100644 packages/core/ssdp.yaml create mode 100644 packages/core/zeroconf.yaml create mode 100644 packages/light/cocina.yaml create mode 100644 packages/light/led_cocina.yaml create mode 100644 packages/light/salon_entrada.yaml create mode 100644 packages/light/salon_television.yaml rename packages/sensor/{tiempo => }/darksky.yaml (100%) rename packages/sensor/{tiempo => }/estaciones.yaml (100%) rename packages/sensor/{tiempo => }/openweather.yaml (100%) create mode 100644 packages/timer/luzcocina.yaml create mode 100644 packages/timer/luzledcocina.yaml create mode 100644 packages/vacuum/aspiradora.yaml diff --git a/.storage/lovelace b/.storage/lovelace index 196a3f8..1d606f9 100644 --- a/.storage/lovelace +++ b/.storage/lovelace @@ -52,6 +52,7 @@ }, "entities": [ "device_tracker.diego_android", + "device_tracker.diego_android_2", "device_tracker.silvia_android", "device_tracker.silvia_mi5", "device_tracker.joaquin", @@ -91,10 +92,14 @@ { "entities": [ "light.luz_tendedero", - "light.luz_entrada_dormitorio", - "light.luz_entrada_pasillo", - "light.luz_estudio_pasillo", - "light.luz_habitaciones_pasillo", + "light.luz_cocina", + "light.luz_salon_entrada", + "light.luz_salon_entrada_ambilight", + "light.luz_salon_television", + "light.luz_salon_television_ambilight", + "light.luz_pasillo_bano", + "light.luz_pasillo_estudio", + "light.luz_pasillo_salon", "light.luz_habitacion_estudio", "light.luz_habitacion_principal", "light.luz_habitacion_mia", @@ -124,6 +129,7 @@ { "entities": [ "binary_sensor.movimiento_pasillo_entrada", + "binary_sensor.movimiento_cocina", "binary_sensor.movimiento_salon_entrada", "binary_sensor.movimiento_habitacion_principal", "binary_sensor.movimiento_habitacion_noha", @@ -238,23 +244,13 @@ "type": "entities" }, { - "cards": [ + "entities": [ { - "entities": [ - { - "entity": "vacuum.rockrobo" - } - ], - "show_header_toggle": false, - "title": "Aspiradora", - "type": "entities" - }, - { - "entity": "camera.rockrobo_map", - "type": "picture-entity" + "entity": "vacuum.xiaomi_vacuum_cleaner" } ], - "type": "vertical-stack" + "title": "Aspiradora", + "type": "entities" } ], "icon": "mdi:home-minus", @@ -460,6 +456,49 @@ "title": "Gr\u00e1fica de Transferencia (2 horas)", "type": "history-graph" }, + { + "entities": [ + { + "entity": "light.luz_salon_entrada" + }, + { + "entity": "light.luz_salon_entrada_ambilight" + }, + { + "entity": "binary_sensor.luz_salon_entrada_nightlight" + }, + { + "entity": "light.luz_salon_television" + }, + { + "entity": "light.luz_salon_television_ambilight" + }, + { + "entity": "binary_sensor.luz_salon_television_nightlight" + } + ], + "title": "Luces", + "type": "entities" + }, + { + "entities": [ + { + "entity": "cover.persiana_salon_fase_dos" + }, + { + "entity": "input_boolean.control_persiana_salon_fase_dos" + }, + { + "entity": "cover.persiana_salon_piscina" + }, + { + "entity": "input_boolean.control_persiana_salon_piscina" + } + ], + "show_header_toggle": false, + "title": "Persianas", + "type": "entities" + }, { "entity": "media_player.television_salon", "type": "media-control" @@ -521,36 +560,6 @@ "title": "Humidificador", "type": "glance" }, - { - "cards": [ - { - "entity": "script.apagar_encender_humidificador", - "hold_action": { - "action": "more-info" - }, - "icon": "mdi:power", - "name": "ON/OFF", - "tap_action": { - "action": "toggle" - }, - "theme": "default", - "type": "entity-button" - } - ], - "name": "Humidificador", - "type": "horizontal-stack" - }, - { - "entities": [ - { - "entity": "switch.xiaomi_strip_2", - "name": "Regleta Principal Mueble" - } - ], - "show_header_toggle": false, - "title": "Interruptores", - "type": "entities" - }, { "entity": "fan.xiaomi_miio_device_2", "hold_action": { @@ -565,20 +574,12 @@ { "entities": [ { - "entity": "cover.persiana_salon_fase_dos" - }, - { - "entity": "input_boolean.control_persiana_salon_fase_dos" - }, - { - "entity": "cover.persiana_salon_piscina" - }, - { - "entity": "input_boolean.control_persiana_salon_piscina" + "entity": "switch.xiaomi_strip_2", + "name": "Regleta Principal Mueble" } ], "show_header_toggle": false, - "title": "Persianas", + "title": "Interruptores", "type": "entities" } ], @@ -611,6 +612,12 @@ }, { "entities": [ + { + "entity": "light.luz_cocina" + }, + { + "entity": "light.led_cocina" + }, { "entity": "light.luz_tendedero" } @@ -992,14 +999,20 @@ "type": "glance" }, "entities": [ - { - "entity": "timer.luzentradapasillo" - }, { "entity": "timer.luzhabitacionestudio" }, { - "entity": "timer.luzpasillo" + "entity": "timer.luzledcocina" + }, + { + "entity": "timer.luzcocina" + }, + { + "entity": "timer.luzpasilloestudio" + }, + { + "entity": "timer.luzpasillosalon" } ], "show_empty": true, diff --git a/customize.yaml b/customize.yaml index 1bbbba1..19a9ae2 100644 --- a/customize.yaml +++ b/customize.yaml @@ -24,3 +24,5 @@ switch.light_led_cabecero: friendly_name: Luz Cabecero Principal assumed_state: false icon: mdi:lightbulb +binary_sensor.movimiento_salon_entrada: + device_class: motion diff --git a/packages/binary_sensor/movimiento_cocina.yaml b/packages/binary_sensor/movimiento_cocina.yaml new file mode 100644 index 0000000..bdf55eb --- /dev/null +++ b/packages/binary_sensor/movimiento_cocina.yaml @@ -0,0 +1,14 @@ +binary_sensor: + - platform: mqtt + name: "Movimiento Cocina" + value_template: >- + {% if value_json.RfReceived.Data == '8B6E9C' %} + {{'ON'}} + {% elif value_json.RfReceived.Data == '8B6E90' %} + {{'OFF'}} + {% else %} + {{states('binary_sensor.movimiento_cocina') | upper}} + {% endif %} + device_class: motion + state_topic: "sonoffbridge/tele/RESULT" + off_delay: 10 diff --git a/packages/sensor/movimiento/movimiento_habitacion_estudio.yaml b/packages/binary_sensor/movimiento_habitacion_estudio.yaml similarity index 100% rename from packages/sensor/movimiento/movimiento_habitacion_estudio.yaml rename to packages/binary_sensor/movimiento_habitacion_estudio.yaml diff --git a/packages/sensor/movimiento/movimiento_habitacion_mia.yaml b/packages/binary_sensor/movimiento_habitacion_mia.yaml similarity index 79% rename from packages/sensor/movimiento/movimiento_habitacion_mia.yaml rename to packages/binary_sensor/movimiento_habitacion_mia.yaml index 3d385fb..feead59 100644 --- a/packages/sensor/movimiento/movimiento_habitacion_mia.yaml +++ b/packages/binary_sensor/movimiento_habitacion_mia.yaml @@ -6,6 +6,8 @@ binary_sensor: {{'ON'}} {% elif value_json.RfReceived.Data == 'CBD190' %} {{'OFF'}} + {% else %} + {{states('binary_sensor.movimiento_habitacion_mia') | upper}} {% endif %} device_class: motion state_topic: "sonoffbridge/tele/RESULT" diff --git a/packages/sensor/movimiento/movimiento_habitacion_noha.yaml b/packages/binary_sensor/movimiento_habitacion_noha.yaml similarity index 79% rename from packages/sensor/movimiento/movimiento_habitacion_noha.yaml rename to packages/binary_sensor/movimiento_habitacion_noha.yaml index 87c9a5f..2f77dbb 100644 --- a/packages/sensor/movimiento/movimiento_habitacion_noha.yaml +++ b/packages/binary_sensor/movimiento_habitacion_noha.yaml @@ -6,6 +6,8 @@ binary_sensor: {{'ON'}} {% elif value_json.RfReceived.Data == 'DFEF90' %} {{'OFF'}} + {% else %} + {{states('binary_sensor.movimiento_habitacion_noha') | upper}} {% endif %} device_class: motion state_topic: "sonoffbridge/tele/RESULT" diff --git a/packages/sensor/movimiento/movimiento_habitacion_principal.yaml b/packages/binary_sensor/movimiento_habitacion_principal.yaml similarity index 79% rename from packages/sensor/movimiento/movimiento_habitacion_principal.yaml rename to packages/binary_sensor/movimiento_habitacion_principal.yaml index 654f603..5328a34 100644 --- a/packages/sensor/movimiento/movimiento_habitacion_principal.yaml +++ b/packages/binary_sensor/movimiento_habitacion_principal.yaml @@ -6,6 +6,8 @@ binary_sensor: {{'ON'}} {% elif value_json.RfReceived.Data == 'FDE2B0' %} {{'OFF'}} + {% else %} + {{states('binary_sensor.movimiento_habitacion_principal') | upper}} {% endif %} device_class: motion state_topic: "sonoffbridge/tele/RESULT" diff --git a/packages/sensor/movimiento/movimiento_pasillo_entrada.yaml b/packages/binary_sensor/movimiento_pasillo_entrada.yaml similarity index 79% rename from packages/sensor/movimiento/movimiento_pasillo_entrada.yaml rename to packages/binary_sensor/movimiento_pasillo_entrada.yaml index ca72419..d61ea2c 100644 --- a/packages/sensor/movimiento/movimiento_pasillo_entrada.yaml +++ b/packages/binary_sensor/movimiento_pasillo_entrada.yaml @@ -6,6 +6,8 @@ binary_sensor: {{'ON'}} {% elif value_json.RfReceived.Data == '4A3E90' %} {{'OFF'}} + {% else %} + {{states('binary_sensor.movimiento_pasillo_entrada') | upper}} {% endif %} device_class: motion state_topic: "sonoffbridge/tele/RESULT" diff --git a/packages/sensor/movimiento/movimiento_pasillo_habitaciones.yaml b/packages/binary_sensor/movimiento_pasillo_habitaciones.yaml similarity index 79% rename from packages/sensor/movimiento/movimiento_pasillo_habitaciones.yaml rename to packages/binary_sensor/movimiento_pasillo_habitaciones.yaml index 5ab20b5..9999ccc 100644 --- a/packages/sensor/movimiento/movimiento_pasillo_habitaciones.yaml +++ b/packages/binary_sensor/movimiento_pasillo_habitaciones.yaml @@ -6,6 +6,8 @@ binary_sensor: {{'ON'}} {% elif value_json.RfReceived.Data == '5D5590' %} {{'OFF'}} + {% else %} + {{states('binary_sensor.movimiento_pasillo_habitaciones') | upper}} {% endif %} device_class: motion state_topic: "sonoffbridge/tele/RESULT" diff --git a/packages/binary_sensor/puerta_entrada.yaml b/packages/binary_sensor/puerta_entrada.yaml index 84021d6..44e5e53 100644 --- a/packages/binary_sensor/puerta_entrada.yaml +++ b/packages/binary_sensor/puerta_entrada.yaml @@ -6,6 +6,8 @@ binary_sensor: {{'ON'}} {% elif value_json.RfReceived.Data == 'A2670E' %} {{'OFF'}} + {% else %} + {{states('binary_sensor.puerta_entrada') | upper}} {% endif %} device_class: opening state_topic: "sonoffbridge/tele/RESULT" diff --git a/packages/binary_sensor/puerta_tendedero.yaml b/packages/binary_sensor/puerta_tendedero.yaml index 60745ef..82d0e24 100644 --- a/packages/binary_sensor/puerta_tendedero.yaml +++ b/packages/binary_sensor/puerta_tendedero.yaml @@ -6,6 +6,8 @@ binary_sensor: {{'ON'}} {% elif value_json.RfReceived.Data == '0D7F0E' %} {{'OFF'}} + {% else %} + {{states('binary_sensor.puerta_tendedero') | upper}} {% endif %} device_class: opening state_topic: "sonoffbridge/tele/RESULT" diff --git a/packages/core/ssdp.yaml b/packages/core/ssdp.yaml new file mode 100644 index 0000000..dc1dc0b --- /dev/null +++ b/packages/core/ssdp.yaml @@ -0,0 +1 @@ +ssdp: diff --git a/packages/core/zeroconf.yaml b/packages/core/zeroconf.yaml new file mode 100644 index 0000000..16b2a55 --- /dev/null +++ b/packages/core/zeroconf.yaml @@ -0,0 +1 @@ +zeroconf: diff --git a/packages/light/cocina.yaml b/packages/light/cocina.yaml new file mode 100644 index 0000000..0916a3d --- /dev/null +++ b/packages/light/cocina.yaml @@ -0,0 +1,4 @@ +yeelight: + devices: + 10.10.1.167: + name: Luz Cocina diff --git a/packages/light/led_cocina.yaml b/packages/light/led_cocina.yaml new file mode 100644 index 0000000..1ba4a53 --- /dev/null +++ b/packages/light/led_cocina.yaml @@ -0,0 +1,5 @@ +light: + - platform: flux_led + devices: + 10.10.1.205: + name: Led Cocina diff --git a/packages/light/salon_entrada.yaml b/packages/light/salon_entrada.yaml new file mode 100644 index 0000000..74d3f55 --- /dev/null +++ b/packages/light/salon_entrada.yaml @@ -0,0 +1,4 @@ +yeelight: + devices: + 10.10.1.166: + name: Luz Salon Entrada diff --git a/packages/light/salon_television.yaml b/packages/light/salon_television.yaml new file mode 100644 index 0000000..c5d80eb --- /dev/null +++ b/packages/light/salon_television.yaml @@ -0,0 +1,4 @@ +yeelight: + devices: + 10.10.1.165: + name: Luz Salon Television diff --git a/packages/sensor/tiempo/darksky.yaml b/packages/sensor/darksky.yaml similarity index 100% rename from packages/sensor/tiempo/darksky.yaml rename to packages/sensor/darksky.yaml diff --git a/packages/sensor/tiempo/estaciones.yaml b/packages/sensor/estaciones.yaml similarity index 100% rename from packages/sensor/tiempo/estaciones.yaml rename to packages/sensor/estaciones.yaml diff --git a/packages/sensor/tiempo/openweather.yaml b/packages/sensor/openweather.yaml similarity index 100% rename from packages/sensor/tiempo/openweather.yaml rename to packages/sensor/openweather.yaml diff --git a/packages/sensor/temperatura_salon.yaml b/packages/sensor/temperatura_salon.yaml index 37d97eb..2379ba1 100644 --- a/packages/sensor/temperatura_salon.yaml +++ b/packages/sensor/temperatura_salon.yaml @@ -2,5 +2,6 @@ sensor: - platform: template sensors: temperatura_salon: + friendly_name: 'Temperatura Salón' value_template: "{{state_attr('fan.xiaomi_miio_device_2', 'temperature')}}" unit_of_measurement: ºC diff --git a/packages/timer/luzcocina.yaml b/packages/timer/luzcocina.yaml new file mode 100644 index 0000000..f631447 --- /dev/null +++ b/packages/timer/luzcocina.yaml @@ -0,0 +1,3 @@ +timer: + luzcocina: + duration: '00:05:00' diff --git a/packages/timer/luzledcocina.yaml b/packages/timer/luzledcocina.yaml new file mode 100644 index 0000000..9acc2e4 --- /dev/null +++ b/packages/timer/luzledcocina.yaml @@ -0,0 +1,3 @@ +timer: + luzledcocina: + duration: '00:03:00' diff --git a/packages/vacuum/aspiradora.yaml b/packages/vacuum/aspiradora.yaml new file mode 100644 index 0000000..d371f6a --- /dev/null +++ b/packages/vacuum/aspiradora.yaml @@ -0,0 +1,4 @@ +vacuum: + - platform: xiaomi_miio + host: 10.10.1.171 + token: 75574576344879356c384c3064765152