diff --git a/group_vars/prod b/group_vars/prod index f28a92a9d6203e4690c8242509e8fb2689d853ad..8ac1256a668d808ed5d2a7701758c0a190eaf3f6 100644 --- a/group_vars/prod +++ b/group_vars/prod @@ -109,7 +109,7 @@ esphome_devices: - { id: "hauptraum", name: "Hauptraum", groups: "gHauptraum", sensors: [ "Temp", "pressure", "humidity" ] } - { id: "holzwerkstatt", name: "Holzwerkstatt", groups: "gHolzwerkstatt", sensors: [ "Temp", "pressure", "humidity" ] } - { id: "kamin", name: "Kamin", groups: "gHauptraum", sensors: [ "HeizungVorlauf", "HeizungRuecklauf"] } - - { id: "kuehlschrank", name: "Kühlschrank", groups: "gHauptraum", sensors: [ "Kuehlschrank-Temp" ] } + - { id: "kuehlschrank", name: "Kühlschrank", groups: "gHauptraum", sensors: [ "Kuehlschrank-Temp", "Kuehlschrank-Door" ] } - { id: "lounge", name: "Lounge", groups: "gLounge", sensors: [ "Temp", "pressure", "humidity" ] } - - { id: "status", name: "Status/Strom", groups: "gHauptraum", sensors: [ "stromverbrauch" ] } + - { id: "status", name: "Status/Strom", groups: "gHauptraum", sensors: [ "stromverbrauch", "warpzone_status" ] } - { id: "vortragsraum", name: "Vortragsraum", groups: "gVortragsraum", sensors: [ "Temp", "pressure", "humidity" ] } diff --git a/intern/docker_openhab/templates/conf/items/mqtt.items b/intern/docker_openhab/templates/conf/items/mqtt.items index c0b6e2a1dbd064dfd19ab30c96ce8a9fe48bc883..df8a45c505373fb579509b80c857b50549378ec9 100644 --- a/intern/docker_openhab/templates/conf/items/mqtt.items +++ b/intern/docker_openhab/templates/conf/items/mqtt.items @@ -7,7 +7,7 @@ Number Werkstatt_Licht "Werkstatt Licht [%.0f (0-225)]" <light> (gHaupt {% if device.sensors is defined %} {% for sensor in device.sensors %} - {% if sensor == "temp" or sensor == "HeizungVorlauf" or sensor == "HeizungRuecklauf" or sensor == "Kuehlschrank-Temp" %} + {% if sensor == "Temp" or sensor == "HeizungVorlauf" or sensor == "HeizungRuecklauf" or sensor == "Kuehlschrank-Temp" %} Number MQTT_{{ device.id }}_{{ sensor | replace("-","") }} "Sensor {{ device.name }} {{ sensor }} [%.1f °C]" <temperature> ({{ device.groups }}) ["Measurement","Temperature","CurrentTemperature"] { channel="mqtt:topic:mosquitto:{{ device.id }}:{{ sensor | replace("-","") | lower }}" @@ -37,6 +37,12 @@ Number MQTT_{{ device.id }}_{{ sensor }} "Sensor {{ device.name }} kW [%.1f kW]" channel="mqtt:topic:mosquitto:{{ device.id }}:{{ sensor }}" } + {% elif sensor == "Kuehlschrank-Door" or sensor == "warpzone_status" %} + +Switch MQTT_{{ device.id }}_{{ sensor }} "Sensor {{ device.name }}" ({{ device.groups }}) { + channel="mqtt:topic:mosquitto:{{ device.id }}:{{ sensor | replace("-","") | lower }}" +} + {% endif %} {% endfor %} diff --git a/intern/docker_openhab/templates/conf/things/mqtt.things b/intern/docker_openhab/templates/conf/things/mqtt.things index afd79df457b7a7d4d4452658d0b4540044278325..031b8795683a8e6b66bf3cda135c1781ce59c838 100644 --- a/intern/docker_openhab/templates/conf/things/mqtt.things +++ b/intern/docker_openhab/templates/conf/things/mqtt.things @@ -17,15 +17,29 @@ Bridge mqtt:broker:mosquitto [ host="{{ int_ip4 }}", secure=false, enableDiscove {% for sensor in device.sensors %} {% if sensor == "Temp" or sensor == "HeizungVorlauf" or sensor == "HeizungRuecklauf" or sensor == "Kuehlschrank-Temp" %} + Type number : {{ sensor | replace("-","") | lower }} "Sensor {{ device.name }} {{ sensor }}" [ stateTopic="ESPHome/esphome_{{ device.id }}/sensor/{{ sensor | lower }}/state" ] + {% elif sensor == "pressure" %} + Type number : {{ sensor }} "Sensor {{ device.name }} Pressure" [ stateTopic="ESPHome/esphome_{{ device.id }}/sensor/{{ sensor }}/state" ] + {% elif sensor == "humidity" %} + Type number : {{ sensor }} "Sensor {{ device.name }} Humidity" [ stateTopic="ESPHome/esphome_{{ device.id }}/sensor/{{ sensor }}/state" ] + {% elif sensor == "feinstaub_2_5" %} + Type number : {{ sensor }} "Sensor {{ device.name }} 2.5 PM" [ stateTopic="ESPHome/esphome_{{ device.id }}/sensor/{{ sensor }}/state" ] + {% elif sensor == "stromverbrauch" %} + Type number : {{ sensor }} "Sensor {{ device.name }} kW" [ stateTopic="ESPHome/esphome_{{ device.id }}/sensor/{{ sensor }}/state" ] + + {% elif sensor == "Kuehlschrank-Door" or sensor == "warpzone_status" %} + + Type switch : {{ sensor | replace("-","") | lower }} "Sensor {{ device.name }}" [ stateTopic="ESPHome/esphome_{{ device.id }}/binary_sensor/{{ sensor | lower }}/state", on="ON", off="OFF" ] + {% endif %} {% endfor %}