From 962dd8198bd649ac611dd335d44a600b9ca1b86b Mon Sep 17 00:00:00 2001
From: dfcarvajal <diego.fdezcarvajal@emtmadrid.es>
Date: Sun, 27 Dec 2020 17:18:43 +0100
Subject: [PATCH] Cambios en modo puertas

---
 packages/binary_sensor/puerta_bano_general.yaml    | 13 +++++++++++++
 packages/binary_sensor/puerta_bano_principal.yaml  | 13 +++++++++++++
 packages/binary_sensor/puerta_entrada.yaml         |  3 ++-
 .../binary_sensor/puerta_entrada_primario.yaml     | 14 --------------
 .../binary_sensor/puerta_tendedero_primario.yaml   | 14 --------------
 5 files changed, 28 insertions(+), 29 deletions(-)
 create mode 100644 packages/binary_sensor/puerta_bano_general.yaml
 create mode 100644 packages/binary_sensor/puerta_bano_principal.yaml
 delete mode 100644 packages/binary_sensor/puerta_entrada_primario.yaml
 delete mode 100644 packages/binary_sensor/puerta_tendedero_primario.yaml

diff --git a/packages/binary_sensor/puerta_bano_general.yaml b/packages/binary_sensor/puerta_bano_general.yaml
new file mode 100644
index 0000000..4579981
--- /dev/null
+++ b/packages/binary_sensor/puerta_bano_general.yaml
@@ -0,0 +1,13 @@
+binary_sensor:
+  - platform: template
+    sensors:
+       puerta_bano_general:
+         friendly_name: "Puerta Bano General"
+         entity_id:
+           - binary_sensor.puerta_bano_general_primario
+           - binary_sensor.puerta_bano_general_secundario
+           - binary_sensor.puerta_bano_general_zigbee
+         value_template: >-
+            {{ is_state('binary_sensor.puerta_bano_general_primario','on') or is_state('binary_sensor.puerta_bano_general_secundario','on')or is_state('binary_sensor.puerta_bano_general_zigbee','on') }}
+         device_class: door
+
diff --git a/packages/binary_sensor/puerta_bano_principal.yaml b/packages/binary_sensor/puerta_bano_principal.yaml
new file mode 100644
index 0000000..8fe3d6d
--- /dev/null
+++ b/packages/binary_sensor/puerta_bano_principal.yaml
@@ -0,0 +1,13 @@
+binary_sensor:
+  - platform: template
+    sensors:
+       puerta_bano_principal:
+         friendly_name: "Puerta Bano Principal"
+         entity_id:
+           - binary_sensor.puerta_bano_principal_primario
+           - binary_sensor.puerta_bano_principal_secundario
+           - binary_sensor.puerta_bano_principal_zigbee
+         value_template: >-
+            {{ is_state('binary_sensor.puerta_bano_principal_primario','on') or is_state('binary_sensor.puerta_bano_principal_secundario','on') or is_state('binary_sensor.puerta_bano_principal_zigbee','on') }}
+         device_class: door
+
diff --git a/packages/binary_sensor/puerta_entrada.yaml b/packages/binary_sensor/puerta_entrada.yaml
index d78a1ee..43988a0 100644
--- a/packages/binary_sensor/puerta_entrada.yaml
+++ b/packages/binary_sensor/puerta_entrada.yaml
@@ -6,7 +6,8 @@ binary_sensor:
          entity_id:
            - binary_sensor.puerta_entrada_primario
            - binary_sensor.puerta_entrada_secundario
+           - binary_sensor.puerta_entrada_zigbee
          value_template: >-
-            {{ is_state('binary_sensor.puerta_entrada_primario','on') or is_state('binary_sensor.puerta_entrada_secundario','on') }}
+            {{ is_state('binary_sensor.puerta_entrada_primario','on') or is_state('binary_sensor.puerta_entrada_secundario','on') or is_state('binary_sensor.puerta_entrada_zigbee','on') }}
          device_class: door
 
diff --git a/packages/binary_sensor/puerta_entrada_primario.yaml b/packages/binary_sensor/puerta_entrada_primario.yaml
deleted file mode 100644
index 5c2ef00..0000000
--- a/packages/binary_sensor/puerta_entrada_primario.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-binary_sensor:
-  - platform: mqtt
-    name: "Puerta Entrada Primario"
-    value_template: >-
-      {% if value_json.RfReceived.Data == 'A2670A' %}
-        {{'ON'}}
-      {% elif value_json.RfReceived.Data == 'A2670E' %} 
-        {{'OFF'}}
-      {% else %}
-        {{states('binary_sensor.puerta_entrada_primario') | upper}}
-      {% endif %}
-    device_class: opening
-    state_topic: "sonoffbridge/tele/RESULT"
-    off_delay: 300
diff --git a/packages/binary_sensor/puerta_tendedero_primario.yaml b/packages/binary_sensor/puerta_tendedero_primario.yaml
deleted file mode 100644
index 7896d6c..0000000
--- a/packages/binary_sensor/puerta_tendedero_primario.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-binary_sensor:
-  - platform: mqtt
-    name: "Puerta Tendedero Primario"
-    value_template: >-
-      {% if value_json.RfReceived.Data == '0D7F0A' %}
-        {{'ON'}}
-      {% elif value_json.RfReceived.Data == '0D7F0E' %}
-        {{'OFF'}}
-      {% else %}
-        {{states('binary_sensor.puerta_tendedero_primario') | upper}}
-      {% endif %}
-    device_class: opening
-    state_topic: "sonoffbridge/tele/RESULT"
-    off_delay: 300