Auto Push - update ha-addon config and changelog for 1.14.0 - [no ci]

wmbusmeters · Jul 2, 2023 · 6468a84 · 6468a84
1 parent 42ed19e
commit 6468a84
Show file tree

Hide file tree

Showing 5 changed files with 224 additions and 4 deletions.
diff --git a/wmbusmeters-ha-addon/CHANGELOG.md b/wmbusmeters-ha-addon/CHANGELOG.md
@@ -1,3 +1,5 @@
+## 1.14.0 
+- Updated to version [1.14.0](https://github.com/wmbusmeters/wmbusmeters/blob/master/CHANGES)
 ## 1.13.1 
 - Updated to version [1.13.1](https://github.com/wmbusmeters/wmbusmeters/blob/master/CHANGES)
 ## 1.12.0 

diff --git a/wmbusmeters-ha-addon/Dockerfile b/wmbusmeters-ha-addon/Dockerfile
@@ -3,7 +3,7 @@ FROM $BUILD_FROM AS build
 
 ENV LANG C.UTF-8
 
-RUN apk add --no-cache alpine-sdk gcc linux-headers ncurses-dev librtlsdr-dev cmake libusb-dev
+RUN apk add --no-cache alpine-sdk gcc linux-headers librtlsdr-dev cmake libusb-dev
 
 ADD https://api.github.com/repos/wmbusmeters/wmbusmeters/git/refs/heads/master version.json
 RUN git clone https://github.com/wmbusmeters/wmbusmeters.git && \
@@ -18,7 +18,7 @@ RUN mkdir build && cd build && cmake ../ && make
 
 FROM $BUILD_FROM AS scratch
 ENV QEMU_EXECVE=1
-RUN apk add --no-cache mosquitto-clients libstdc++ curl libusb ncurses rtl-sdr netcat-openbsd nginx
+RUN apk add --no-cache mosquitto-clients libstdc++ curl libusb rtl-sdr netcat-openbsd nginx
 # Install Flask
 RUN apk add --update py3-pip py3-cryptography
 RUN pip install flask requests waitress xmltodict
@@ -39,4 +39,4 @@ RUN chmod a+x /etc/services.d/nginx/run
 RUN chmod a+x /etc/services.d/nginx/finish
 RUN chmod a+x /etc/cont-init.d/nginx.sh
 
-CMD ["/run.sh"]
+CMD ["/run.sh"]
diff --git a/wmbusmeters-ha-addon/config.json b/wmbusmeters-ha-addon/config.json
@@ -1,6 +1,6 @@
 {
     "name": "Wmbusmeters (W-MBus to MQTT)",
-    "version": "1.13.1",
+    "version": "1.14.0",
     "slug": "wmbusmeters-ha-addon",
     "description": "Acquire utility meter readings using the wireless mbus protocol (WMBUS)",
     "arch": ["armv7", "aarch64", "amd64"],

diff --git a/wmbusmeters-ha-addon/mqtt_discovery/hcae2.json b/wmbusmeters-ha-addon/mqtt_discovery/hcae2.json
@@ -0,0 +1,92 @@
+{
+    "current_consumption_hca": {
+        "component": "sensor",
+        "discovery_payload": {
+            "device": {
+                "identifiers": [
+                    "wmbusmeters_{id}"
+                ],
+                "manufacturer": "Engelmann",
+                "model": "HCA e2",
+                "name": "{name}",
+                "hw_version": "{id}"
+            },
+            "enabled_by_default": true,
+            "json_attributes_topic": "wmbusmeters/{name}",
+            "state_class": "total",
+            "name": "{name} heat cost total",
+            "state_topic": "wmbusmeters/{name}",
+            "unique_id": "wmbusmeters_{id}_{attribute}",
+            "unit_of_measurement": "hca",
+            "value_template": "{{ value_json.{attribute} }}",
+            "icon": "mdi:gauge"
+        }
+    },
+    "rssi_dbm": {
+        "component": "sensor",
+        "discovery_payload": {
+            "device": {
+                "identifiers": [
+                    "wmbusmeters_{id}"
+                ],
+                "manufacturer": "Engelmann",
+                "model": "HCA e2",
+                "name": "{name}",
+                "hw_version": "{id}"
+            },
+            "enabled_by_default": false,
+            "entity_category": "diagnostic",
+            "device_class": "signal_strength",
+            "state_class": "measurement",
+            "name": "{name} rssi",
+            "state_topic": "wmbusmeters/{name}",
+            "unique_id": "wmbusmeters_{id}_{attribute}",
+            "unit_of_measurement": "dBm",
+            "value_template": "{{ value_json.{attribute} }}",
+            "icon": "mdi:signal"
+        }
+    },
+	"timestamp": {
+		"component":"sensor",
+		"discovery_payload":{
+			"device":{
+				"identifiers":[
+					"wmbusmeters_{id}"
+				],
+			   "manufacturer": "Engelmann",
+			   "model": "HCA e2",
+			   "name": "{name}",
+			   "hw_version": "{id}"
+			},
+			"entity_category": "diagnostic",
+			"name": "{name} timestamp",
+			"unique_id": "wmbusmeters_{id}_{attribute}",
+			"state_topic": "wmbusmeters/{name}",
+			"value_template": "{{ value_json.{attribute} }}",
+			"icon": "mdi:calendar-clock",
+			"device_class": "timestamp",
+			"enabled_by_default": false
+		}
+    },
+	"status_ERROR": {
+        "component": "binary_sensor",
+        "discovery_payload": {
+            "device": {
+                "identifiers": ["wmbusmeters_{id}"],
+                "manufacturer": "Engelmann",
+                "model": "HCA e2",
+                "name": "{name}",
+                "hw_version": "{id}"
+            },
+            "enabled_by_default": false,
+            "entity_category": "diagnostic",
+            "device_class": "problem",
+            "name": "{name} error",
+            "state_topic": "wmbusmeters/{name}",
+            "unique_id": "wmbusmeters_{id}_{attribute}",
+            "value_template": "{{ 'ERROR' in value_json.status }}",
+            "payload_on": "True",
+            "payload_off": "False"
+        }
+    }
+}
diff --git a/wmbusmeters-ha-addon/mqtt_discovery/hydrocalm3.json b/wmbusmeters-ha-addon/mqtt_discovery/hydrocalm3.json
@@ -0,0 +1,126 @@
+{
+  "total_heating_kwh": {
+    "component": "sensor",
+    "discovery_payload": {
+      "device": {
+        "identifiers": ["wmbusmeters_{id}"],
+        "manufacturer": "(BMT) BMETERS",
+        "model": "{driver}",
+        "name": "{name}",
+        "hw_version": "{id}"
+      },
+      "enabled_by_default": true,
+      "json_attributes_topic": "wmbusmeters/{name}",
+      "state_class": "total",
+      "device_class": "energy",
+      "name": "{name} total energy consumption",
+      "state_topic": "wmbusmeters/{name}",
+      "unique_id": "wmbusmeters_{id}_{attribute}",
+      "unit_of_measurement": "kWh",
+      "value_template": "{{ value_json.{attribute} }}",
+      "icon": "mdi:home-lightning-bolt-outline"
+    }
+  },
+  "total_heating_m3": {
+    "component": "sensor",
+    "discovery_payload": {
+      "device": {
+        "identifiers": ["wmbusmeters_{id}"],
+        "manufacturer": "(BMT) BMETERS",
+        "model": "{driver}",
+        "name": "{name}",
+        "hw_version": "{id}"
+      },
+      "enabled_by_default": true,
+      "state_class": "total",
+      "device_class": "water",
+      "name": "{name} total volume",
+      "state_topic": "wmbusmeters/{name}",
+      "unique_id": "wmbusmeters_{id}_{attribute}",
+      "unit_of_measurement": "m³",
+      "value_template": "{{ value_json.{attribute} }}",
+      "icon": "mdi:water"
+    }
+  },
+  "status": {
+    "component": "binary_sensor",
+    "discovery_payload": {
+      "device": {
+        "identifiers": ["wmbusmeters_{id}"],
+        "manufacturer": "(BMT) BMETERS",
+        "model": "{driver}",
+        "name": "{name}",
+        "hw_version": "{id}"
+      },
+      "enabled_by_default": false,
+      "entity_category": "diagnostic",
+      "device_class": "problem",
+      "name": "{name} status",
+      "state_topic": "wmbusmeters/{name}",
+      "unique_id": "wmbusmeters_{id}_{attribute}",
+      "value_template": "{{ value_json.{attribute} }}",
+      "payload_on": "True",
+      "payload_off": "OK"
+    }
+  },
+  "timestamp": {
+    "component": "sensor",
+    "discovery_payload": {
+      "device": {
+        "identifiers": ["wmbusmeters_{id}"],
+        "manufacturer": "(BMT) BMETERS",
+        "model": "{driver}",
+        "name": "{name}",
+        "hw_version": "{id}"
+      },
+      "entity_category": "diagnostic",
+      "name": "{name} timestamp",
+      "unique_id": "wmbusmeters_{id}_{attribute}",
+      "state_topic": "wmbusmeters/{name}",
+      "value_template": "{{ value_json.{attribute} }}",
+      "icon": "mdi:calendar-clock",
+      "enabled_by_default": false
+    }
+  },
+  "device_datetime": {
+    "component": "sensor",
+    "discovery_payload": {
+      "device": {
+        "identifiers": ["wmbusmeters_{id}"],
+        "manufacturer": "(BMT) BMETERS",
+        "model": "{driver}",
+        "name": "{name}",
+        "hw_version": "{id}"
+      },
+      "entity_category": "diagnostic",
+      "name": "{name} device datetime",
+      "unique_id": "wmbusmeters_{id}_{attribute}",
+      "state_topic": "wmbusmeters/{name}",
+      "value_template": "{{ value_json.{attribute} }}",
+      "icon": "mdi:calendar-clock",
+      "enabled_by_default": false
+    }
+  },
+  "rssi_dbm": {
+    "component": "sensor",
+    "discovery_payload": {
+      "device": {
+        "identifiers": ["wmbusmeters_{id}"],
+        "manufacturer": "(BMT) BMETERS",
+        "model": "{driver}",
+        "name": "{name}",
+        "hw_version": "{id}"
+      },
+      "enabled_by_default": false,
+      "entity_category": "diagnostic",
+      "device_class": "signal_strength",
+      "state_class": "measurement",
+      "name": "{name} rssi",
+      "state_topic": "wmbusmeters/{name}",
+      "unique_id": "wmbusmeters_{id}_{attribute}",
+      "unit_of_measurement": "dBm",
+      "value_template": "{{ value_json.{attribute} }}",
+      "icon": "mdi:signal"
+    }
+  }
+}