Skip to content

Commit

Permalink
2.1.0: bug fixes
Browse files Browse the repository at this point in the history
- blind-control
  - fix bug of handling not time constrained rules be first to last evaluated
  • Loading branch information
Hypnos3 committed Feb 9, 2022
1 parent 93b43cd commit ee40be0
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@ Install of a specific Version in Redmatic (on a Homematic):
- `npm install --save --no-package-lock --global-style --save-prefix="~" --production [email protected]`

This can be also used to go back to an older Version.
### 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
Expand Down
7 changes: 2 additions & 5 deletions nodes/blind-control.js
Original file line number Diff line number Diff line change
Expand Up @@ -548,12 +548,11 @@ module.exports = function (RED) {
// node.debug(`first loop count:${ node.rules.count } lastuntil:${ node.rules.lastUntil}`);
for (let i = 0; i <= node.rules.lastUntil; ++i) {
const rule = node.rules.data[i];
// node.debug(`rule ${rule.name} (${rule.pos}) enabled=${rule.enabled} operator=${rule.time.operator} noFrom=${rule.time.operator !== cRuleFrom} data=${util.inspect(rule, {colors:true, compact:10, breakLength: Infinity })}`);
if (!rule.enabled) { continue; }
if (rule.time && rule.time.operator === cRuleFrom) { continue; }
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 }) }`);
// node.debug(`1. ruleSel ${rule.name} (${rule.pos}) level.operator=${ res.level.operator }`);
if (res.level.operator === cRule.slatOversteer) {
ruleSlatOvs = res;
} else if (res.level.operator === cRule.topicOversteer) {
Expand All @@ -565,9 +564,7 @@ module.exports = function (RED) {
} else {
ruleSel = res;
ruleindex = i;
if (rule.time && rule.time.operator !== cRuleFrom) {
break;
}
break;
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "node-red-contrib-sun-position",
"version": "2.0.13",
"version": "2.1.0",
"description": "NodeRED nodes to get sun and moon position",
"keywords": [
"node-red",
Expand Down Expand Up @@ -113,7 +113,7 @@
"devDependencies": {
"eslint": ">=8.8.0",
"eslint-plugin-html": ">=6.2.0",
"eslint-plugin-jsdoc": ">=37.7.1",
"eslint-plugin-jsdoc": ">=37.8.2",
"eslint-plugin-json": ">=3.1.0",
"eslint-plugin-node": ">=11.1.0",
"node-red-dev": "^0.1.5"
Expand Down

0 comments on commit ee40be0

Please sign in to comment.