diff --git a/.gitignore b/.gitignore index 1e679c0..d3b6118 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,9 @@ !www !www/** !packages +!packages/** +!readme +!readme/** # Folders ignoradas. .storage diff --git a/packages/apertura_puerta_entrada.yaml b/packages/apertura_puerta_entrada.yaml index 3e71e61..8779b2b 100644 --- a/packages/apertura_puerta_entrada.yaml +++ b/packages/apertura_puerta_entrada.yaml @@ -1,9 +1,12 @@ binary_sensor: - platform: mqtt name: "Puerta Entrada" #Puerta de Entrada - payload_on: "A2670A" - payload_off: "A2670E" + value_template: >- + {% if value_json.RfReceived.Data == 'A2670A' %} + {{'ON'}} + {% else %} + {{states('binary_sensor.puerta_entrada') | upper}} + {% endif %} device_class: opening state_topic: "sonoffbridge/tele/RESULT" - value_template: "{{value_json.RfReceived.Data}}" - + off_delay: 10 diff --git a/packages/apertura_puerta_tendedero.yaml b/packages/apertura_puerta_tendedero.yaml index b5519f2..a446c3e 100644 --- a/packages/apertura_puerta_tendedero.yaml +++ b/packages/apertura_puerta_tendedero.yaml @@ -1,8 +1,12 @@ binary_sensor: - platform: mqtt name: "Puerta Tendedero" - payload_on: "0D7F0A" - payload_off: "0D7F0E" + value_template: >- + {% if value_json.RfReceived.Data == '0D7F0A' %} + {{'ON'}} + {% else %} + {{states('binary_sensor.puerta_tendedero') | upper}} + {% endif %} device_class: opening state_topic: "sonoffbridge/tele/RESULT" - value_template: "{{value_json.RfReceived.Data}}" + off_delay: 10 diff --git a/packages/citroen.yaml b/packages/citroen.yaml index ffc62ed..daff0a6 100644 --- a/packages/citroen.yaml +++ b/packages/citroen.yaml @@ -15,57 +15,77 @@ sensor: citroen_bateria: friendly_name: 'Citroen Batería' value_template: >- - {% for signals in states.sensor.citroen_status.attributes.signals -%} - {% if signals.name == "BatteryVoltage" %} - {{ signals.value }} - {% endif %} - {%- endfor -%} + {% if states.sensor.citroen_status.attributes.signals is defined -%} + {% for signals in states.sensor.citroen_status.attributes.signals -%} + {% if signals.name == "BatteryVoltage" %} + {{ signals.value }} + {% endif %} + {%- endfor -%} + {% else %} + Recargando. + {% endif %} unit_of_measurement: 'V' citroen_velocidad: friendly_name: 'Citroen Velocidad' value_template: >- - {% for signals in states.sensor.citroen_status.attributes.signals -%} - {% if signals.name == "GpsSpeed" %} - {{ signals.value }} - {% endif %} - {%- endfor -%} + {% if states.sensor.citroen_status.attributes.signals is defined -%} + {% for signals in states.sensor.citroen_status.attributes.signals -%} + {% if signals.name == "GpsSpeed" %} + {{ signals.value }} + {% endif %} + {%- endfor -%} + {% else %} + Recargando. + {% endif %} unit_of_measurement: 'Km/h' citroen_combustible: friendly_name: 'Citroen Gasolina' value_template: >- - {% for signals in states.sensor.citroen_status.attributes.signals -%} - {% if signals.name == "FuelLevel" %} - {{ signals.value }} - {% endif %} - {%- endfor -%} + {% if states.sensor.citroen_status.attributes.signals is defined -%} + {% for signals in states.sensor.citroen_status.attributes.signals -%} + {% if signals.name == "FuelLevel" %} + {{ signals.value }} + {% endif %} + {%- endfor -%} + {% else %} + Recargando. + {% endif %} unit_of_measurement: 'L' citroen_kilometros: friendly_name: 'Citroen Total Km' value_template: >- - {% for signals in states.sensor.citroen_status.attributes.signals -%} - {% if signals.name == "Odometer" %} - {{ signals.value }} - {% endif %} - {%- endfor -%} + {% if states.sensor.citroen_status.attributes.signals is defined -%} + {% for signals in states.sensor.citroen_status.attributes.signals -%} + {% if signals.name == "Odometer" %} + {{ signals.value }} + {% endif %} + {%- endfor -%} + {% else %} + Recargando. + {% endif %} unit_of_measurement: 'km' citroen_revoluciones: friendly_name: 'Citroen Revoluciones por Minuto' value_template: >- - {% for signals in states.sensor.citroen_status.attributes.signals -%} - {% if signals.name == "EngineSpeed" %} - {{ signals.value }} - {% endif %} - {%- endfor -%} + {% if states.sensor.citroen_status.attributes.signals is defined -%} + {% for signals in states.sensor.citroen_status.attributes.signals -%} + {% if signals.name == "EngineSpeed" %} + {{ signals.value }} + {% endif %} + {%- endfor -%} + {% else %} + Recargando. + {% endif %} unit_of_measurement: 'tr/min' citroen_fecha_update: friendly_name: 'Citroen Actualización' - value_template: "{{ as_timestamp(states.sensor.citroen_status.attributes.updatedAt) | timestamp_custom('%D %-I:%M %P') }}" + value_template: "{{ as_timestamp(state_attr('sensor.citroen_status','updatedAt')) | timestamp_custom('%D %-I:%M %P') }}" citroen_latitud: friendly_name: 'Citroen Latitud' - value_template: '{{ states.sensor.citroen_status.attributes.location.latitude }}' + value_template: '{{ state_attr("sensor.citroen_status", "location").latitude}}' citroen_longitud: friendly_name: 'Citroen Longitud' - value_template: '{{ states.sensor.citroen_status.attributes.location.longitude }}' + value_template: '{{ state_attr("sensor.citroen_status", "location").longitude}}' camera: name: Posición Citroen diff --git a/packages/cloud.yaml b/packages/cloud.yaml index 45089d4..09ca217 100644 --- a/packages/cloud.yaml +++ b/packages/cloud.yaml @@ -1,2 +1,2 @@ -cloud: +#cloud: diff --git a/packages/coche_electrico.yaml b/packages/coche_electrico.yaml index 1b6f76a..6b69780 100644 --- a/packages/coche_electrico.yaml +++ b/packages/coche_electrico.yaml @@ -16,7 +16,6 @@ sensor: state_topic: "shellies/shelly4pro-061E6E/relay/3/power" unit_of_measurement: "W" -sensor: - platform: mqtt name: "Energia General Coche Eléctrico" state_topic: "shellies/shelly4pro-061E6E/relay/3/energy" diff --git a/packages/device_tracker_bluetooth.yaml b/packages/device_tracker_bluetooth.yaml index 1cbce2a..f58200f 100644 --- a/packages/device_tracker_bluetooth.yaml +++ b/packages/device_tracker_bluetooth.yaml @@ -1,2 +1,4 @@ device_tracker: - platform: bluetooth_tracker + interval_seconds: 30 + track_new_devices: false diff --git a/packages/discover.yaml b/packages/discover.yaml index 4d166a0..77c49e3 100644 --- a/packages/discover.yaml +++ b/packages/discover.yaml @@ -2,3 +2,4 @@ discovery: ignore: - yeelight + diff --git a/packages/general_caldera.yaml b/packages/general_caldera.yaml index 87f0b95..efded77 100644 --- a/packages/general_caldera.yaml +++ b/packages/general_caldera.yaml @@ -16,7 +16,6 @@ sensor: state_topic: "shellies/shelly4pro-061E6E/relay/2/power" unit_of_measurement: "W" -sensor: - platform: mqtt name: "Energia General Calefacción" state_topic: "shellies/shelly4pro-061E6E/relay/2/energy" diff --git a/packages/general_luces.yaml b/packages/general_luces.yaml index 5eff2db..b808f45 100644 --- a/packages/general_luces.yaml +++ b/packages/general_luces.yaml @@ -16,7 +16,6 @@ sensor: state_topic: "shellies/shelly4pro-061E6E/relay/0/power" unit_of_measurement: "W" -sensor: - platform: mqtt name: "Energia General Luces" state_topic: "shellies/shelly4pro-061E6E/relay/0/energy" diff --git a/packages/general_persianas.yaml b/packages/general_persianas.yaml index 37d0797..8486aed 100644 --- a/packages/general_persianas.yaml +++ b/packages/general_persianas.yaml @@ -16,7 +16,6 @@ sensor: state_topic: "shellies/shelly4pro-061E6E/relay/1/power" unit_of_measurement: "W" -sensor: - platform: mqtt name: "Energia General Persianas" state_topic: "shellies/shelly4pro-061E6E/relay/1/energy" diff --git a/packages/movimiento_habitacion_estudio.yaml b/packages/movimiento_habitacion_estudio.yaml index edf82c2..953f623 100644 --- a/packages/movimiento_habitacion_estudio.yaml +++ b/packages/movimiento_habitacion_estudio.yaml @@ -1,9 +1,12 @@ binary_sensor: - platform: mqtt name: "Movimiento Habitación Estudio" - payload_on: "2A00BC" - payload_off: "2A00BCoff" + value_template: >- + {% if value_json.RfReceived.Data == '2A00BC' %} + {{'ON'}} + {% else %} + {{states('binary_sensor.movimiento_habitacion_estudio') | upper}} + {% endif %} device_class: motion state_topic: "sonoffbridge/tele/RESULT" - value_template: "{{value_json.RfReceived.Data}}" - off_delay: 8 + off_delay: 10 diff --git a/packages/movimiento_habitacion_principal.yaml b/packages/movimiento_habitacion_principal.yaml index af21002..4cc85c8 100644 --- a/packages/movimiento_habitacion_principal.yaml +++ b/packages/movimiento_habitacion_principal.yaml @@ -1,10 +1,12 @@ binary_sensor: - platform: mqtt name: "Movimiento Habitación Principal" - payload_on: "FDE2BC" - payload_off: "FDE2BCoff" + value_template: >- + {% if value_json.RfReceived.Data == 'FDE2BC' %} + {{'ON'}} + {% else %} + {{states('binary_sensor.movimiento_habitacion_principal') | upper}} + {% endif %} device_class: motion state_topic: "sonoffbridge/tele/RESULT" - value_template: "{{value_json.RfReceived.Data}}" - off_delay: 8 - + off_delay: 10 diff --git a/packages/movimiento_pasillo_habitaciones.yaml b/packages/movimiento_pasillo_habitaciones.yaml index b140912..81a392e 100644 --- a/packages/movimiento_pasillo_habitaciones.yaml +++ b/packages/movimiento_pasillo_habitaciones.yaml @@ -1,10 +1,12 @@ binary_sensor: - platform: mqtt name: "Movimiento Pasillo Habitaciones" - payload_on: "5D559C" - payload_off: "5D559Coff" + value_template: >- + {% if value_json.RfReceived.Data == '5D559C' %} + {{'ON'}} + {% else %} + {{states('binary_sensor.movimiento_pasillo_habitaciones') | upper}} + {% endif %} device_class: motion state_topic: "sonoffbridge/tele/RESULT" - value_template: "{{value_json.RfReceived.Data}}" - off_delay: 8 - + off_delay: 10 diff --git a/packages/smart.yaml b/packages/smart.yaml index fef61b0..7d1378a 100644 --- a/packages/smart.yaml +++ b/packages/smart.yaml @@ -15,57 +15,64 @@ sensor: smart_bateria: friendly_name: 'Smart Batería' value_template: >- - {% for signals in states.sensor.smart_status.attributes.signals -%} - {% if signals.name == "BatteryVoltage" %} - {{ signals.value }} - {% endif %} - {%- endfor -%} + {% if states.sensor.smart_status.attributes.signals is defined -%} + {% for signals in states.sensor.smart_status.attributes.signals -%} + {% if signals.name == "BatteryVoltage" %} + {{ signals.value }} + {% endif %} + {%- endfor -%} + {% else %} + Recargando. + {% endif %} unit_of_measurement: 'V' smart_velocidad: friendly_name: 'Smart Velocidad' value_template: >- - {% for signals in states.sensor.smart_status.attributes.signals -%} - {% if signals.name == "GpsSpeed" %} - {{ signals.value }} - {% endif %} - {%- endfor -%} + {% if states.sensor.smart_status.attributes.signals is defined -%} + {% for signals in states.sensor.smart_status.attributes.signals -%} + {% if signals.name == "GpsSpeed" %} + {{ signals.value }} + {% endif %} + {%- endfor -%} + {% else %} + Recargando. + {% endif %} unit_of_measurement: 'Km/h' -# smart_combustible: -# friendly_name: 'Smart Gasolina' -# value_template: >- -# {% for signals in states.sensor.smart_status.attributes.signals -%} -# {% if signals.name == "FuelLevel" %} -# {{ signals.value }} -# {% endif %} -# {%- endfor -%} -# unit_of_measurement: 'L' smart_kilometros: friendly_name: 'Smart Total Km' value_template: >- - {% for signals in states.sensor.smart_status.attributes.signals -%} - {% if signals.name == "Odometer" %} - {{ signals.value }} - {% endif %} - {%- endfor -%} + {% if states.sensor.smart_status.attributes.signals is defined -%} + {% for signals in states.sensor.smart_status.attributes.signals -%} + {% if signals.name == "Odometer" %} + {{ signals.value }} + {% endif %} + {%- endfor -%} + {% else %} + Recargando. + {% endif %} unit_of_measurement: 'km' smart_revoluciones: friendly_name: 'Smart Revoluciones por Minuto' value_template: >- - {% for signals in states.sensor.smart_status.attributes.signals -%} - {% if signals.name == "EngineSpeed" %} - {{ signals.value }} - {% endif %} - {%- endfor -%} + {% if states.sensor.smart_status.attributes.signals is defined -%} + {% for signals in states.sensor.smart_status.attributes.signals -%} + {% if signals.name == "EngineSpeed" %} + {{ signals.value }} + {% endif %} + {%- endfor -%} + {% else %} + Recargando. + {% endif %} unit_of_measurement: 'tr/min' smart_fecha_update: friendly_name: 'Smart Actualización' - value_template: "{{ as_timestamp(states.sensor.smart_status.attributes.updatedAt) | timestamp_custom('%D %-I:%M %P') }}" + value_template: "{{ as_timestamp(state_attr('sensor.smart_status','updatedAt')) | timestamp_custom('%D %-I:%M %P') }}" smart_latitud: friendly_name: 'Smart Latitud' - value_template: '{{ states.sensor.smart_status.attributes.location.latitude }}' + value_template: '{{ state_attr("sensor.smart_status", "location").latitude}}' smart_longitud: friendly_name: 'Smart Longitud' - value_template: '{{ states.sensor.smart_status.attributes.location.longitude }}' + value_template: '{{ state_attr("sensor.smart_status", "location").longitude}}' camera: name: Posición Smart diff --git a/packages/tts.yaml b/packages/tts.yaml index 39af066..a7ea0f7 100644 --- a/packages/tts.yaml +++ b/packages/tts.yaml @@ -1,2 +1,2 @@ -tts: - - platform: google +#tts: +# - platform: google diff --git a/readme/sonoff-rf-bridge.md b/readme/sonoff-rf-bridge.md new file mode 100644 index 0000000..dce164a --- /dev/null +++ b/readme/sonoff-rf-bridge.md @@ -0,0 +1 @@ +https://community.home-assistant.io/t/sonoff-rf-bridge-strategies-for-receiving-data/108181?u=123