4 changed files with 184 additions and 173 deletions
--- a/.HA_VERSION
+++ b/.HA_VERSION
@ -1 +1 @@
-2022.9.0
+2022.8.7
--- a/configuration.yaml
+++ b/configuration.yaml
@ -35,9 +35,6 @@ input_number: !include input_number.yaml
 # Additional sensors
 sensor: !include sensors.yaml

-# MQTT sensors
-mqtt:	!include mqtt.yaml
-
 # Template sensors
 template:
  - sensor:
--- a/mqtt.yaml
+++ b/mqtt.yaml
@ -1,169 +0,0 @@
-  sensor:
-# MQTT bathroom sensors
-  - name: "Badezimmer Temperatur"
-    unique_id: bathroom.temperature
-    state_topic: "home/bathroom/climate/sensor/temperature"
-    device_class: 'temperature'
-    state_class: 'measurement'
-    unit_of_measurement: '°C'
-    last_reset_topic: "home/bathroom/climate/sensor/temperature"
-    last_reset_value_template: '1970-01-01T00:00:00+00:00'
-    device:
-      identifiers: MagicMirror-DHT22-T
-      name: MagicMirror-DHT22-T
-      model: DHT22
-      manufacturer: mqtt-io
-    force_update: true
-  
-  - name: "Badezimmer Luftfeuchtigkeit"
-    unique_id: bathroom.humidity
-    state_topic: "home/bathroom/climate/sensor/humidity"
-    device_class: 'humidity'
-    state_class: 'measurement'
-    unit_of_measurement: '%'
-    last_reset_topic: "home/bathroom/climate/sensor/humidity"
-    last_reset_value_template: '1970-01-01T00:00:00+00:00'
-    device:
-      identifiers: MagicMirror-DHT22-H
-      name: MagicMirror-DHT22-H
-      model: DHT22
-      manufacturer: mqtt-io
-    force_update: true
-  
-# MQTT/RTL_433 (outdoor) sensors
-# Reliable sensor with good placement (good values) and good reception
-  - device_class: battery
-    name: Auriol-AHFL-1-106-B
-    unit_of_measurement: '%'
-    value_template: '{{ float(value) * 99 + 1 }}'
-    state_class: measurement
-    entity_category: diagnostic
-    state_topic: rtl_433/sdr/devices/Auriol-AHFL/1/106/battery_ok
-    unique_id: Auriol-AHFL-1-106-B
-    device:
-      identifiers: Auriol-AHFL-1-106
-      name: Auriol-AHFL-1-106
-      model: Auriol-AHFL
-      manufacturer: rtl_433
-
-  - device_class: temperature
-    name: Auriol-AHFL-1-106-T
-    unit_of_measurement: °C
-    value_template: '{{ value|float }}'
-    state_class: measurement
-    state_topic: rtl_433/sdr/devices/Auriol-AHFL/1/106/temperature_C
-    unique_id: Auriol-AHFL-1-106-T
-    device:
-      identifiers: Auriol-AHFL-1-106
-      name: Auriol-AHFL-1-106
-      model: Auriol-AHFL
-      manufacturer: rtl_433
-
-  - device_class: humidity
-    name: Auriol-AHFL-1-106-H
-    unit_of_measurement: '%'
-    value_template: '{{ value|float }}'
-    state_class: measurement
-    state_topic: rtl_433/sdr/devices/Auriol-AHFL/1/106/humidity
-    unique_id: Auriol-AHFL-1-106-H
-    device:
-      identifiers: Auriol-AHFL-1-106
-      name: Auriol-AHFL-1-106
-      model: Auriol-AHFL
-      manufacturer: rtl_433
-
-# Only temperature
-  - device_class: temperature
-    name: AmbientWeather-TX8300-1-29-T
-    unit_of_measurement: °C
-    value_template: '{{ value|float }}'
-    state_class: measurement
-    state_topic: rtl_433/sdr/devices/AmbientWeather-TX8300/1/29/temperature_C
-    unique_id: AmbientWeather-TX8300-1-29-T
-    device:
-      identifiers: AmbientWeather-TX8300-1-29
-      name: AmbientWeather-TX8300-1-29
-      model: AmbientWeather-TX8300
-      manufacturer: rtl_433
-
-# fair T/H/Bat
-  - device_class: battery
-    name: inFactory-TH-1-129-B
-    unit_of_measurement: '%'
-    value_template: '{{ float(value) * 99 + 1 }}'
-    state_class: measurement
-    entity_category: diagnostic
-    state_topic: rtl_433/sdr/devices/inFactory-TH/1/129/battery_ok
-    unique_id: inFactory-TH-1-129-B
-    device:
-      identifiers: inFactory-TH-1-129
-      name: inFactory-TH-1-129
-      model: inFactory-TH
-      manufacturer: rtl_433
-
-  - device_class: temperature
-    name: inFactory-TH-1-129-F
-    unit_of_measurement: °F
-    value_template: '{{ value|float }}'
-    state_class: measurement
-    state_topic: rtl_433/sdr/devices/inFactory-TH/1/129/temperature_F
-    unique_id: inFactory-TH-1-129-F
-    device:
-      identifiers: inFactory-TH-1-129
-      name: inFactory-TH-1-129
-      model: inFactory-TH
-      manufacturer: rtl_433
-
-  - device_class: humidity
-    name: inFactory-TH-1-129-H
-    unit_of_measurement: '%'
-    value_template: '{{ value|float }}'
-    state_class: measurement
-    state_topic: rtl_433/sdr/devices/inFactory-TH/1/129/humidity
-    unique_id: inFactory-TH-1-129-H
-    device:
-      identifiers: inFactory-TH-1-129
-      name: inFactory-TH-1-129
-      model: inFactory-TH
-      manufacturer: rtl_433
-
-# weak, good T/H/Bat
-  - device_class: battery
-    name: Nexus-TH-1-224-B
-    unit_of_measurement: '%'
-    value_template: '{{ float(value) * 99 + 1 }}'
-    state_class: measurement
-    entity_category: diagnostic
-    state_topic: rtl_433/sdr/devices/Nexus-TH/1/224/battery_ok
-    unique_id: Nexus-TH-1-224-B
-    device:
-      identifiers: Nexus-TH-1-224
-      name: Nexus-TH-1-224
-      model: Nexus-TH
-      manufacturer: rtl_433
-
-  - device_class: temperature
-    name: Nexus-TH-1-224-T
-    unit_of_measurement: °C
-    value_template: '{{ value|float }}'
-    state_class: measurement
-    state_topic: rtl_433/sdr/devices/Nexus-TH/1/224/temperature_C
-    unique_id: Nexus-TH-1-224-T
-    device:
-      identifiers: Nexus-TH-1-224
-      name: Nexus-TH-1-224
-      model: Nexus-TH
-      manufacturer: rtl_433
-
-  - device_class: humidity
-    name: Nexus-TH-1-224-H
-    unit_of_measurement: '%'
-    value_template: '{{ value|float }}'
-    state_class: measurement
-    state_topic: rtl_433/sdr/devices/Nexus-TH/1/224/humidity
-    unique_id: Nexus-TH-1-224-H
-    device:
-      identifiers: Nexus-TH-1-224
-      name: Nexus-TH-1-224
-      model: Nexus-TH
-      manufacturer: rtl_433
--- a/sensors.yaml
+++ b/sensors.yaml
@ -71,3 +71,186 @@
      sun_setting_template:
        friendly_name: "Sun Setting Template"
        value_template: "{{ as_timestamp(states.sun.sun.attributes.next_setting) | timestamp_custom ('%H:%M') }}"
+
+# MQTT bathroom sensors
+  - platform: mqtt
+    name: "Badezimmer Temperatur"
+    unique_id: bathroom.temperature
+    state_topic: "home/bathroom/climate/sensor/temperature"
+    device_class: 'temperature'
+    state_class: 'measurement'
+    unit_of_measurement: '°C'
+    last_reset_topic: "home/bathroom/climate/sensor/temperature"
+    last_reset_value_template: '1970-01-01T00:00:00+00:00'
+    device:
+      identifiers: MagicMirror-DHT22-T
+      name: MagicMirror-DHT22-T
+      model: DHT22
+      manufacturer: mqtt-io
+    force_update: true
+
+  - platform: mqtt
+    name: "Badezimmer Luftfeuchtigkeit"
+    unique_id: bathroom.humidity
+    state_topic: "home/bathroom/climate/sensor/humidity"
+    device_class: 'humidity'
+    state_class: 'measurement'
+    unit_of_measurement: '%'
+    last_reset_topic: "home/bathroom/climate/sensor/humidity"
+    last_reset_value_template: '1970-01-01T00:00:00+00:00'
+    device:
+      identifiers: MagicMirror-DHT22-H
+      name: MagicMirror-DHT22-H
+      model: DHT22
+      manufacturer: mqtt-io
+    force_update: true
+
+# MQTT/RTL_433 (outdoor) sensors
+# Reliable sensor with good placement (good values) and good reception
+  - device_class: battery
+    name: Auriol-AHFL-1-106-B
+    unit_of_measurement: '%'
+    value_template: '{{ float(value) * 99 + 1 }}'
+    state_class: measurement
+    entity_category: diagnostic
+    state_topic: rtl_433/sdr/devices/Auriol-AHFL/1/106/battery_ok
+    unique_id: Auriol-AHFL-1-106-B
+    device:
+      identifiers: Auriol-AHFL-1-106
+      name: Auriol-AHFL-1-106
+      model: Auriol-AHFL
+      manufacturer: rtl_433
+    platform: mqtt
+
+  - device_class: temperature
+    name: Auriol-AHFL-1-106-T
+    unit_of_measurement: °C
+    value_template: '{{ value|float }}'
+    state_class: measurement
+    state_topic: rtl_433/sdr/devices/Auriol-AHFL/1/106/temperature_C
+    unique_id: Auriol-AHFL-1-106-T
+    device:
+      identifiers: Auriol-AHFL-1-106
+      name: Auriol-AHFL-1-106
+      model: Auriol-AHFL
+      manufacturer: rtl_433
+    platform: mqtt
+
+  - device_class: humidity
+    name: Auriol-AHFL-1-106-H
+    unit_of_measurement: '%'
+    value_template: '{{ value|float }}'
+    state_class: measurement
+    state_topic: rtl_433/sdr/devices/Auriol-AHFL/1/106/humidity
+    unique_id: Auriol-AHFL-1-106-H
+    device:
+      identifiers: Auriol-AHFL-1-106
+      name: Auriol-AHFL-1-106
+      model: Auriol-AHFL
+      manufacturer: rtl_433
+    platform: mqtt
+
+# Only temperature
+  - device_class: temperature
+    name: AmbientWeather-TX8300-1-29-T
+    unit_of_measurement: °C
+    value_template: '{{ value|float }}'
+    state_class: measurement
+    state_topic: rtl_433/sdr/devices/AmbientWeather-TX8300/1/29/temperature_C
+    unique_id: AmbientWeather-TX8300-1-29-T
+    device:
+      identifiers: AmbientWeather-TX8300-1-29
+      name: AmbientWeather-TX8300-1-29
+      model: AmbientWeather-TX8300
+      manufacturer: rtl_433
+    platform: mqtt
+
+# fair T/H/Bat
+  - device_class: battery
+    name: inFactory-TH-1-129-B
+    unit_of_measurement: '%'
+    value_template: '{{ float(value) * 99 + 1 }}'
+    state_class: measurement
+    entity_category: diagnostic
+    state_topic: rtl_433/sdr/devices/inFactory-TH/1/129/battery_ok
+    unique_id: inFactory-TH-1-129-B
+    device:
+      identifiers: inFactory-TH-1-129
+      name: inFactory-TH-1-129
+      model: inFactory-TH
+      manufacturer: rtl_433
+    platform: mqtt
+
+  - device_class: temperature
+    name: inFactory-TH-1-129-F
+    unit_of_measurement: °F
+    value_template: '{{ value|float }}'
+    state_class: measurement
+    state_topic: rtl_433/sdr/devices/inFactory-TH/1/129/temperature_F
+    unique_id: inFactory-TH-1-129-F
+    device:
+      identifiers: inFactory-TH-1-129
+      name: inFactory-TH-1-129
+      model: inFactory-TH
+      manufacturer: rtl_433
+    platform: mqtt
+
+  - device_class: humidity
+    name: inFactory-TH-1-129-H
+    unit_of_measurement: '%'
+    value_template: '{{ value|float }}'
+    state_class: measurement
+    state_topic: rtl_433/sdr/devices/inFactory-TH/1/129/humidity
+    unique_id: inFactory-TH-1-129-H
+    device:
+      identifiers: inFactory-TH-1-129
+      name: inFactory-TH-1-129
+      model: inFactory-TH
+      manufacturer: rtl_433
+    platform: mqtt
+
+# weak, good T/H/Bat
+  - device_class: battery
+    name: Nexus-TH-1-224-B
+    unit_of_measurement: '%'
+    value_template: '{{ float(value) * 99 + 1 }}'
+    state_class: measurement
+    entity_category: diagnostic
+    state_topic: rtl_433/sdr/devices/Nexus-TH/1/224/battery_ok
+    unique_id: Nexus-TH-1-224-B
+    device:
+      identifiers: Nexus-TH-1-224
+      name: Nexus-TH-1-224
+      model: Nexus-TH
+      manufacturer: rtl_433
+    platform: mqtt
+
+  - device_class: temperature
+    name: Nexus-TH-1-224-T
+    unit_of_measurement: °C
+    value_template: '{{ value|float }}'
+    state_class: measurement
+    state_topic: rtl_433/sdr/devices/Nexus-TH/1/224/temperature_C
+    unique_id: Nexus-TH-1-224-T
+    device:
+      identifiers: Nexus-TH-1-224
+      name: Nexus-TH-1-224
+      model: Nexus-TH
+      manufacturer: rtl_433
+    platform: mqtt
+
+  - device_class: humidity
+    name: Nexus-TH-1-224-H
+    unit_of_measurement: '%'
+    value_template: '{{ value|float }}'
+    state_class: measurement
+    state_topic: rtl_433/sdr/devices/Nexus-TH/1/224/humidity
+    unique_id: Nexus-TH-1-224-H
+    device:
+      identifiers: Nexus-TH-1-224
+      name: Nexus-TH-1-224
+      model: Nexus-TH
+      manufacturer: rtl_433
+    platform: mqtt
+
+
 @ -1 +1 @@
 .9.0
 .8.7