Thermostat F scale handled

Z-Wave-Me · Sep 13, 2015 · c0f0447 · c0f0447
1 parent 2ff3781
commit c0f0447
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 15 deletions.
diff --git a/modules/EnOcean/index.js b/modules/EnOcean/index.js
@@ -537,7 +537,7 @@ EnOcean.prototype.parseProfile = function (nodeId) {
 				defaults: {
 					deviceType: "thermostat",
 					metrics: {
-						scaleTitle: scale,
+						scaleTitle: scale, // TODO!!! Check if F scale is defined in EnOcean
 						level: '',
 						min: 5,
 						max: 40,

diff --git a/modules/ThermostatDevice/index.js b/modules/ThermostatDevice/index.js
@@ -35,10 +35,10 @@ ThermostatDevice.prototype.init = function (config) {
         defaults: {
             deviceType: "thermostat",
             metrics: {
-		scaleTitle:  '°C',
-                level: 18,
-                min: 5,
-                max: 40,
+                scaleTitle:  this.config.scale === 'C' ? '°C' : '°F',
+                level: this.config.scale === 'C' ? 18 : 65,
+                min: this.config.scale === 'C' ? 5 : 41,
+                max: this.config.scale === 'C' ? 40 : 104,
                 icon: '',
                 title: 'Thermostat Device ' + this.id
             }
@@ -52,15 +52,15 @@ ThermostatDevice.prototype.init = function (config) {
     });
 
     this.controller.devices.on(this.config.sensor, 'change:metrics:level', function() {
-    	self.checkTemp();
+        self.checkTemp();
     });
 };
 
 ThermostatDevice.prototype.stop = function () {
     var self = this;
 
     this.controller.devices.off(this.config.sensor, 'change:metrics:level', function() {
-    	self.checkTemp();
+        self.checkTemp();
     });
 
     if (this.vDev) {

diff --git a/modules/ThermostatDevice/lang/de.json b/modules/ThermostatDevice/lang/de.json
@@ -7,5 +7,8 @@
 	"heat":"Heizen",
 	"cool":"Kühlen",
 	"l_hysteresis":"Hysteresis",
-	"h_hysteresis":"Maximaler Bereich zwischen Ist- und Solltemperatur, nachdem sich das Thermostat an/ausschalten soll."
+	"h_hysteresis":"Maximaler Bereich zwischen Ist- und Solltemperatur, nachdem sich das Thermostat an/ausschalten soll.",
+	"l_scale": "Scale",
+	"scale_C": "°C",
+	"scale_F": "°F"
 }
diff --git a/modules/ThermostatDevice/lang/en.json b/modules/ThermostatDevice/lang/en.json
@@ -7,5 +7,8 @@
 	"heat":"Heat",
 	"cool":"Cool",
 	"l_hysteresis":"Hysteresis",
-	"h_hysteresis":"Maximal delta between current and target temperature after which thermostat should turn on/off"
+	"h_hysteresis":"Maximal delta between current and target temperature after which thermostat should turn on/off",
+	"l_scale": "Scale",
+	"scale_C": "°C",
+	"scale_F": "°F"
 }
diff --git a/modules/ThermostatDevice/lang/ru.json b/modules/ThermostatDevice/lang/ru.json
@@ -7,5 +7,8 @@
 	"heat":"Обогрев",
 	"cool":"Охлаждение",
 	"l_hysteresis":"Гистерезис",
-	"h_hysteresis":"Максимальная температура коридора между текущем значением температуры и температурой после которой реле должно включиться/выключиться"
+	"h_hysteresis":"Максимальная температура коридора между текущем значением температуры и температурой после которой реле должно включиться/выключиться",
+	"l_scale": "Шкала",
+	"scale_C": "°C",
+	"scale_F": "°F"
 }
diff --git a/modules/ThermostatDevice/module.json b/modules/ThermostatDevice/module.json
@@ -6,7 +6,7 @@
 	"homepage": "http://razberry.z-wave.me",
 	"icon": "icon.png",
         "moduleName":"ThermostatDevice",
-	"version": "1.0.0",
+	"version": "1.0.1",
 	"maturity": "stable",
 	"repository": {
 		"type": "git",
@@ -17,7 +17,8 @@
 		"description": "__m_descr__",
 		"switch": "",
 		"sensor": "",
-		"heaton": true
+		"heaton": true,
+		"scale": "C"
 	},
 	"schema": {
 		"type": "object",
@@ -42,6 +43,10 @@
 				"minimum": 0,
 				"maximum": 5,
 				"required": true
+			},
+			"scale": {
+				"enum": ["C", "F"],
+				"required": true
 			}
 		},
 		"required": false
@@ -71,6 +76,11 @@
 				"label": "__l_hysteresis__",
 				"type": "number",
 				"helper": "__h_hysteresis__"
+			},
+			"scale": {
+				"label": "__l_scale__",
+				"type": "select",
+				"optionLabels": ["__scale_C__", "__scale_F__"]
 			}
 		}
 	}

diff --git a/modules/ZWave/index.js b/modules/ZWave/index.js
@@ -1,6 +1,6 @@
 /*** Z-Wave Binding module ********************************************************
 
-Version: 2.0.0
+Version: 2.1.2
 -------------------------------------------------------------------------------
 Author: Serguei Poltorak <ps@z-wave.me>
 Copyright: (c) Z-Wave.Me, 2014
@@ -1848,8 +1848,8 @@ ZWave.prototype.parseAddCommandClass = function (nodeId, instanceId, commandClas
                                                                 metrics: {
                                                                         scaleTitle: instance.ThermostatSetPoint.data[mode].scaleString.value,
                                                                         level: DH.val.value,
-                                                                        min: 5,
-                                                                        max: 40,
+                                                                        min: instance.ThermostatSetPoint.data[mode].scale.value === 0 ? 5 : 41,
+                                                                        max: instance.ThermostatSetPoint.data[mode].scale.value === 0 ? 40 : 104,
                                                                         icon: 'thermostat',
                                                                         title: compileTitle("Thermostat " + (mode === MODE_HEAT ? "Heat" : "Cool"), vDevIdNI)
                                                                 }