From e886a59c0cf0e048a80f898a5ddf3afaff215943 Mon Sep 17 00:00:00 2001
From: danrfossberg <100295318+danrfossberg@users.noreply.github.com>
Date: Sat, 25 Jan 2025 14:39:38 +0100
Subject: [PATCH 1/3] Update tf016_tf021.json

Added parameter 21 for thermostats to report kWh, Watt and Volt
---
 .../config/devices/0x019b/tf016_tf021.json    | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/packages/config/config/devices/0x019b/tf016_tf021.json b/packages/config/config/devices/0x019b/tf016_tf021.json
index 38311397c68a..c548388c3e9a 100644
--- a/packages/config/config/devices/0x019b/tf016_tf021.json
+++ b/packages/config/config/devices/0x019b/tf016_tf021.json
@@ -250,6 +250,15 @@
 			"maxValue": 100,
 			"defaultValue": 10
 		}
+		{
+			"#": "21",
+			"label": "Meter Report Data Delta",
+			"description": "Delta value in kWh between consecutive meter reports. Range 0-255 (0 to 25.5 kWh). A value of 0 disables reporting based on change.",
+			"valueSize": 1,
+			"minValue": 0,
+			"maxValue": 255,
+			"defaultValue": 10
+		}
 	],
 	"compat": {
 		// The device reports its relay state via the Basic CC
@@ -269,4 +278,21 @@
 		"reset": "By pressing buttons Left and Center (up and confirm) for 20 seconds, the thermostat will perform a complete factory reset.\nPlease use this procedure only when the primary controller is missing or otherwise inoperable",
 		"manual": "https://products.z-wavealliance.org/ProductManual/File?folder=&filename=MarketCertificationFiles/1234/Manual_Multireg%20Z-Wave_Ver2015-A.pdf"
 	}
+	"meterCommandClass": {
+		"getSupport": true,
+		"reportScales": {
+			"import": true,
+			"meterType": "Electric meter (0x01)",
+			"precision": {
+				"kWh": 1,
+				"W": 2,
+				"V": 1
+			},
+			"size": {
+				"kWh": 4,
+				"W": 4,
+				"V": 2
+			}
+		}
+	}
 }

From 1971fc36e0b2c7c9c21e4e2a1630eb2f2c7c3bc7 Mon Sep 17 00:00:00 2001
From: danrfossberg <100295318+danrfossberg@users.noreply.github.com>
Date: Tue, 28 Jan 2025 19:39:42 +0100
Subject: [PATCH 2/3] feat (config): update tf016_tf021.json

---
 packages/config/config/devices/0x019b/tf016_tf021.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/config/config/devices/0x019b/tf016_tf021.json b/packages/config/config/devices/0x019b/tf016_tf021.json
index c548388c3e9a..9e84613a6140 100644
--- a/packages/config/config/devices/0x019b/tf016_tf021.json
+++ b/packages/config/config/devices/0x019b/tf016_tf021.json
@@ -249,7 +249,7 @@
 			"minValue": 1,
 			"maxValue": 100,
 			"defaultValue": 10
-		}
+		},
 		{
 			"#": "21",
 			"label": "Meter Report Data Delta",

From fbefdd5a7b0a4d9edf71a7bd6fb9bba1771ba0ab Mon Sep 17 00:00:00 2001
From: danrfossberg <100295318+danrfossberg@users.noreply.github.com>
Date: Tue, 28 Jan 2025 19:52:46 +0100
Subject: [PATCH 3/3] Update tf016_tf021.json

Minor fixes
---
 packages/config/config/devices/0x019b/tf016_tf021.json | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/config/config/devices/0x019b/tf016_tf021.json b/packages/config/config/devices/0x019b/tf016_tf021.json
index 9e84613a6140..2d2946ae38c4 100644
--- a/packages/config/config/devices/0x019b/tf016_tf021.json
+++ b/packages/config/config/devices/0x019b/tf016_tf021.json
@@ -7,7 +7,6 @@
 		{
 			"productType": "0x0001",
 			"productId": "0x0001",
-			// One of these is labeled TF016, the other TF021
 			"zwaveAllianceId": [1182, 1234]
 		},
 		{
@@ -63,7 +62,6 @@
 			"valueSize": 2,
 			"defaultValue": 1,
 			"allowManualEntry": false,
-			/* eslint-disable @zwave-js/consistent-config-string-case */
 			"options": [
 				{
 					"label": "F",
@@ -90,7 +88,6 @@
 					"value": 5
 				}
 			]
-			/* eslint-enable @zwave-js/consistent-config-string-case */
 		},
 		{
 			"#": "3",
@@ -261,9 +258,7 @@
 		}
 	],
 	"compat": {
-		// The device reports its relay state via the Basic CC
 		"mapBasicReport": false,
-		// Supervision reports are sent from the root device instead of endpoints
 		"commandClasses": {
 			"remove": {
 				"Supervision": {
@@ -277,7 +272,7 @@
 		"exclusion": "To exclude the thermostat from your home automation gateway, press Center (confirm) for 10 seconds.\nThe display will show OFF. Press Right (down) 4 times till you see Con in the display.\nNow start removing the device in your home automation software. Enter exclusion mode by pressing Center (confirm) for approximately 2 seconds. The inclusion/exclusion icon will appear in the display. Confirmation will show Inc/EcL in the display. If exclusion fails, Err (error) will appear.\nLeave programming mode by choosing ESC in menu. Your thermostat is ready for use with default settings",
 		"reset": "By pressing buttons Left and Center (up and confirm) for 20 seconds, the thermostat will perform a complete factory reset.\nPlease use this procedure only when the primary controller is missing or otherwise inoperable",
 		"manual": "https://products.z-wavealliance.org/ProductManual/File?folder=&filename=MarketCertificationFiles/1234/Manual_Multireg%20Z-Wave_Ver2015-A.pdf"
-	}
+	},
 	"meterCommandClass": {
 		"getSupport": true,
 		"reportScales": {