* (Apollon77) Respect min/max when calculating the value for byOn wit…

…h % values
ioBroker · Mar 8, 2022 · 3fd8cc5 · 3fd8cc5
1 parent 6203da2
commit 3fd8cc5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -268,6 +268,10 @@ Following types are supported:
 -->
 
 ## Changelog
+
+### __WORK IN PROGRESS__
+* (Apollon77) Respect min/max when calculating the value for byOn with % values
+
 ### 1.9.7 (2022-02-20)
 * (Apollon77) Fix crash case reported by Sentry (IOBROKER-IOT-3C)
 

diff --git a/lib/alexaSmartHomeV2.js b/lib/alexaSmartHomeV2.js
@@ -477,11 +477,10 @@ function AlexaSH2(adapter) {
                         adapter.log.debug(`[ALEXA] Use stored ON value for "${id}": ${valuesON[id]}`);
                         value = valuesON[id];
                     } else {
-                        if (typeof obj.common.max !== 'undefined') {
-                            value = byON ? parseFloat(byON) || obj.common.max : obj.common.max;
-                        } else {
-                            value = byON ? parseFloat(byON) || 100 : 100;
-                        }
+                        const min = typeof obj.common.min !== 'undefined' ? obj.common.min : 0;
+                        const max = typeof obj.common.max !== 'undefined' ? obj.common.max : 100;
+
+                        value = byON ? Math.round(((parseFloat(byON) || 100) * (max - min) / 100) + min) : max;
                     }
                 } else {
                     // if OFF
@@ -498,6 +497,8 @@ function AlexaSH2(adapter) {
                             // do not remember the minimum/off value
                             if (state && state.val !== value) valuesON[id] = state.val;
 
+                            adapter.log.debug(`[ALEXA] OFF Stored: Set "${id}" to ${value} and store old value "${id}"`);
+
                             adapter.setForeignState(id, value, err => {
                                 err && adapter.log.error(`[ALEXA] Cannot switch device: ${err}`);
                                 callback && callback(err);
@@ -520,7 +521,7 @@ function AlexaSH2(adapter) {
                     value = '#000000';
                 }
             }
-            adapter.log.debug('[ALEXA] Set "' + id + '" to ' + value);
+            adapter.log.debug(`[ALEXA] Set "${id}" to ${value}`);
 
             if (writeStates) {
                 adapter.setState('smart.lastObjectID', id,    true);

diff --git a/lib/googleHome.js b/lib/googleHome.js
@@ -2310,7 +2310,7 @@ class GoogleHome {
                             errorMessage = error.message;
                         }
 
-                        this.adapter.log.error(`[GHOME] Cannot updateState: ${errorMessage}`);
+                        this.adapter.log.error(`[GHOME] Cannot updateState: ${JSON.stringify(errorMessage)}`);
                         this.adapter.log.debug(`[GHOME] ${JSON.stringify(json)}`);
                     }
                 });