MQTT Changes for 2022.6

config/packages/devices/bedroom/bed_led.yaml

@@ -1,23 +1,21 @@
-light:
-  - platform: mqtt
-    name: "Bed LED"
-    state_topic: "z2m_deconz/bed_led"
-    availability_topic: "z2m_deconz/bridge/state"
-    brightness: true
-    color_temp: true
-    xy: true
-    schema: "json"
-    command_topic: "z2m_deconz/bed_led/set"
-    brightness_scale: 254
-
-sensor:
-  - platform: mqtt
-    name: "Bed LED LQI"
-    state_topic: "z2m_deconz/bed_led"
-    availability_topic: "z2m_deconz/bridge/state"
-    device_class: "signal_strength"
-    unit_of_measurement: "lqi"
-    value_template: "{{ value_json.linkquality }}"
+mqtt:
+  light:
+    - name: "Bed LED"
+      state_topic: "z2m_deconz/bed_led"
+      availability_topic: "z2m_deconz/bridge/state"
+      brightness: true
+      color_temp: true
+      xy: true
+      schema: "json"
+      command_topic: "z2m_deconz/bed_led/set"
+      brightness_scale: 254
+  sensor:
+    - name: "Bed LED LQI"
+      state_topic: "z2m_deconz/bed_led"
+      availability_topic: "z2m_deconz/bridge/state"
+      device_class: "signal_strength"
+      unit_of_measurement: "lqi"
+      value_template: "{{ value_json.linkquality }}"
 
 script:
   bed_led_on:

config/packages/devices/bedroom/bedroom_opple.yaml

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

config/packages/devices/bedroom/bedside_switch.yaml

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