Merge pull request #131 from Grizzelbee/Dev_4.0.14

fixes #130
Grizzelbee · Apr 19, 2021 · eccd5d0 · eccd5d0
2 parents f90f8d2 + 61e6720
commit eccd5d0
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -164,6 +164,9 @@ Here is a list of what these raw values stand for:
 
 ## Changelog
 
+### V4.0.15 (2021-04-19) (Moonglow)
+*  (grizzelbee) Fix: [130](https://github.com/Grizzelbee/ioBroker.mielecloudservice/issues/130) targetTemp for fridges and freezers will now correctly been updated in action section with current values
+
 ### V4.0.14 (2021-04-18) (Alchemy)
 *  (grizzelbee) Fix: [127](https://github.com/Grizzelbee/ioBroker.mielecloudservice/issues/127) targetTemp for fridges caused exception and crash of adapter
 

diff --git a/io-package.json b/io-package.json
@@ -1,9 +1,9 @@
 {
     "common": {
         "name": "mielecloudservice",
-        "version": "4.0.14",
+        "version": "4.0.15",
         "news": {
-            "4.0.14": {
+            "4.0.15": {
                 "en": "Bugfix Release - see changelog for details!",
                 "de": "Bugfix Release - Details siehe Changelog!",
                 "ru": "Выпуск исправления ошибок - подробности см. В журнале изменений!",

diff --git a/main.js b/main.js
@@ -558,7 +558,7 @@ async function addMieleDeviceState(path, currentDevice, currentDeviceState, setu
                 await mieleTools.createStateSmartGrid(adapter, setup, path, currentDeviceState.remoteEnable.smartGrid);
                 await mieleTools.createStateMobileStart(adapter, setup, path, currentDeviceState.remoteEnable.mobileStart);
                 await mieleTools.createStateTemperature(adapter, setup, path, currentDeviceState.temperature);
-                await mieleTools.createStateTargetTemperatureFridge(adapter, setup, path, currentDeviceState.targetTemperature.hasOwnProperty('zone')?  currentDeviceState.targetTemperature.zone[1].value : {}, actions.targetTemperature[0].min, actions.targetTemperature[0].max);
+                await mieleTools.createStateTargetTemperatureFridge(adapter, setup, path, currentDeviceState.targetTemperature[0].value_localized, actions.targetTemperature[0].min, actions.targetTemperature[0].max, currentDeviceState.targetTemperature[0].unit);
                 // Actions
                 await mieleTools.addSuperCoolingSwitch(adapter, setup, path, actions);
                 break;
@@ -569,7 +569,7 @@ async function addMieleDeviceState(path, currentDevice, currentDeviceState, setu
                 await mieleTools.createStateSmartGrid(adapter, setup, path, currentDeviceState.remoteEnable.smartGrid);
                 await mieleTools.createStateMobileStart(adapter, setup, path, currentDeviceState.remoteEnable.mobileStart);
                 await mieleTools.createStateTemperature(adapter, setup, path, currentDeviceState.temperature);
-                await mieleTools.createStateTargetTemperatureFreezer(adapter, setup, path, currentDeviceState.targetTemperature.hasOwnProperty('zone')?  currentDeviceState.targetTemperature.zone[1].value : {}, actions.targetTemperature[0].min, actions.targetTemperature[0].max);
+                await mieleTools.createStateTargetTemperatureFreezer(adapter, setup, path, currentDeviceState.targetTemperature[0].value_localized, actions.targetTemperature[0].min, actions.targetTemperature[0].max, currentDeviceState.targetTemperature[0].unit);
                 // Actions
                 await mieleTools.addSuperFreezingSwitch(adapter, setup, path, actions);
                 break;
@@ -580,8 +580,8 @@ async function addMieleDeviceState(path, currentDevice, currentDeviceState, setu
                 await mieleTools.createStateSmartGrid(adapter, setup, path, currentDeviceState.remoteEnable.smartGrid);
                 await mieleTools.createStateMobileStart(adapter, setup, path, currentDeviceState.remoteEnable.mobileStart);
                 await mieleTools.createStateTemperature(adapter, setup, path, currentDeviceState.temperature);
-                await mieleTools.createStateTargetTemperatureFridge(adapter, setup, path, currentDeviceState.targetTemperature.hasOwnProperty('zone')?  currentDeviceState.targetTemperature.zone[1].value : {}, actions.targetTemperature[0].min, actions.targetTemperature[0].max);
-                await mieleTools.createStateTargetTemperatureFreezer(adapter, setup, path, currentDeviceState.targetTemperature.hasOwnProperty('zone')?  currentDeviceState.targetTemperature.zone[2].value : {}, actions.targetTemperature[1].min, actions.targetTemperature[1].max);
+                await mieleTools.createStateTargetTemperatureFridge(adapter, setup, path, currentDeviceState.targetTemperature[0].value_localized, actions.targetTemperature[0].min, actions.targetTemperature[0].max, currentDeviceState.targetTemperature[0].unit);
+                await mieleTools.createStateTargetTemperatureFreezer(adapter, setup, path, currentDeviceState.targetTemperature[1].value_localized, actions.targetTemperature[1].min, actions.targetTemperature[1].max, currentDeviceState.targetTemperature[1].unit);
                 // Actions
                 await mieleTools.addSuperCoolingSwitch(adapter, setup, path, actions);
                 await mieleTools.addSuperFreezingSwitch(adapter, setup, path, actions);
@@ -595,7 +595,7 @@ async function addMieleDeviceState(path, currentDevice, currentDeviceState, setu
                 await mieleTools.createStateSmartGrid(adapter, setup, path, currentDeviceState.remoteEnable.smartGrid);
                 await mieleTools.createStateMobileStart(adapter, setup, path, currentDeviceState.remoteEnable.mobileStart);
                 await mieleTools.createStateTemperature(adapter, setup, path, currentDeviceState.temperature);
-                await mieleTools.createStateTargetTemperatureFridge(adapter, setup, path, currentDeviceState.targetTemperature.hasOwnProperty('zone')?  currentDeviceState.targetTemperature.zone[1].value : {}, actions.targetTemperature[0].min, actions.targetTemperature[0].max);
+                await mieleTools.createStateTargetTemperatureFridge(adapter, setup, path, currentDeviceState.targetTemperature[0].value_localized, actions.targetTemperature[0].min, actions.targetTemperature[0].max, currentDeviceState.targetTemperature[0].unit);
                 // Actions
                 await mieleTools.addLightSwitch(adapter, path, actions);
                 break;
@@ -617,8 +617,8 @@ async function addMieleDeviceState(path, currentDevice, currentDeviceState, setu
                 await mieleTools.createStateSmartGrid(adapter, setup, path, currentDeviceState.remoteEnable.smartGrid);
                 await mieleTools.createStateMobileStart(adapter, setup, path, currentDeviceState.remoteEnable.mobileStart);
                 await mieleTools.createStateTemperature(adapter, setup, path, currentDeviceState.temperature);
-                await mieleTools.createStateTargetTemperatureFridge(adapter, setup, path, currentDeviceState.targetTemperature.hasOwnProperty('zone')?  currentDeviceState.targetTemperature.zone[1].value : {}, actions.targetTemperature[0].min, actions.targetTemperature[0].max);
-                await mieleTools.createStateTargetTemperatureFreezer(adapter, setup, path, currentDeviceState.targetTemperature.hasOwnProperty('zone')?  currentDeviceState.targetTemperature.zone[2].value : {}, actions.targetTemperature[1].min, actions.targetTemperature[1].max);
+                await mieleTools.createStateTargetTemperatureFridge(adapter, setup, path, currentDeviceState.targetTemperature[0].value_localized, actions.targetTemperature[0].min, actions.targetTemperature[0].max, currentDeviceState.targetTemperature[0].unit);
+                await mieleTools.createStateTargetTemperatureFreezer(adapter, setup, path, currentDeviceState.targetTemperature[1].value_localized, actions.targetTemperature[1].min, actions.targetTemperature[1].max, currentDeviceState.targetTemperature[1].unit);
                 // Actions
                 await mieleTools.addSuperFreezingSwitch(adapter, setup, path, actions);
                 await mieleTools.addLightSwitch(adapter, path, actions);

diff --git a/miele-Tools.js b/miele-Tools.js
@@ -634,7 +634,7 @@ module.exports.createNumber = function(adapter, setup,  path, description, value
     adapter.log.debug('[createNumber]: Path['+ path +'] Value[' + value + '] Unit[' + unit + ']');
     // get back to calling function if there is no valid value given.
     return new Promise((resolve) => {
-        if ( !value || value === -32768 ) {
+        if ( !value || value === -32768) {
             adapter.log.debug('[createNumber]: invalid value detected. Skipping...');
         }
         if (setup){
@@ -1358,13 +1358,20 @@ module.exports.createStateTargetTemperature = function(adapter, setup, path, val
  * @param adapter {object} link to the adapter instance
  * @param setup {boolean} indicator whether the devices need to setup or only states are to be updated
  * @param path {string} path where the data point is going to be created
- * @param value {object} array value to set to the data point
+ * @param value {number} value to set to the data point
  * @param min {number} minimum temp of the freezer
  * @param max {number} maximum temp of the freezer
+ * @param unit {string} temperature unit
  */
-module.exports.createStateTargetTemperatureFridge = function(adapter, setup, path, value, min, max){
-    adapter.log.debug(`createStateTargetTemperatureFridge: Path[${path}], setup: [${setup}], min: [${min}], max: [${max}], value: [${JSON.stringify(value)}]`);
+module.exports.createStateTargetTemperatureFridge = function(adapter, setup, path, value, min, max, unit){
+    adapter.log.debug(`createStateTargetTemperatureFridge: Path[${path}], setup: [${setup}], min: [${min}], max: [${max}], value: [${value}]`);
     if (setup) {
+        switch (unit){
+            case 'Celsius' : unit = '°C';
+                break;
+            case 'Fahrenheit' : unit = '°F';
+                break;
+        }
         mieleTools.createExtendObject(adapter,
             path + '.ACTIONS.targetTemperatureFridge',
             {
@@ -1376,15 +1383,16 @@ module.exports.createStateTargetTemperatureFridge = function(adapter, setup, pat
                     type: 'number',
                     min: min,
                     max: max,
+                    unit : unit,
                     role: 'value.temperature'
                 },
                 native: {}
             }, () => {
-                adapter.setState(path + '.ACTIONS.targetTemperatureFridge', value.value, true);
+                adapter.setState(path + '.ACTIONS.targetTemperatureFridge', value, true);
                 adapter.subscribeStates(path + '.ACTIONS.targetTemperatureFridge');
             });
     } else {
-        adapter.setState(path + '.ACTIONS.targetTemperatureFridge', value.value, true);
+        adapter.setState(path + '.ACTIONS.targetTemperatureFridge', value, true);
     }
 }
 
@@ -1398,13 +1406,20 @@ module.exports.createStateTargetTemperatureFridge = function(adapter, setup, pat
  * @param adapter {object} link to the adapter instance
  * @param setup {boolean} indicator whether the devices need to setup or only states are to be updated
  * @param path {string} path where the data point is going to be created
- * @param value {object} array - value to set to the data point
+ * @param value {number} value to set to the data point
  * @param min {number} minimum temp of the freezer
  * @param max {number} maximum temp of the freezer
+ * @param unit {string} temperature unit
  */
-module.exports.createStateTargetTemperatureFreezer = function(adapter, setup, path, value, min, max){
-    adapter.log.debug(`createStateTargetTemperatureFreezer: Path[${path}], setup: [${setup}], min: [${min}], max: [${max}], value: [${ JSON.stringify(value)}]`);
+module.exports.createStateTargetTemperatureFreezer = function(adapter, setup, path, value, min, max, unit){
+    adapter.log.debug(`createStateTargetTemperatureFreezer: Path[${path}], setup: [${setup}], min: [${min}], max: [${max}], value: [${value}]`);
     if (setup) {
+        switch (unit){
+            case 'Celsius' : unit = '°C';
+                break;
+            case 'Fahrenheit' : unit = '°F';
+                break;
+        }
         mieleTools.createExtendObject(adapter,
             path + '.ACTIONS.targetTemperatureFreezer',
             {
@@ -1416,15 +1431,16 @@ module.exports.createStateTargetTemperatureFreezer = function(adapter, setup, pa
                     type: 'number',
                     min: min,
                     max: max,
+                    unit: unit,
                     role: 'value.temperature'
                 },
                 native: {}
             }, () => {
-                adapter.setState(path + '.ACTIONS.targetTemperatureFreezer', value.value, true);
+                adapter.setState(path + '.ACTIONS.targetTemperatureFreezer', value, true);
                 adapter.subscribeStates(path + '.ACTIONS.targetTemperatureFreezer');
             });
     } else {
-        adapter.setState(path + '.ACTIONS.targetTemperatureFreezer', value.value, true);
+        adapter.setState(path + '.ACTIONS.targetTemperatureFreezer', value, true);
     }
 }
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iobroker.mielecloudservice",
-  "version": "4.0.14",
+  "version": "4.0.15",
   "description": "Integrates your MieleCloudService (aka Miele@Home) Devices to ioBroker",
   "author": {
     "name": "grizzelbee",