MQTT Changes for 2022.6

config/packages/devices/living_room/desk_outlet.yaml

@@ -1,62 +1,54 @@
-switch:
-  - platform: mqtt
-    name: "Desk Outlet"
-    state_topic: "stat/outlet_1/RESULT"
-    value_template: "{{ value_json.POWER }}"
-    command_topic: "cmnd/outlet_1/POWER"
-    payload_on: "ON"
-    payload_off: "OFF"
-    availability_topic: "tele/outlet_1/LWT"
-    payload_available: "Online"
-    payload_not_available: "Offline"
-    qos: 1
+mqtt:
+  switch:
+    - name: "Desk Outlet"
+      state_topic: "stat/outlet_1/RESULT"
+      value_template: "{{ value_json.POWER }}"
+      command_topic: "cmnd/outlet_1/POWER"
+      payload_on: "ON"
+      payload_off: "OFF"
+      availability_topic: "tele/outlet_1/LWT"
+      payload_available: "Online"
+      payload_not_available: "Offline"
+      qos: 1
 
-sensor:
-  - platform: mqtt
-    name: "Desk Outlet Energy today"
-    state_topic: "tele/outlet_1/SENSOR"
-    value_template: '{{ value_json.ENERGY.Today }}'
-    device_class: power
-    unit_of_measurement: "kWh"
-  - platform: mqtt
-    name: "Desk Outlet Energy yesterday"
-    state_topic: "tele/outlet_1/SENSOR"
-    value_template: '{{ value_json.ENERGY.Yesterday }}'
-    device_class: power
-    unit_of_measurement: "kWh"
-  - platform: mqtt
-    name: "Desk Outlet Energy total"
-    state_topic: "tele/outlet_1/SENSOR"
-    value_template: '{{ value_json.ENERGY.Total }}'
-    device_class: power
-    unit_of_measurement: "kWh"
-  - platform: mqtt
-    name: "Desk Outlet Energy total start time"
-    state_topic: "tele/outlet_1/SENSOR"
-    value_template: '{{ value_json.ENERGY.TotalStartTime }}'
-  - platform: mqtt
-    name: "Desk Outlet Power"
-    state_topic: "tele/outlet_1/SENSOR"
-    value_template: '{{ value_json.ENERGY.Power }}'
-    device_class: power
-    unit_of_measurement: "W"
-  - platform: mqtt
-    name: "Desk Outlet Voltage"
-    state_topic: "tele/outlet_1/SENSOR"
-    value_template: '{{ value_json.ENERGY.Voltage }}'
-    unit_of_measurement: "V"
-  - platform: mqtt
-    name: "Desk Outlet Current"
-    state_topic: "tele/outlet_1/SENSOR"
-    value_template: '{{ value_json.ENERGY.Current }}'
-    unit_of_measurement: "A"
+  sensor:
+    - name: "Desk Outlet Energy today"
+      state_topic: "tele/outlet_1/SENSOR"
+      value_template: '{{ value_json.ENERGY.Today }}'
+      device_class: power
+      unit_of_measurement: "kWh"
+    - name: "Desk Outlet Energy yesterday"
+      state_topic: "tele/outlet_1/SENSOR"
+      value_template: '{{ value_json.ENERGY.Yesterday }}'
+      device_class: power
+      unit_of_measurement: "kWh"
+    - name: "Desk Outlet Energy total"
+      state_topic: "tele/outlet_1/SENSOR"
+      value_template: '{{ value_json.ENERGY.Total }}'
+      device_class: power
+      unit_of_measurement: "kWh"
+    - name: "Desk Outlet Energy total start time"
+      state_topic: "tele/outlet_1/SENSOR"
+      value_template: '{{ value_json.ENERGY.TotalStartTime }}'
+    - name: "Desk Outlet Power"
+      state_topic: "tele/outlet_1/SENSOR"
+      value_template: '{{ value_json.ENERGY.Power }}'
+      device_class: power
+      unit_of_measurement: "W"
+    - name: "Desk Outlet Voltage"
+      state_topic: "tele/outlet_1/SENSOR"
+      value_template: '{{ value_json.ENERGY.Voltage }}'
+      unit_of_measurement: "V"
+    - name: "Desk Outlet Current"
+      state_topic: "tele/outlet_1/SENSOR"
+      value_template: '{{ value_json.ENERGY.Current }}'
+      unit_of_measurement: "A"
 
-  - platform: mqtt
-    name: "Desk Outlet WiFi"
-    state_topic: "tele/outlet_1/STATE"
-    unit_of_measurement: "%"
-    value_template: "{{value_json.Wifi.RSSI }}"
-    availability_topic: "tele/outlet_1/LWT"
-    payload_available: "Online"
-    payload_not_available: "Offline"
-    device_class: signal_strength
+    - name: "Desk Outlet WiFi"
+      state_topic: "tele/outlet_1/STATE"
+      unit_of_measurement: "%"
+      value_template: "{{value_json.Wifi.RSSI }}"
+      availability_topic: "tele/outlet_1/LWT"
+      payload_available: "Online"
+      payload_not_available: "Offline"
+      device_class: signal_strength

config/packages/devices/living_room/desk_switch.yaml

@@ -1,18 +1,17 @@
-sensor:
-  - platform: mqtt
-    name: "Desk switch battery"
-    state_topic: "z2m_deconz/desk_switch"
-    availability_topic: "z2m_deconz/bridge/state"
-    unit_of_measurement: "%"
-    device_class: "battery"
-    value_template: "{{ value_json.battery }}"
-  - platform: mqtt
-    name: "Desk switch LQI"
-    state_topic: "z2m_deconz/desk_switch"
-    availability_topic: "z2m_deconz/bridge/state"
-    unit_of_measurement: "lqi"
-    device_class: "signal_strength"
-    value_template: "{{ value_json.linkquality }}"
+mqtt:
+  sensor:
+    - name: "Desk switch battery"
+      state_topic: "z2m_deconz/desk_switch"
+      availability_topic: "z2m_deconz/bridge/state"
+      unit_of_measurement: "%"
+      device_class: "battery"
+      value_template: "{{ value_json.battery }}"
+    - name: "Desk switch LQI"
+      state_topic: "z2m_deconz/desk_switch"
+      availability_topic: "z2m_deconz/bridge/state"
+      unit_of_measurement: "lqi"
+      device_class: "signal_strength"
+      value_template: "{{ value_json.linkquality }}"
 
 
 automation:

config/packages/devices/living_room/living_room_opple.yaml

@@ -1,24 +1,22 @@
-sensor:
-  - platform: mqtt
-    name: "Living room Opple action"
-    state_topic: "z2m_deconz/opple_2"
-    availability_topic: "z2m_deconz/bridge/state"
-    icon: "mdi:gesture-double-tap"
-    value_template: "{{ value_json.action }}"
-  - platform: mqtt
-    name: "Living room Opple battery"
-    state_topic: "z2m_deconz/opple_2"
-    availability_topic: "z2m_deconz/bridge/state"
-    unit_of_measurement: "%"
-    device_class: "battery"
-    value_template: "{{ value_json.battery }}"
-  - platform: mqtt
-    name: "Living room Opple LQI"
-    state_topic: "z2m_deconz/opple_2"
-    availability_topic: "z2m_deconz/bridge/state"
-    unit_of_measurement: "lqi"
-    device_class: "signal_strength"
-    value_template: "{{ value_json.linkquality }}"
+mqtt:
+  sensor:
+    - name: "Living room Opple action"
+      state_topic: "z2m_deconz/opple_2"
+      availability_topic: "z2m_deconz/bridge/state"
+      icon: "mdi:gesture-double-tap"
+      value_template: "{{ value_json.action }}"
+    - name: "Living room Opple battery"
+      state_topic: "z2m_deconz/opple_2"
+      availability_topic: "z2m_deconz/bridge/state"
+      unit_of_measurement: "%"
+      device_class: "battery"
+      value_template: "{{ value_json.battery }}"
+    - name: "Living room Opple LQI"
+      state_topic: "z2m_deconz/opple_2"
+      availability_topic: "z2m_deconz/bridge/state"
+      unit_of_measurement: "lqi"
+      device_class: "signal_strength"
+      value_template: "{{ value_json.linkquality }}"
 
 automation:
   - alias: Living room · Opple

config/packages/devices/living_room/titanium.yaml

@@ -14,139 +14,139 @@ binary_sensor:
         icon_template: >-
           {{ is_state("binary_sensor.titanium_ping", "on") | iif(' mdi:desktop-mac-dashboard', 'mdi:desktop-mac') }}
 
-  - platform: mqtt
-    name: "Titanium playing"
-    availability_topic: "iotlink/workgroup/titanium/lwt"
-    payload_available: "ON"
-    payload_not_available: "OFF"
-    payload_on: "True"
-    payload_off: "False"
-    state_topic: "iotlink/workgroup/titanium/windows-monitor/stats/media/playing"
+  # - platform: mqtt
+  #   name: "Titanium playing"
+  #   availability_topic: "iotlink/workgroup/titanium/lwt"
+  #   payload_available: "ON"
+  #   payload_not_available: "OFF"
+  #   payload_on: "True"
+  #   payload_off: "False"
+  #   state_topic: "iotlink/workgroup/titanium/windows-monitor/stats/media/playing"
 
 #
 # ─── IOTLink ──────────────────────────────────────────────────────────────
 #
-sensor:
-  - platform: mqtt
-    name: "Titanium uptime"
-    icon: mdi:clock-check
-    availability_topic: "iotlink/workgroup/titanium/lwt"
-    payload_available: "ON"
-    payload_not_available: "OFF"
-    state_topic: "iotlink/workgroup/titanium/windows-monitor/stats/system/uptime"
+# sensor:
+#   - platform: mqtt
+#     name: "Titanium uptime"
+#     icon: mdi:clock-check
+#     availability_topic: "iotlink/workgroup/titanium/lwt"
+#     payload_available: "ON"
+#     payload_not_available: "OFF"
+#     state_topic: "iotlink/workgroup/titanium/windows-monitor/stats/system/uptime"
 
-  - platform: mqtt
-    name: "Titanium idle time"
-    icon: mdi:clock-alert
-    availability_topic: "iotlink/workgroup/titanium/lwt"
-    payload_available: "ON"
-    payload_not_available: "OFF"
-    state_topic: "iotlink/workgroup/titanium/windows-monitor/stats/system/idle-time"
-    value_template: "{{ value | multiply(1/60) | round(0) }}"
-    unit_of_measurement: "minutes"
+#   - platform: mqtt
+#     name: "Titanium idle time"
+#     icon: mdi:clock-alert
+#     availability_topic: "iotlink/workgroup/titanium/lwt"
+#     payload_available: "ON"
+#     payload_not_available: "OFF"
+#     state_topic: "iotlink/workgroup/titanium/windows-monitor/stats/system/idle-time"
+#     value_template: "{{ value | multiply(1/60) | round(0) }}"
+#     unit_of_measurement: "minutes"
 
-  # CPU
-  - platform: mqtt
-    name: "Titanium CPU usage"
-    icon: mdi:chip
-    availability_topic: "iotlink/workgroup/titanium/lwt"
-    payload_available: "ON"
-    payload_not_available: "OFF"
-    state_topic: "iotlink/workgroup/titanium/windows-monitor/stats/cpu/usage"
-    unit_of_measurement: "%"
+#   # CPU
+#   - platform: mqtt
+#     name: "Titanium CPU usage"
+#     icon: mdi:chip
+#     availability_topic: "iotlink/workgroup/titanium/lwt"
+#     payload_available: "ON"
+#     payload_not_available: "OFF"
+#     state_topic: "iotlink/workgroup/titanium/windows-monitor/stats/cpu/usage"
+#     unit_of_measurement: "%"
 
-  # Memory
-  - platform: mqtt
-    name: "Titanium memory used"
-    icon: mdi:memory
-    availability_topic: "iotlink/workgroup/titanium/lwt"
-    payload_available: "ON"
-    payload_not_available: "OFF"
-    state_topic: "iotlink/workgroup/titanium/windows-monitor/stats/memory/used"
-    unit_of_measurement: "MB"
+#   # Memory
+#   - platform: mqtt
+#     name: "Titanium memory used"
+#     icon: mdi:memory
+#     availability_topic: "iotlink/workgroup/titanium/lwt"
+#     payload_available: "ON"
+#     payload_not_available: "OFF"
+#     state_topic: "iotlink/workgroup/titanium/windows-monitor/stats/memory/used"
+#     unit_of_measurement: "MB"
 
-  - platform: mqtt
-    name: "Titanium memory used percent"
-    icon: mdi:memory
-    availability_topic: "iotlink/workgroup/titanium/lwt"
-    payload_available: "ON"
-    payload_not_available: "OFF"
-    state_topic: "iotlink/workgroup/titanium/windows-monitor/stats/memory/usage"
-    unit_of_measurement: "%"
+#   - platform: mqtt
+#     name: "Titanium memory used percent"
+#     icon: mdi:memory
+#     availability_topic: "iotlink/workgroup/titanium/lwt"
+#     payload_available: "ON"
+#     payload_not_available: "OFF"
+#     state_topic: "iotlink/workgroup/titanium/windows-monitor/stats/memory/usage"
+#     unit_of_measurement: "%"
 
-  - platform: mqtt
-    name: "Titanium memory available"
-    icon: mdi:memory
-    availability_topic: "iotlink/workgroup/titanium/lwt"
-    payload_available: "ON"
-    payload_not_available: "OFF"
-    state_topic: "iotlink/workgroup/titanium/windows-monitor/stats/memory/available"
-    unit_of_measurement: "MB"
+#   - platform: mqtt
+#     name: "Titanium memory available"
+#     icon: mdi:memory
+#     availability_topic: "iotlink/workgroup/titanium/lwt"
+#     payload_available: "ON"
+#     payload_not_available: "OFF"
+#     state_topic: "iotlink/workgroup/titanium/windows-monitor/stats/memory/available"
+#     unit_of_measurement: "MB"
 
-  - platform: mqtt
-    name: "Titanium memory total"
-    icon: mdi:memory
-    availability_topic: "iotlink/workgroup/titanium/lwt"
-    payload_available: "ON"
-    payload_not_available: "OFF"
-    state_topic: "iotlink/workgroup/titanium/windows-monitor/stats/memory/total"
-    unit_of_measurement: "MB"
+#   - platform: mqtt
+#     name: "Titanium memory total"
+#     icon: mdi:memory
+#     availability_topic: "iotlink/workgroup/titanium/lwt"
+#     payload_available: "ON"
+#     payload_not_available: "OFF"
+#     state_topic: "iotlink/workgroup/titanium/windows-monitor/stats/memory/total"
+#     unit_of_measurement: "MB"
 
-  # C Drive
-  - platform: mqtt
-    name: "Titanium C usage"
-    icon: mdi:harddisk
-    availability_topic: "iotlink/workgroup/titanium/lwt"
-    payload_available: "ON"
-    payload_not_available: "OFF"
-    state_topic: "iotlink/workgroup/titanium/windows-monitor/stats/hard-drive/c/drive-usage"
-    unit_of_measurement: "%"
+#   # C Drive
+#   - platform: mqtt
+#     name: "Titanium C usage"
+#     icon: mdi:harddisk
+#     availability_topic: "iotlink/workgroup/titanium/lwt"
+#     payload_available: "ON"
+#     payload_not_available: "OFF"
+#     state_topic: "iotlink/workgroup/titanium/windows-monitor/stats/hard-drive/c/drive-usage"
+#     unit_of_measurement: "%"
 
-  - platform: mqtt
-    name: "Titanium C free space"
-    icon: mdi:harddisk
-    availability_topic: "iotlink/workgroup/titanium/lwt"
-    payload_available: "ON"
-    payload_not_available: "OFF"
-    state_topic: "iotlink/workgroup/titanium/windows-monitor/stats/hard-drive/c/total-free-space"
-    unit_of_measurement: "GB"
+#   - platform: mqtt
+#     name: "Titanium C free space"
+#     icon: mdi:harddisk
+#     availability_topic: "iotlink/workgroup/titanium/lwt"
+#     payload_available: "ON"
+#     payload_not_available: "OFF"
+#     state_topic: "iotlink/workgroup/titanium/windows-monitor/stats/hard-drive/c/total-free-space"
+#     unit_of_measurement: "GB"
 
-  - platform: mqtt
-    name: "Titanium C used space"
-    icon: mdi:harddisk
-    availability_topic: "iotlink/workgroup/titanium/lwt"
-    payload_available: "ON"
-    payload_not_available: "OFF"
-    state_topic: "iotlink/workgroup/titanium/windows-monitor/stats/hard-drive/c/used-space"
-    unit_of_measurement: "GB"
+#   - platform: mqtt
+#     name: "Titanium C used space"
+#     icon: mdi:harddisk
+#     availability_topic: "iotlink/workgroup/titanium/lwt"
+#     payload_available: "ON"
+#     payload_not_available: "OFF"
+#     state_topic: "iotlink/workgroup/titanium/windows-monitor/stats/hard-drive/c/used-space"
+#     unit_of_measurement: "GB"
 
-  - platform: mqtt
-    name: "Titanium C total space"
-    icon: mdi:harddisk
-    availability_topic: "iotlink/workgroup/titanium/lwt"
-    payload_available: "ON"
-    payload_not_available: "OFF"
-    state_topic: "iotlink/workgroup/titanium/windows-monitor/stats/hard-drive/c/total-size"
-    unit_of_measurement: "GB"
+#   - platform: mqtt
+#     name: "Titanium C total space"
+#     icon: mdi:harddisk
+#     availability_topic: "iotlink/workgroup/titanium/lwt"
+#     payload_available: "ON"
+#     payload_not_available: "OFF"
+#     state_topic: "iotlink/workgroup/titanium/windows-monitor/stats/hard-drive/c/total-size"
+#     unit_of_measurement: "GB"
 
 
-  # Media
-  - platform: mqtt
-    name: "Titanium volume"
-    icon: mdi:volume-medium
-    availability_topic: "iotlink/workgroup/titanium/lwt"
-    payload_available: "ON"
-    payload_not_available: "OFF"
-    state_topic: "iotlink/workgroup/titanium/windows-monitor/stats/media/volume"
-    unit_of_measurement: "%"
+#   # Media
+#   - platform: mqtt
+#     name: "Titanium volume"
+#     icon: mdi:volume-medium
+#     availability_topic: "iotlink/workgroup/titanium/lwt"
+#     payload_available: "ON"
+#     payload_not_available: "OFF"
+#     state_topic: "iotlink/workgroup/titanium/windows-monitor/stats/media/volume"
+#     unit_of_measurement: "%"
 
-camera:
-  - platform: mqtt
-    name: "Titanium Screen 0"
-    topic: "iotlink/workgroup/titanium/windows-monitor/stats/display/0/screen"
-  - platform: mqtt
-    name: "Titanium Screen 1"
-    topic: "iotlink/workgroup/titanium/windows-monitor/stats/display/1/screen"
+# camera:
+#   - platform: mqtt
+#     name: "Titanium Screen 0"
+#     topic: "iotlink/workgroup/titanium/windows-monitor/stats/display/0/screen"
+#   - platform: mqtt
+#     name: "Titanium Screen 1"
+#     topic: "iotlink/workgroup/titanium/windows-monitor/stats/display/1/screen"
 
 switch:
   - platform: template

config/packages/devices/living_room/trust_remote.yaml

@@ -1,23 +1,21 @@
-sensor:
-  - platform: mqtt
-    name: "Trust remote action"
-    state_topic: "z2m_deconz/trust_remote"
-    availability_topic: "z2m_deconz/bridge/state"
-    icon: "mdi:gesture-double-tap"
-    value_template: "{{ value_json.action }}"
-  - platform: mqtt
-    name: "Trust remote group"
-    state_topic: "z2m_deconz/trust_remote"
-    availability_topic: "z2m_deconz/bridge/state"
-    icon: "mdi:lightbulb-group"
-    value_template: "{{ value_json.action_group }}"
-  - platform: mqtt
-    name: "Trust remote LQI"
-    state_topic: "z2m_deconz/trust_remote"
-    availability_topic: "z2m_deconz/bridge/state"
-    unit_of_measurement: "lqi"
-    device_class: "signal_strength"
-    value_template: "{{ value_json.linkquality }}"
+mqtt:
+  sensor:
+    - name: "Trust remote action"
+      state_topic: "z2m_deconz/trust_remote"
+      availability_topic: "z2m_deconz/bridge/state"
+      icon: "mdi:gesture-double-tap"
+      value_template: "{{ value_json.action }}"
+    - name: "Trust remote group"
+      state_topic: "z2m_deconz/trust_remote"
+      availability_topic: "z2m_deconz/bridge/state"
+      icon: "mdi:lightbulb-group"
+      value_template: "{{ value_json.action_group }}"
+    - name: "Trust remote LQI"
+      state_topic: "z2m_deconz/trust_remote"
+      availability_topic: "z2m_deconz/bridge/state"
+      unit_of_measurement: "lqi"
+      device_class: "signal_strength"
+      value_template: "{{ value_json.linkquality }}"
 
 automation:
   - alias: Trust remote · Dimming