Switch to zigbee2mqtt auto discovery

packages/devices/bedroom/bedroom_opple.yaml

@@ -1,29 +1,10 @@
-mqtt:
-  sensor:
-    - name: "Bedroom Opple action"
-      state_topic: "z2m_deconz/opple_1/action"
-      availability_topic: "z2m_deconz/bridge/state"
-      icon: "mdi:gesture-double-tap"
-    - 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
+    id: bedroom_opple
     use_blueprint:
       path: oppo_6_btn_switch.yaml
       input:
-        opple_z2m_name: "z2m_deconz/opple_1"
-        action_sensor: sensor.bedroom_opple_action
+        action_sensor: sensor.opple_1_action
 
         button_1_single:
           - service: light.turn_off

packages/devices/bedroom/bedside_switch.yaml

@@ -1,24 +1,9 @@
-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
     use_blueprint:
       path: aqara_switch.yaml
       input:
-        z2m_topic: "z2m_deconz/bedside_switch/action"
+        action_entity: sensor.bedside_switch_action
         click:
           - service: light.toggle
             data_template:

packages/devices/bedroom/bedside_switch_2.yaml

@@ -1,25 +1,9 @@
-mqtt:
-  sensor:
-    - name: "Bedside second switch battery"
-      state_topic: "z2m_deconz/bedroom_wall_switch"
-      availability_topic: "z2m_deconz/bridge/state"
-      unit_of_measurement: "%"
-      device_class: "battery"
-      value_template: "{{ value_json.battery }}"
-    - name: "Bedside second switch LQI"
-      state_topic: "z2m_deconz/bedroom_wall_switch"
-      availability_topic: "z2m_deconz/bridge/state"
-      unit_of_measurement: "lqi"
-      device_class: "signal_strength"
-      value_template: "{{ value_json.linkquality }}"
-
-
 automation:
   - alias: Bedroom · Bedside Second Switch
     use_blueprint:
       path: aqara_switch.yaml
       input:
-        z2m_topic: "z2m_deconz/bedroom_wall_switch/action"
+        action_entity: sensor.bedroom_wall_switch_action
         click:
           - service: light.toggle
             data_template: