node-red-contrib-sun-position
Advanced tools
Comparing version 1.2.0-beta to 1.2.0-beta2
@@ -9,3 +9,2 @@ --- | ||
* [RedMatic Slack (chat like WhatsApp or Facebook Messenger)](https://join.slack.com/t/homematicuser/shared_invite/enQtNDgyNDM2OTkyMDA2LWY1YjY0NTE0NmY0OWM3YWUzMzAzMTgxYmRjMTMyOWE3NjkxNDdlMDY5ZjlhYzM5Nzg2N2U2YjdmNzNlYWNhNTU) | ||
* [RedMatic Forum](https://homematic-forum.de/forum/viewforum.php?f=77) | ||
@@ -12,0 +11,0 @@ * [RedMatic Wiki](https://github.com/rdmtc/RedMatic/wiki) |
@@ -25,2 +25,3 @@ # node-red-contrib-sun-position | ||
- added examples | ||
- minor bug fixes (#196, ) | ||
@@ -31,2 +32,6 @@ - blind-control + clock-time | ||
- blind-control only | ||
- for Blind control the current used mode as operator (#197) | ||
- add a `msg.resetOnSameValue` parameter to reset existing overwrite if `msg.payload` equals to position (`node.previousData.level`) (#223) | ||
- time inject | ||
@@ -41,3 +46,3 @@ - fixed bug, that interval between times does not start when load node and time in in the interval #189 | ||
- time-span | ||
- [ ] TODO: redesign of the output similar as time-comp | ||
- redesign of the output similar as time-comp | ||
@@ -44,0 +49,0 @@ - within-time-switch |
@@ -269,5 +269,10 @@ /******************************************** | ||
const noSameValue = hlp.getMsgBoolValue(msg, 'ignoreSameValue'); | ||
const resetOnSameValue = hlp.getMsgBoolValue(msg, 'resetOnSameValue'); | ||
if (noSameValue && (node.previousData.level === newPos)) { | ||
node.debug(`overwrite exit true noSameValue=${noSameValue}, newPos=${newPos}`); | ||
node.debug(`overwrite exit true ignoreSameValue=${noSameValue}, newPos=${newPos}`); | ||
return ctrlLib.setOverwriteReason(node); | ||
} if (resetOnSameValue && (node.previousData.level === newPos)) { | ||
node.debug(`resetOnSameValue active, reset overwrite and exit newPos=${newPos}`); | ||
ctrlLib.posOverwriteReset(node); | ||
return ctrlLib.setOverwriteReason(node); | ||
} | ||
@@ -274,0 +279,0 @@ node.level.current = newPos; |
@@ -210,21 +210,25 @@ /******************************************** | ||
delete el.thresholdValue; | ||
el.result = node.positionConfig.comparePropValue(node, msg, | ||
{ | ||
value: el.operand.value, | ||
type: el.operand.type, | ||
callback: (result, _obj) => { // opCallback | ||
el.operandValue = _obj.value; | ||
return evalTempData(node, _obj.type, _obj.value, result, tempData); | ||
if (el.operand.type === 'sunControlMode') { | ||
el.result = (node.sunData && (node.sunData.mode === el.operand.value)); | ||
} else { | ||
el.result = node.positionConfig.comparePropValue(node, msg, | ||
{ | ||
value: el.operand.value, | ||
type: el.operand.type, | ||
callback: (result, _obj) => { // opCallback | ||
el.operandValue = _obj.value; | ||
return evalTempData(node, _obj.type, _obj.value, result, tempData); | ||
} | ||
}, | ||
el.operator.value, | ||
{ | ||
value: el.threshold.value, | ||
type: el.threshold.type, | ||
callback: (result, _obj) => { // opCallback | ||
el.thresholdValue = _obj.value; | ||
return evalTempData(node, _obj.type, _obj.value, result, tempData); | ||
} | ||
} | ||
}, | ||
el.operator.value, | ||
{ | ||
value: el.threshold.value, | ||
type: el.threshold.type, | ||
callback: (result, _obj) => { // opCallback | ||
el.thresholdValue = _obj.value; | ||
return evalTempData(node, _obj.type, _obj.value, result, tempData); | ||
} | ||
} | ||
); | ||
); | ||
} | ||
rule.conditon = { | ||
@@ -558,2 +562,11 @@ index : i, | ||
}; | ||
if (operandAType === 'sunControlMode') { | ||
if (operandAValue === 'off' || operandAValue.charAt(0) === '0') { | ||
el.operand.value = 0; | ||
} else if (operandAValue === 'maximize' || operandAValue.charAt(0) === '1') { | ||
el.operand.value = 1; | ||
} else { | ||
el.operand.value = 2; | ||
} | ||
} | ||
if (el.operandName.length > 25) { | ||
@@ -560,0 +573,0 @@ el.operandNameShort = getNameShort(operandAType, operandAValue); |
@@ -48,4 +48,4 @@ { | ||
"sunControlOff": "keine Beschränkung, Sonnenstands unabhängig", | ||
"sunControlRestrict": "Sonnenlicht beschränken (Sommer)", | ||
"sunControlMaximize": "Sonnenlicht maximieren (Winter)", | ||
"sunControlRestrict": "Sonnenlicht beschränken (🌞 Sommer)", | ||
"sunControlMaximize": "Sonnenlicht maximieren (⛄ Winter)", | ||
"sunFloorLength": "Länge auf dem Boden", | ||
@@ -52,0 +52,0 @@ "sunMinAltitude": "Minimale Sonnenhöhenwinkel", |
@@ -50,3 +50,7 @@ { | ||
"DayOfYear":"Tag des Jahres (Zahl)", | ||
"isDayOfYearEven":"gerader Tag des Jahres (true/false)" | ||
"isDayOfYearEven":"gerader Tag des Jahres (true/false)", | ||
"sunControlMode": "Aktueller Modus Sonnensteuerung", | ||
"sunControlOff": "aus", | ||
"sunControlRestrict": "Sonnenlicht beschränken (🌞 Sommer)", | ||
"sunControlMaximize": "Sonnenlicht maximieren (⛄ Winter)" | ||
}, | ||
@@ -53,0 +57,0 @@ "typeOptions": { |
@@ -61,3 +61,7 @@ { | ||
"DayOfYear":"day number", | ||
"isDayOfYearEven":"is day even (true/false)" | ||
"isDayOfYearEven":"is day even (true/false)", | ||
"sunControlMode": "current sun control mode", | ||
"sunControlOff": "off", | ||
"sunControlRestrict": "restrict sunlight (🌞 Summer)", | ||
"sunControlMaximize": "maximize sunlight (⛄ Winter)" | ||
}, | ||
@@ -64,0 +68,0 @@ "typeOptions": { |
{ | ||
"name": "node-red-contrib-sun-position", | ||
"version": "1.2.0-beta", | ||
"version": "1.2.0-beta2", | ||
"description": "NodeRED nodes to get sun and moon position", | ||
@@ -5,0 +5,0 @@ "keywords": [ |
@@ -88,3 +88,3 @@ # node-red-contrib-sun-position for NodeRED | ||
For bugs, questions and feature requests please use the | ||
[GitHub Issues](https://github.com/rdmtc/node-red-contrib-sun-position/issues), the [Homematic forum](https://homematic-forum.de/forum/viewforum.php?f=77) or the [RedMatic Slack](https://join.slack.com/t/homematicuser/shared_invite/enQtNDgyNDM2OTkyMDA2LWY1YjY0NTE0NmY0OWM3YWUzMzAzMTgxYmRjMTMyOWE3NjkxNDdlMDY5ZjlhYzM5Nzg2N2U2YjdmNzNlYWNhNTU). | ||
[GitHub Issues](https://github.com/rdmtc/node-red-contrib-sun-position/issues), or the [Homematic forum](https://homematic-forum.de/forum/viewforum.php?f=77). | ||
@@ -110,3 +110,2 @@ :moneybag: Donations [![Donate](https://img.shields.io/badge/donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=4PCF5YW5ASHBN) | ||
- [newreleases.io](https://newreleases.io/npm/node-red-contrib-sun-position) | ||
- [RedMatic Slack (chat like WhatsApp or Facebook Messenger)](https://join.slack.com/t/homematicuser/shared_invite/enQtNDgyNDM2OTkyMDA2LWY1YjY0NTE0NmY0OWM3YWUzMzAzMTgxYmRjMTMyOWE3NjkxNDdlMDY5ZjlhYzM5Nzg2N2U2YjdmNzNlYWNhNTU) | ||
- [RedMatic Forum](https://homematic-forum.de/forum/viewforum.php?f=77) | ||
@@ -113,0 +112,0 @@ - [RedMatic Wiki](https://github.com/rdmtc/RedMatic/wiki) |
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
1733830
126
14596
116