change mqtt to new version

2022-09-14 01:57:00 +01:00
parent 848c33d3f7
commit 07373045fc
10 changed files with 547 additions and 688 deletions
--- a/automations.yaml
+++ b/automations.yaml
@@ -1,434 +1,392 @@
- id: '1589065904158'
-  alias: Aquecimento Agua
-  description: ''
+- id: "1589065904158"
+  alias: Agua - Aquecimento
+  description: ""
  trigger:
-  - at: 04:00
-    platform: time
-  - at: 08:00:00
-    platform: time
-  - at: '18:00:00'
-    platform: time
-  - at: '22:00'
-    platform: time
+    - at: 06:00:00
+      platform: time
+    - at: 08:00:00
+      platform: time
+    - at: "16:00:00"
+      platform: time
+    - at: "20:00:00"
+      platform: time
  action:
-  - data: {}
-    entity_id: switch.aquecimento_agua
-    service: switch.toggle
+    - data: {}
+      entity_id: switch.aquecimento_agua
+      service: switch.toggle
  mode: single
- id: '1589067784246'
-  alias: Aquario
-  description: ''
-  trigger:
-  - at: '15:00:00'
-    platform: time
-  condition: []
-  action:
-  - data: {}
-    entity_id: light.luz_aquario
-    service: light.turn_on
-  - delay:
-      hours: 4
-      minutes: 0
-      seconds: 0
-      milliseconds: 0
-  - data: {}
-    entity_id: light.luz_aquario
-    service: light.turn_off
-  mode: single
- id: '1578994958446'
+- id: "1578994958446"
  alias: Garagem  - Warn gate Open
-  description: ''
+  description: ""
  trigger:
-  - entity_id: binary_sensor.portao_garagem_input
-    from: 'on'
-    platform: state
-    to: 'off'
+    - entity_id: binary_sensor.portao_garagem_input
+      from: "on"
+      platform: state
+      to: "off"
  condition: []
  action:
-  - data:
-      message: O portao da garagem foi aberto
-      title: '*Portao da garagem*'
-    service: notify.buttler
- id: '1579542436595'
+    - data:
+        message: O portao da garagem foi aberto
+        title: "*Portao da garagem*"
+      service: notify.buttler
+- id: "1579542436595"
  alias: Garagem  - warn gate closed
-  description: ''
+  description: ""
  trigger:
-  - entity_id: binary_sensor.portao_garagem_input
-    from: 'off'
-    platform: state
-    to: 'on'
+    - entity_id: binary_sensor.portao_garagem_input
+      from: "off"
+      platform: state
+      to: "on"
  condition: []
  action:
-  - data:
-      message: O portao da garagem foi fechado
-      title: '*Portao da garagem*'
-    service: notify.buttler
- id: '1583841493592'
-  alias: Notify when hacs needs update
-  description: ''
+    - data:
+        message: O portao da garagem foi fechado
+        title: "*Portao da garagem*"
+      service: notify.buttler
+- id: "1583841493592"
+  alias: System - Notify when hacs needs update
+  description: ""
  trigger:
-  - entity_id: sensor.hacs
-    from: '0'
-    platform: state
-    to: '1'
+    - entity_id: sensor.hacs
+      from: "0"
+      platform: state
+      to: "1"
  action:
-  - data:
-      message: System HACS needs updating
-      title: '*HACS*'
-    service: notify.buttler
- id: '1590057590266'
-  alias: Sistema Rega Valvula 1 - 22h
-  description: ''
-  trigger:
-  - at: '23:30:00'
-    platform: time
-  condition: []
-  action:
-  - service: notify.whatsapp
-    data:
-      message: Sistema de rega a iniciar
-      title: inicio rega
-  - data: {}
-    entity_id: switch.valvula_jardim_1
-    service: switch.turn_on
-  - delay: 00:10:00
-  - data: {}
-    entity_id: switch.valvula_jardim_1
-    service: switch.turn_off
-  mode: single
- id: sisRega2
-  alias: Sistema Rega Valvula 2 - 22h
-  description: ''
-  trigger:
-  - at: '23:40:00'
-    platform: time
-  condition: []
-  action:
-  - data: {}
-    entity_id: switch.valvula_jardim_2
-    service: switch.turn_on
-  - delay: 00:10:00
-  - data: {}
-    entity_id: switch.valvula_jardim_2
-    service: switch.turn_off
-  mode: single
- id: sisRega3
-  alias: Sistema Rega Valvula 3 - 22h
-  description: ''
-  trigger:
-  - at: '23:50:00'
-    platform: time
-  condition: []
-  action:
-  - data: {}
-    entity_id: switch.valvula_jardim_3
-    service: switch.turn_on
-  - delay: 00:10:00
-  - data: {}
-    entity_id: switch.valvula_jardim_3
-    service: switch.turn_off
-  mode: single
- id: '1590425966320'
-  alias: Watering Garden Manual cycle
-  description: ''
-  trigger: []
-  condition: []
-  action:
-  - data: {}
-    entity_id: automation.sistema_rega_valvula_1
-    service: automation.trigger
-  - delay: 00:10:00
-  - data: {}
-    entity_id: automation.sistema_rega_valvula_2
-    service: automation.trigger
-  - delay: 00:10:00
-  - data: {}
-    entity_id: automation.sistema_rega_valvula_3
-    service: automation.trigger
- id: '1598985491596'
+    - data:
+        message: System HACS needs updating
+        title: "*HACS*"
+      service: notify.buttler
+- id: "1598985491596"
  alias: WC Red luz demasiado tempo ligada +10'
  description: Avisa se luz Wc Vermelha acesa por mais de 10 minutos
  trigger:
-  - entity_id: light.luz_wc_vermelha
-    for: 00:10:00
-    from: 'off'
-    platform: state
-    to: 'on'
+    - entity_id: light.luz_wc_vermelha
+      for: 00:10:00
+      from: "off"
+      platform: state
+      to: "on"
  condition: []
  action:
-  - data:
-      message: Wc Vermelha luz acesa
-      title: '*Luz WC Vermelha*'
-    service: notify.buttler
-  - service: notify.whatsapp
-    data:
-      message: Wc Vermelha luz acesa
-  - service: notify.whatsapprita
-    data:
-      message: Wc Vermelha luz acesa
+    - data:
+        message: Wc Vermelha luz acesa
+        title: "*Luz WC Vermelha*"
+      service: notify.buttler
+    - service: notify.whatsapp
+      data:
+        message: Wc Vermelha luz acesa
+    - service: notify.whatsapprita
+      data:
+        message: Wc Vermelha luz acesa
  mode: single
- id: '1603375184553'
-  alias: 'Garagem luz 1 demasiado tempo ligada +10'' '
+- id: "1603375184553"
+  alias: "Garagem - Luz 1 demasiado tempo ligada +10' "
  description: Avisa se luz Wc Vermelha acesa por mais de 10 minutos
  trigger:
-  - entity_id: light.luz_garagem_1
-    for: 00:10:00
-    from: 'off'
-    platform: state
-    to: 'on'
+    - entity_id: light.luz_garagem_1
+      for: 00:10:00
+      from: "off"
+      platform: state
+      to: "on"
  condition: []
  action:
-  - data:
-      message: Luz garagem 1 acesa
-      title: '*Luz garagem 1*'
-    service: notify.buttler
-  - service: notify.whatsapp
-    data:
-      message: Luz garagem 1 acesa
-  - service: notify.whatsapprita
-    data:
-      message: Luz garagem 1 acesa
+    - data:
+        message: Luz garagem 1 acesa
+        title: "*Luz garagem 1*"
+      service: notify.buttler
+    - service: notify.whatsapp
+      data:
+        message: Luz garagem 1 acesa
+    - service: notify.whatsapprita
+      data:
+        message: Luz garagem 1 acesa
  mode: single
- id: '1603375213791'
-  alias: Garagem luz 2 demasiado tempo ligada +10'
+- id: "1603375213791"
+  alias: Garagem - Luz 2 demasiado tempo ligada +10'
  description: Avisa se luz Wc Vermelha acesa por mais de 10 minutos
  trigger:
-  - entity_id: light.luz_garagem_2
-    for: 00:10:00
-    from: 'off'
-    platform: state
-    to: 'on'
+    - entity_id: light.luz_garagem_2
+      for: 00:10:00
+      from: "off"
+      platform: state
+      to: "on"
  condition: []
  action:
-  - data:
-      message: Luz garagem 2 acesa
-      title: '*Luz garagem 2*'
-    service: notify.buttler
-  - service: notify.whatsapp
-    data:
-      message: Luz garagem 2 acesa
-  - service: notify.whatsapprita
-    data:
-      message: Luz garagem 2 acesa
+    - data:
+        message: Luz garagem 2 acesa
+        title: "*Luz garagem 2*"
+      service: notify.buttler
+    - service: notify.whatsapp
+      data:
+        message: Luz garagem 2 acesa
+    - service: notify.whatsapprita
+      data:
+        message: Luz garagem 2 acesa
  mode: single
- id: '1604863723383'
+- id: "1604863723383"
  alias: WC Preto luz demasiado tempo ligada +10'
  description: Avisa se luz Wc Preto acesa por mais de 10 minutos
  trigger:
-  - entity_id: light.luz_wc_preto
-    for: 00:10:00
-    from: 'off'
-    platform: state
-    to: 'on'
+    - entity_id: light.luz_wc_preto
+      for: 00:10:00
+      from: "off"
+      platform: state
+      to: "on"
  condition: []
  action:
-  - data:
-      message: Wc Preto luz acesa
-      title: '*Luz WC Preto *'
-    service: notify.buttler
-  - service: notify.whatsapp
-    data:
-      message: Luz WC Preto acesa
-  - service: notify.whatsapprita
-    data:
-      message: Luz WC Preto acesa
+    - data:
+        message: Wc Preto luz acesa
+        title: "*Luz WC Preto *"
+      service: notify.buttler
+    - service: notify.whatsapp
+      data:
+        message: Luz WC Preto acesa
+    - service: notify.whatsapprita
+      data:
+        message: Luz WC Preto acesa
  mode: single
- id: '1613783833916'
-  alias: BomDiaEstores
-  description: ''
+- id: "1613783833916"
+  alias: Blinders - BomDiaEstores - Week
+  description: ""
  trigger:
-  - platform: time
-    at: 07:30
-  condition: []
+    - platform: time
+      at: 07:30
+  condition:
+    - condition: time
+      weekday:
+        - mon
+        - tue
+        - wed
+        - thu
+        - fri
  action:
-  - service: cover.set_cover_position
-    data:
-      position: 30
-    target:
-      entity_id: cover.coverescritorio
-  - service: cover.set_cover_position
-    data:
-      position: 20
-    target:
-      entity_id: cover.coverqprincipal
-  - service: cover.set_cover_position
-    data:
-      position: 0
-    target:
-      entity_id: cover.coverqclara
-  - service: cover.set_cover_position
-    data:
-      position: 80
-    target:
-      entity_id: cover.covercozinha
-  - service: cover.set_cover_position
-    data:
-      position: 50
-    target:
-      entity_id:
-      - cover.coversaladir
-      - cover.coversalaesq
+    - service: cover.set_cover_position
+      data:
+        position: 30
+      target:
+        entity_id: cover.coverescritorio
+    - service: cover.set_cover_position
+      data:
+        position: 20
+      target:
+        entity_id: cover.coverqprincipal
+    - service: cover.set_cover_position
+      data:
+        position: 0
+      target:
+        entity_id: cover.coverqclara
+    - service: cover.set_cover_position
+      data:
+        position: 80
+      target:
+        entity_id: cover.covercozinha
+    - service: cover.set_cover_position
+      data:
+        position: 50
+      target:
+        entity_id:
+          - cover.coversaladir
+          - cover.coversalaesq
  mode: single
- id: '1614212887668'
-  alias: Curious George
-  description: ''
+- id: "1614212887668"
+  alias: Blinders - Curious George
+  description: ""
  trigger:
-  - platform: sun
-    event: sunset
-    offset: 00:15:00
+    - platform: sun
+      event: sunset
+      offset: 00:15:00
  condition: []
  action:
-  - service: cover.set_cover_position
-    data:
-      position: 15
-    target:
-      entity_id: cover.coverescritorio
-  - service: cover.close_cover
-    data: {}
-    target:
-      entity_id: cover.coverqclara
-  - service: cover.set_cover_position
-    data:
-      position: 15
-    target:
-      entity_id: cover.coverqprincipal
-  - service: cover.set_cover_position
-    data:
-      position: 15
-    target:
-      entity_id: cover.covercozinha
-  - service: cover.set_cover_position
-    target:
-      entity_id:
-      - cover.coversaladir
-      - cover.coversalaesq
-    data:
-      position: 25
+    - service: cover.set_cover_position
+      data:
+        position: 15
+      target:
+        entity_id: cover.coverescritorio
+    - service: cover.close_cover
+      data: {}
+      target:
+        entity_id: cover.coverqclara
+    - service: cover.set_cover_position
+      data:
+        position: 15
+      target:
+        entity_id: cover.coverqprincipal
+    - service: cover.set_cover_position
+      data:
+        position: 15
+      target:
+        entity_id: cover.covercozinha
+    - service: cover.set_cover_position
+      target:
+        entity_id:
+          - cover.coversaladir
+          - cover.coversalaesq
+      data:
+        position: 25
  mode: single
- id: '1614212907624'
-  alias: Close Covers
-  description: ''
+- id: "1614212907624"
+  alias: Blinders - Close Covers
+  description: ""
  trigger:
-  - platform: sun
-    event: sunset
-    offset: 01:00
+    - platform: sun
+      event: sunset
+      offset: 01:00
  condition: []
  action:
-  - service: cover.close_cover
-    data: {}
-    target:
-      entity_id: cover.coverescritorio
-  - service: cover.close_cover
-    data: {}
-    target:
-      entity_id: cover.coverqclara
-  - service: cover.close_cover
-    data: {}
-    target:
-      entity_id: cover.coverqprincipal
-  - service: cover.close_cover
-    data: {}
-    target:
-      entity_id:
-      - cover.coversaladir
-      - cover.coversalaesq
-  - service: cover.close_cover
-    target:
-      entity_id: cover.covercozinha
+    - service: cover.close_cover
+      data: {}
+      target:
+        entity_id: cover.coverescritorio
+    - service: cover.close_cover
+      data: {}
+      target:
+        entity_id: cover.coverqclara
+    - service: cover.close_cover
+      data: {}
+      target:
+        entity_id: cover.coverqprincipal
+    - service: cover.close_cover
+      data: {}
+      target:
+        entity_id:
+          - cover.coversaladir
+          - cover.coversalaesq
+    - service: cover.close_cover
+      target:
+        entity_id: cover.covercozinha
+      data: {}
  mode: single
- id: '1614588424982'
-  alias: Let There be Light
-  description: ''
+- id: "1614588424982"
+  alias: Blinders - Let There be Light - Week
+  description: ""
  trigger:
-  - platform: time
-    at: 08:30:00
-  condition: []
+    - platform: time
+      at: 08:30:00
+  condition:
+    - condition: time
+      weekday:
+        - fri
+        - thu
+        - wed
+        - tue
+        - mon
  action:
-  - service: cover.set_cover_position
-    data:
-      position: 90
-    target:
-      entity_id: cover.coverescritorio
-  - service: cover.set_cover_position
-    data:
-      position: 95
-    target:
-      entity_id: cover.coverqprincipal
-  - service: cover.set_cover_position
-    data:
-      position: 90
-    target:
-      entity_id:
-      - cover.coversaladir
-      - cover.coversalaesq
+    - service: cover.set_cover_position
+      data:
+        position: 60
+      target:
+        entity_id: cover.coverescritorio
+    - service: cover.set_cover_position
+      data:
+        position: 60
+      target:
+        entity_id: cover.coverqprincipal
+    - service: cover.set_cover_position
+      data:
+        position: 60
+      target:
+        entity_id:
+          - cover.coversaladir
+          - cover.coversalaesq
+          - cover.covercozinha
  mode: single
- id: '1615401312170'
+- id: "1615401312170"
  alias: Start Aleixo
-  description: ''
+  description: ""
  trigger:
-  - platform: time
-    at: '10:00'
+    - platform: time
+      at: "10:00"
  condition: []
  action:
-  - service: vacuum.start
-    target:
-      entity_id: vacuum.aleixo_s5_max
+    - service: vacuum.start
+      target:
+        entity_id: vacuum.aleixo_s5_max
  mode: single
- id: '1621620922521'
+- id: "1621620922521"
  alias: WC castanho luz demasiado tempo ligada +10'
  description: Avisa se luz Wc Castanho acesa por mais de 10 minutos
  trigger:
-  - entity_id: switch.luzwccast
-    for: 00:10:00
-    from: 'off'
-    platform: state
-    to: 'on'
+    - entity_id: switch.luzwccast
+      for: 00:10:00
+      from: "off"
+      platform: state
+      to: "on"
  condition: []
  action:
-  - data:
-      message: Wc Castanho luz acesa
-      title: '*Luz WC Castanho *'
-    service: notify.buttler
-  - service: notify.whatsapp
-    data:
-      message: Luz WC Castanho acesa
-  - service: notify.whatsapprita
-    data:
-      message: Luz WC Castanho acesa
+    - data:
+        message: Wc Castanho luz acesa
+        title: "*Luz WC Castanho *"
+      service: notify.buttler
+    - service: notify.whatsapp
+      data:
+        message: Luz WC Castanho acesa
+    - service: notify.whatsapprita
+      data:
+        message: Luz WC Castanho acesa
  mode: single
- id: '1640114920854'
+- id: "1640114920854"
  alias: Garagem  - Turn light on at night
-  description: ''
+  description: ""
  trigger:
-  - entity_id: cover.garage_door
-    from: closed
-    platform: state
+    - entity_id: binary_sensor.portao_garagem_input
+      from: "on"
+      platform: state
  condition:
-  - condition: or
-    conditions:
-    - condition: sun
-      before: sunrise
-    - condition: sun
-      after: sunset
+    - condition: or
+      conditions:
+        - condition: sun
+          before: sunrise
+        - condition: sun
+          after: sunset
  action:
-  - data:
-      message: ligar luz
-      title: ligar luz temp
-    service: notify.buttler
-  - service: light.turn_on
-    target:
-      entity_id: light.luz_garagem_2
-    data: {}
-  - delay:
-      hours: 0
-      minutes: 5
-      seconds: 0
-      milliseconds: 0
-  - service: light.turn_off
-    target:
-      entity_id: light.luz_garagem_2
-    data: {}
-  - service: notify.buttler
-    data:
-      message: luz desligada
+    - data:
+        message: ligar luz
+        title: ligar luz temp
+      service: notify.buttler
+    - service: light.turn_on
+      target:
+        entity_id: light.luz_garagem_2
+      data: {}
+    - delay:
+        hours: 0
+        minutes: 5
+        seconds: 0
+        milliseconds: 0
+    - service: light.turn_off
+      target:
+        entity_id: light.luz_garagem_2
+      data: {}
+    - service: notify.buttler
+      data:
+        message: luz desligada
+  mode: single
+- id: "1653728289950"
+  alias: Blinders - Let There be Light - Week End
+  description: ""
+  trigger:
+    - platform: time
+      at: 09:00:00
+  condition:
+    - condition: time
+      weekday:
+        - sun
+        - sat
+  action:
+    - service: cover.set_cover_position
+      data:
+        position: 90
+      target:
+        entity_id: cover.coverescritorio
+    - service: cover.set_cover_position
+      data:
+        position: 100
+      target:
+        entity_id: cover.coverqprincipal
+    - service: cover.set_cover_position
+      data:
+        position: 100
+      target:
+        entity_id:
+          - cover.coversaladir
+          - cover.coversalaesq
+          - cover.covercozinha
  mode: single
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -23,6 +23,8 @@ google_assistant:
    - switch
    - light

+mqtt: !include mqtt.yaml
+
 notify:
  - name: Buttler
    platform: telegram
@@ -42,14 +44,6 @@ notify:
      phone: !secret phoneNumberRita
      apikey: !secret callMeBotAPIKeyRita

-spotify:
-  client_id: !secret spotifyClientID
-  client_secret: !secret spotifyClientSecret
-
-spotcast:
-  sp_dc: !secret sp_dc
-  sp_key: !secret sp_key
-
 telegram_bot:
  - platform: polling
    api_key: !secret telegram_bot_token
--- a/light.yaml
+++ b/light.yaml
@@ -1,138 +0,0 @@
- platform: mqtt
-  name: "Luz Hall Quarto Principal"
-  state_topic: "stat/tasmota_BC6546/POWER"
-  command_topic: "cmnd/tasmota_BC6546/POWER"
-  qos: 1
-  payload_on: "ON"
-  payload_off: "OFF"
-  retain: true
-
- platform: mqtt
-  name: "Luz WC Vermelha"
-  state_topic: "stat/Luzwcred/POWER"
-  command_topic: "cmnd/Luzwcred/POWER"
-  qos: 1
-  payload_on: "ON"
-  payload_off: "OFF"
-  retain: true
-
- platform: mqtt
-  name: "Luz Aquario"
-  command_topic: "cmnd/SonoffluzAquario/power"
-  state_topic: "stat/SonoffluzAquario/POWER"
-  qos: 1
-  payload_on: "ON"
-  payload_off: "OFF"
-  retain: true
-
- platform: mqtt
-  name: "Luz Wc Preto"
-  command_topic: "cmnd/tasmota_FD991E/power"
-  state_topic: "stat/tasmota_FD991E/POWER"
-  qos: 1
-  payload_on: "ON"
-  payload_off: "OFF"
-  retain: true
-
- platform: mqtt
-  name: "Luz Escritorio"
-  command_topic: "cmnd/LuzEscritorio/power"
-  state_topic: "stat/LuzEscritorio/POWER"
-  qos: 1
-  payload_on: "ON"
-  payload_off: "OFF"
-  retain: true
-
- platform: mqtt
-  name: "Luz Jardim Frente Lado"
-  command_topic: "mqttServer/14031717/light/14031717luzfrentelado/set"
-  state_topic: "mqttServer/14031717/light/14031717luzfrentelado/state"
-  qos: 1
-  payload_on: "ON"
-  payload_off: "OFF"
-  retain: true
-
- platform: mqtt
-  name: "Luz Jardim Frente"
-  command_topic: "mqttServer/14031717/light/14031717luzjardimfrente/set"
-  state_topic: "mqttServer/14031717/light/14031717luzjardimfrente/state"
-  qos: 1
-  payload_on: "ON"
-  payload_off: "OFF"
-  retain: true
-
- platform: mqtt
-  name: "Luz Garagem 1"
-  command_topic: "mqttServer/14029039/light/14029039luzgaragem1/set"
-  state_topic: "mqttServer/14029039/light/14029039luzgaragem1/set"
-  qos: 1
-  payload_on: "ON"
-  payload_off: "OFF"
-  retain: true
-
- platform: mqtt
-  name: "Luz Garagem 2"
-  command_topic: "mqttServer/14029039/light/14029039luzgaragem2/set"
-  state_topic: "mqttServer/14029039/light/14029039luzgaragem2/state"
-  qos: 1
-  payload_on: "ON"
-  payload_off: "OFF"
-  retain: true
-
- platform: mqtt
-  name: "Luz Hall Tras Fora"
-  command_topic: "mqttServer/14049798/light/14049798luzhallforatras1/set"
-  state_topic: "mqttServer/14049798/light/14049798luzhallforatras1/state"
-  qos: 1
-  payload_on: "ON"
-  payload_off: "OFF"
-  retain: true
-
- platform: mqtt
-  name: "Luz Muro Tras"
-  command_topic: "mqttServer/14049798/light/14049798luzmurostras/set"
-  state_topic: "mqttServer/14049798/light/14049798luzmurostras/state"
-  qos: 1
-  payload_on: "ON"
-  payload_off: "OFF"
-  retain: true
-
- platform: mqtt
-  unique_id: luz_varanda_quarto_principal
-  name: "Luz Varanda Quarto Principal"
-  state_topic: "shellies/luzVarandaQP/relay/0"
-  command_topic: "shellies/luzVarandaQP/relay/0/command"
-  payload_on: "on"
-  payload_off: "off"
-  retain: false
-  qos: 1
-
- platform: mqtt
-  unique_id: luz_varanda_sala
-  name: "Luz Varanda Sala"
-  state_topic: "shellies/luzVarandaSala/relay/0"
-  command_topic: "shellies/luzVarandaSala/relay/0/command"
-  payload_on: "on"
-  payload_off: "off"
-  retain: false
-  qos: 1
-
- platform: mqtt
-  unique_id: luz_wc_castanha
-  name: "Luz WC Castanha"
-  state_topic: "shellies/luzWCcast/relay/0"
-  command_topic: "shellies/luzWCcast/relay/0/command"
-  payload_on: "on"
-  payload_off: "off"
-  retain: false
-  qos: 1
-
- platform: mqtt
-  unique_id: luz_hall_tras
-  name: "Luz Hall Tras"
-  state_topic: "shellies/luzHallTras/relay/0"
-  command_topic: "shellies/luzHallTras/relay/0/command"
-  payload_on: "on"
-  payload_off: "off"
-  retain: false
-  qos: 1
--- a/mqtt.yaml
+++ b/mqtt.yaml
@@ -0,0 +1,3 @@
+light: !include mqtt_light.yaml
+switch: !include mqtt_switch.yaml
+sensor: !include mqtt_sensor.yaml
--- a/mqtt_light.yaml
+++ b/mqtt_light.yaml
@@ -0,0 +1,119 @@
+- state_topic: "stat/Luzwcred/POWER"
+  name: "Luz WC Vermelha"
+  command_topic: "cmnd/Luzwcred/POWER"
+  qos: 1
+  payload_on: "ON"
+  payload_off: "OFF"
+  retain: true
+
+- state_topic: "stat/SonoffluzAquario/POWER"
+  command_topic: "cmnd/SonoffluzAquario/power"
+  name: "Luz Aquario"
+  qos: 1
+  payload_on: "ON"
+  payload_off: "OFF"
+  retain: true
+
+- state_topic: "stat/tasmota_FD991E/POWER"
+  name: "Luz Wc Preto"
+  command_topic: "cmnd/tasmota_FD991E/power"
+  qos: 1
+  payload_on: "ON"
+  payload_off: "OFF"
+  retain: true
+
+- state_topic: "stat/tasmota_BC6546/POWER"
+  command_topic: "cmnd/tasmota_BC6546/POWER"
+  name: "Luz Hall Quarto Principal"
+  qos: 1
+  payload_on: "ON"
+  payload_off: "OFF"
+  retain: true
+
+- state_topic: "stat/LuzEscritorio/POWER"
+  name: "Luz Escritorio"
+  command_topic: "cmnd/LuzEscritorio/power"
+  qos: 1
+  payload_on: "ON"
+  payload_off: "OFF"
+  retain: true
+
+- state_topic: "mqttServer/14031717/light/14031717luzfrentelado/state"
+  name: "Luz Jardim Frente Lado"
+  command_topic: "mqttServer/14031717/light/14031717luzfrentelado/set"
+  qos: 1
+  payload_on: "ON"
+  payload_off: "OFF"
+  retain: true
+
+- state_topic: "mqttServer/14031717/light/14031717luzjardimfrente/state"
+  name: "Luz Jardim Frente"
+  command_topic: "mqttServer/14031717/light/14031717luzjardimfrente/set"
+  qos: 1
+  payload_on: "ON"
+  payload_off: "OFF"
+  retain: true
+
+- state_topic: "mqttServer/14029039/light/14029039luzgaragem1/set"
+  name: "Luz Garagem 1"
+  command_topic: "mqttServer/14029039/light/14029039luzgaragem1/set"
+  qos: 1
+  payload_on: "ON"
+  payload_off: "OFF"
+  retain: true
+
+- state_topic: "mqttServer/14029039/light/14029039luzgaragem2/state"
+  command_topic: "mqttServer/14029039/light/14029039luzgaragem2/set"
+  name: "Luz Garagem 2"
+  qos: 1
+  payload_on: "ON"
+  payload_off: "OFF"
+  retain: true
+
+- state_topic: "mqttServer/14049798/light/14049798luzhallforatras1/state"
+  name: "Luz Hall Tras Fora"
+  command_topic: "mqttServer/14049798/light/14049798luzhallforatras1/set"
+  qos: 1
+  payload_on: "ON"
+  payload_off: "OFF"
+  retain: true
+
+- state_topic: "mqttServer/14049798/light/14049798luzmurostras/state"
+  name: "Luz Muro Tras"
+  command_topic: "mqttServer/14049798/light/14049798luzmurostras/set"
+  qos: 1
+  payload_on: "ON"
+  payload_off: "OFF"
+  retain: true
+
+- state_topic: "shellies/luzVarandaQP/relay/0"
+  name: "Luz Varanda Quarto Principal"
+  command_topic: "shellies/luzVarandaQP/relay/0/command"
+  payload_on: "on"
+  payload_off: "off"
+  retain: false
+  qos: 1
+
+- state_topic: "shellies/luzVarandaSala/relay/0"
+  name: "Luz Varanda Sala"
+  command_topic: "shellies/luzVarandaSala/relay/0/command"
+  payload_on: "on"
+  payload_off: "off"
+  retain: false
+  qos: 1
+
+- state_topic: "shellies/luzWCcast/relay/0"
+  name: "Luz WC Castanha"
+  command_topic: "shellies/luzWCcast/relay/0/command"
+  payload_on: "on"
+  payload_off: "off"
+  retain: false
+  qos: 1
+
+- state_topic: "shellies/luzHallTras/relay/0"
+  name: "Luz Hall Tras"
+  command_topic: "shellies/luzHallTras/relay/0/command"
+  payload_on: "on"
+  payload_off: "off"
+  retain: false
+  qos: 1
--- a/mqtt_sensor.yaml
+++ b/mqtt_sensor.yaml
@@ -0,0 +1,59 @@
+- state_topic: "tele/soaquecepiso/SENSOR"
+  name: "Aquecimento Piso Amperes"
+  value_template: "{{ value_json['ENERGY'].Current }}"
+  unit_of_measurement: "A"
+
+- state_topic: "tele/soaquecepiso/SENSOR"
+  name: "Aquecimento Piso Watts"
+  value_template: "{{ value_json['ENERGY'].Power }}"
+  unit_of_measurement: "W"
+
+- state_topic: "tele/soaquecepiso/SENSOR"
+  name: "Aquecimento Piso Volts"
+  value_template: "{{ value_json['ENERGY'].Voltage }}"
+  unit_of_measurement: "V"
+
+- state_topic: "tele/soaquecepiso/SENSOR"
+  name: "Aquecimento Piso Watts Hoje"
+  value_template: "{{ value_json['ENERGY'].Today }}"
+  unit_of_measurement: "W"
+
+- state_topic: "tele/soaquecepiso/SENSOR"
+  name: "Aquecimento Piso Watts Ontem"
+  value_template: "{{ value_json['ENERGY'].Yesterday }}"
+  unit_of_measurement: "W"
+
+- state_topic: "tele/soaquecepiso/SENSOR"
+  name: "Aquecimento Piso Watts Total"
+  value_template: "{{ value_json['ENERGY'].Total }}"
+  unit_of_measurement: "W"
+
+- state_topic: "tele/soaqueceagua/SENSOR"
+  name: "Aquecimento Agua Amperes"
+  value_template: "{{ value_json['ENERGY'].Current }}"
+  unit_of_measurement: "A"
+
+- state_topic: "tele/soaqueceagua/SENSOR"
+  name: "Aquecimento Agua Watts"
+  value_template: "{{ value_json['ENERGY'].Power }}"
+  unit_of_measurement: "W"
+
+- state_topic: "tele/soaqueceagua/SENSOR"
+  name: "Aquecimento Agua Volts"
+  value_template: "{{ value_json['ENERGY'].Voltage }}"
+  unit_of_measurement: "V"
+
+- state_topic: "tele/soaqueceagua/SENSOR"
+  name: "Aquecimento Agua Watts Hoje"
+  value_template: "{{ value_json['ENERGY'].Today }}"
+  unit_of_measurement: "W"
+
+- state_topic: "tele/soaqueceagua/SENSOR"
+  name: "Aquecimento Agua Watts Ontem"
+  value_template: "{{ value_json['ENERGY'].Yesterday }}"
+  unit_of_measurement: "W"
+
+- state_topic: "tele/soaqueceagua/SENSOR"
+  name: "Aquecimento Agua Watts Total"
+  value_template: "{{ value_json['ENERGY'].Total }}"
+  unit_of_measurement: "W"
--- a/mqtt_switch.yaml
+++ b/mqtt_switch.yaml
@@ -0,0 +1,35 @@
+- state_topic: "stat/soaquecepiso/POWER"
+  name: "Aquecimento piso"
+  command_topic: "cmnd/soaquecepiso/power"
+  qos: 1
+  payload_on: "ON"
+  payload_off: "OFF"
+  retain: true
+
+- state_topic: "stat/soaqueceagua/POWER"
+  name: "Aquecimento agua"
+  command_topic: "cmnd/soaqueceagua/power"
+  qos: 1
+  payload_on: "ON"
+  payload_off: "OFF"
+  retain: true
+
+- state_topic: "stat/tasmota_A9A998/POWER"
+  name: "LTVR1"
+  command_topic: "cmnd/tasmota_A9A998/POWER"
+  qos: 1
+  payload_on: "ON"
+  payload_off: "OFF"
+  payload_available: "Online"
+  payload_not_available: "Offline"
+  retain: true
+
+- state_topic: "stat/tasmota_A924F7/POWER"
+  name: "LTVR2"
+  command_topic: "cmnd/tasmota_A924F7/POWER"
+  qos: 1
+  payload_on: "ON"
+  payload_off: "OFF"
+  payload_available: "Online"
+  payload_not_available: "Offline"
+  retain: true
--- a/scripts.yaml
+++ b/scripts.yaml
@@ -1,17 +1 @@
-'1593471301993':
-  alias: Acionar Regua
-  sequence:
-  - service: automation.trigger
-    target:
-      entity_id: automation.sistema_rega_valvula_1_22h
-  - wait_template: ''
-    timeout: 00:10:00
-  - service: automation.trigger
-    target:
-      entity_id: automation.sistema_rega_valvula_2_22h
-  - wait_template: ''
-    timeout: 00:10:00
-  - service: automation.trigger
-    target:
-      entity_id: automation.sistema_rega_valvula_3_22h
-  mode: single
+
--- a/sensor.yaml
+++ b/sensor.yaml
@@ -10,79 +10,4 @@
    - type: disk_use_percent
      arg: /home
    - type: memory_free
-    - type: last_boot
- platform: mqtt
-  name: "sensor aquario"
-  state_topic: "tele/SonoffluzAquario/SENSOR"
-  value_template: "{{ value_json['DS18B20'].Temperature }}"
-  unit_of_measurement: "C"
- platform: mqtt
-  name: "Temperatura Escritorio"
-  state_topic: "tele/sonoffEscritorio/SENSOR"
-  value_template: "{{ value_json['DHT11'].Temperature }}"
-  unit_of_measurement: "C"
- platform: mqtt
-  name: "Humidade Escritorio"
-  state_topic: "tele/sonoffEscritorio/SENSOR"
-  value_template: "{{ value_json['DHT11'].Humidity }}"
-  unit_of_measurement: "%"
- platform: mqtt
-  name: "Aquecimento Piso Amperes"
-  state_topic: "tele/soaquecepiso/SENSOR"
-  value_template: "{{ value_json['ENERGY'].Current }}"
-  unit_of_measurement: "A"
- platform: mqtt
-  name: "Aquecimento Piso Watts"
-  state_topic: "tele/soaquecepiso/SENSOR"
-  value_template: "{{ value_json['ENERGY'].Power }}"
-  unit_of_measurement: "W"
- platform: mqtt
-  name: "Aquecimento Piso Volts"
-  state_topic: "tele/soaquecepiso/SENSOR"
-  value_template: "{{ value_json['ENERGY'].Voltage }}"
-  unit_of_measurement: "V"
- platform: mqtt
-  name: "Aquecimento Piso Watts Hoje"
-  state_topic: "tele/soaquecepiso/SENSOR"
-  value_template: "{{ value_json['ENERGY'].Today }}"
-  unit_of_measurement: "W"
- platform: mqtt
-  name: "Aquecimento Piso Watts Ontem"
-  state_topic: "tele/soaquecepiso/SENSOR"
-  value_template: "{{ value_json['ENERGY'].Yesterday }}"
-  unit_of_measurement: "W"
- platform: mqtt
-  name: "Aquecimento Piso Watts Total"
-  state_topic: "tele/soaquecepiso/SENSOR"
-  value_template: "{{ value_json['ENERGY'].Total }}"
-  unit_of_measurement: "W"
- platform: mqtt
-  name: "Aquecimento Agua Amperes"
-  state_topic: "tele/soaqueceagua/SENSOR"
-  value_template: "{{ value_json['ENERGY'].Current }}"
-  unit_of_measurement: "A"
- platform: mqtt
-  name: "Aquecimento Agua Watts"
-  state_topic: "tele/soaqueceagua/SENSOR"
-  value_template: "{{ value_json['ENERGY'].Power }}"
-  unit_of_measurement: "W"
- platform: mqtt
-  name: "Aquecimento Agua Volts"
-  state_topic: "tele/soaqueceagua/SENSOR"
-  value_template: "{{ value_json['ENERGY'].Voltage }}"
-  unit_of_measurement: "V"
- platform: mqtt
-  name: "Aquecimento Agua Watts Hoje"
-  state_topic: "tele/soaqueceagua/SENSOR"
-  value_template: "{{ value_json['ENERGY'].Today }}"
-  unit_of_measurement: "W"
- platform: mqtt
-  name: "Aquecimento Agua Watts Ontem"
-  state_topic: "tele/soaqueceagua/SENSOR"
-  value_template: "{{ value_json['ENERGY'].Yesterday }}"
-  unit_of_measurement: "W"
- platform: mqtt
-  name: "Aquecimento Agua Watts Total"
-  state_topic: "tele/soaqueceagua/SENSOR"
-  value_template: "{{ value_json['ENERGY'].Total }}"
-  unit_of_measurement: "W"
+    - type: last_boot
--- a/switch.yaml
+++ b/switch.yaml
@@ -1,81 +1 @@
-  - platform: mqtt
-    name: "Aquecimento piso"
-    state_topic: "stat/soaquecepiso/POWER"
-    command_topic: "cmnd/soaquecepiso/power"
-    qos: 1
-    payload_on: "ON"
-    payload_off: "OFF"
-    retain: true
-    
-  - platform: mqtt
-    name: "Tomada escritorio"
-    state_topic: "stat/sonoffEscritorio/POWER"
-    command_topic: "cmnd/sonoffEscritorio/power"
-    qos: 1
-    payload_on: "ON"
-    payload_off: "OFF"
-    retain: true
-    
-  - platform: mqtt
-    name: "Aquecimento agua"
-    state_topic: "stat/soaqueceagua/POWER"
-    command_topic: "cmnd/soaqueceagua/power"
-    qos: 1
-    payload_on: "ON"
-    payload_off: "OFF"
-    retain: true

-  - platform: mqtt
-    name: "Valvula jardim 1"
-    state_topic: "stat/tasmota_8CA4C5/POWER1"
-    command_topic: "cmnd/tasmota_8CA4C5/POWER1"
-    qos: 1
-    payload_on: "ON"
-    payload_off: "OFF"
-    payload_available: "Online"
-    payload_not_available: "Offline"
-    retain: true
-
-  - platform: mqtt
-    name: "Valvula jardim 2"
-    state_topic: "stat/tasmota_8CA4C5/POWER2"
-    command_topic: "cmnd/tasmota_8CA4C5/POWER2"
-    qos: 1
-    payload_on: "ON"
-    payload_off: "OFF"
-    payload_available: "Online"
-    payload_not_available: "Offline"
-    retain: true
-
-  - platform: mqtt
-    name: "Valvula jardim 3"
-    state_topic: "stat/tasmota_8CA4C5/POWER3"
-    command_topic: "cmnd/tasmota_8CA4C5/POWER3"
-    qos: 1
-    payload_on: "ON"
-    payload_off: "OFF"
-    payload_available: "Online"
-    payload_not_available: "Offline"
-    retain: true
-
-  - platform: mqtt
-    name: "LTVR1"
-    state_topic: "stat/tasmota_A9A998/POWER"
-    command_topic: "cmnd/tasmota_A9A998/POWER"
-    qos: 1
-    payload_on: "ON"
-    payload_off: "OFF"
-    payload_available: "Online"
-    payload_not_available: "Offline"
-    retain: true
-
-  - platform: mqtt
-    name: "LTVR2"
-    state_topic: "stat/tasmota_A924F7/POWER"
-    command_topic: "cmnd/tasmota_A924F7/POWER"
-    qos: 1
-    payload_on: "ON"
-    payload_off: "OFF"
-    payload_available: "Online"
-    payload_not_available: "Offline"
-    retain: true