Merge pull request #412 from rdmtc/dev

2.1.1
rdmtc · Feb 15, 2022 · 18d39f4 · 18d39f4
2 parents d097c56 + 7bc3ccc
commit 18d39f4
Show file tree

Hide file tree

Showing 5 changed files with 5,896 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,10 +14,16 @@ Install of a specific Version in Redmatic (on a Homematic):
   - `npm install --save --no-package-lock --global-style --save-prefix="~" --production node-red-contrib-sun-position@2.0.0`
 
 This can be also used to go back to an older Version.
+### 2.1.1: bug fixes
+
+- clock-timer
+  - merged with blind-control
+
 ### 2.1.0: bug fixes
 
 - blind-control
   - fix bug of handling not time constrained rules be first to last evaluated
+
 ### 2.0.13: bug fixes
 
 - general

diff --git a/nodes/blind-control.js b/nodes/blind-control.js
@@ -240,7 +240,7 @@ module.exports = function (RED) {
         }
         let newPos = hlp.getMsgNumberValue(msg, ['blindPosition', 'position', 'level', 'blindLevel'], ['manual', 'levelOverwrite']);
         let nExpire = hlp.getMsgNumberValue(msg, 'expire', 'expire');
-        if (String(msg.topic).includes('noExpir')) { // hlp.getMsgTopicContains(msg, 'noExpir')) {
+        if (msg.topic && String(msg.topic).includes('noExpir')) { // hlp.getMsgTopicContains(msg, 'noExpir')) {
             nExpire = -1;
         }
         if (!isNaN(newPos)) {

diff --git a/nodes/clock-timer.js b/nodes/clock-timer.js
@@ -188,19 +188,12 @@ module.exports = function (RED) {
             if (!rule.enabled) { continue; }
             if (rule.time && rule.time.operator === cRuleFrom) { continue; }
             // const res = fktCheck(rule, r => (r >= nowNr));
-            let res = null;
-            if (!rule.time || rule.time.operator === cRuleFrom) {
-                res = ctrlLib.compareRules(node, msg, rule, r => (r <= oNow.nowNr), oNow);
-            } else {
-                res = ctrlLib.compareRules(node, msg, rule, r => (r >= oNow.nowNr), oNow);
-            }
+            const res = ctrlLib.compareRules(node, msg, rule, r => (r >= oNow.nowNr), oNow);
             if (res) {
                 // node.debug(`1. ruleSel ${rule.name} (${rule.pos}) data=${ util.inspect(res, { colors: true, compact: 10, breakLength: Infinity }) }`);
                 ruleSel = res;
                 ruleindex = i;
-                if (rule.time && rule.time.operator !== cRuleFrom) {
-                    break;
-                }
+                break;
             }
         }