Merge pull request #427 from simatec/dev

simatec · web-flow · commit 4452d1adbf36 · 2022-05-24T12:20:42.000+02:00
(simatec) Beta 1.4.13
diff --git a/README.md b/README.md
@@ -48,6 +48,12 @@ When the adapter crashes or an other Code error happens, this error message that
 
 ## Changelog
 <!-- ### __WORK IN PROGRESS__ -->
+### __WORK IN PROGRESS__
+* (FoxRo) Bugfix Alarm handling
+* (simatec) Dependencies updated
+* (simatec) Dev-Dependencies updated
+* (simatec) more debuglog for Trigger
+
 ### 1.4.12 (2022-04-11)
 * (FoxRo) Bugfix wrongly open after deactivation of weater alarm
 * (simatec) Dependencies updated
diff --git a/lib/shutterState.js b/lib/shutterState.js
@@ -37,7 +37,9 @@ async function shutterState(shutterID, adapter, shutterSettings) {
 
                         if (shutterSettings[s].triggerAction == 'Manu_Mode') {
                             shutterSettings[s].triggerHeight = shutterSettings[s].currentHeight;
-                            adapter.log.debug(`Shutter ${shutterSettings[s].shutterName} was moved manually to: ${shutterSettings[s].currentHeight}% while window was open - prevent trigger from driving back`);
+                            shutterSettings[s].alarmTriggerAction = 'Manu_Mode';
+                            shutterSettings[s].alarmTriggerLevel = _shutterState.val;
+                            adapter.log.debug(`Shutter ${shutterSettings[s].shutterName} was moved manually to: ${shutterSettings[s].currentHeight}% - prevent trigger from driving back`);
                         }
                     }
                 }
diff --git a/lib/triggerChange.js b/lib/triggerChange.js
@@ -77,6 +77,9 @@ async function triggerChange(resTriggerChange, adapter, shutterSettings) {
                                         shutterSettings[s].currentHeight = setTriggerHeight;
                                         shutterSettings[s].currentAction = 'triggered';
 
+                                        adapter.log.debug('#1 current height: ' + shutterSettings[s].currentHeight + '% for device ' + shutterSettings[s].shutterName);
+                                        adapter.log.debug('#1 current action: ' + shutterSettings[s].currentAction + ' for device ' + shutterSettings[s].shutterName);
+
                                         await setShutterState(adapter, shutterSettings, shutterSettings[s], setTriggerHeight, nameDevice, 'triggered #1')
                                             .catch((e) => adapter.log.warn(`#triggerChange 1: ${e}`));
 
diff --git a/main.js b/main.js
@@ -225,6 +225,7 @@ function startAdapter(options) {
                     if (adapter.config.currentShutterState == true && adapter.config.currentShutterStateTime) {
                         waitTime4StateCheck = (adapter.config.currentShutterStateTime ? adapter.config.currentShutterStateTime * 1000 : 60000);
                     }
+
                     await sleep(waitTime4StateCheck);
 
                     for (const i in result) {
@@ -238,7 +239,6 @@ function startAdapter(options) {
                                 }
                                 if (typeof _shutterState != undefined && _shutterState != null && _shutterState.val != shutterSettings[s].currentHeight && _shutterState.val != shutterSettings[s].oldHeight && adapter.config.currentShutterState == true) {
 
-                                    //await sleep(waitTime4StateCheck);
                                     shutterSettings[s].currentAction = 'Manu_Mode';
                                     shutterSettings[s].triggerAction = 'Manu_Mode';
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,9 @@ async function shutterState(shutterID, adapter, shutterSettings) {`
`37`	`37`
`38`	`38`	`if (shutterSettings[s].triggerAction == 'Manu_Mode') {`
`39`	`39`	`shutterSettings[s].triggerHeight = shutterSettings[s].currentHeight;`
`40`		- adapter.log.debug(`Shutter ${shutterSettings[s].shutterName} was moved manually to: ${shutterSettings[s].currentHeight}% while window was open - prevent trigger from driving back`);
	`40`	`+ shutterSettings[s].alarmTriggerAction = 'Manu_Mode';`
	`41`	`+ shutterSettings[s].alarmTriggerLevel = _shutterState.val;`
	`42`	+ adapter.log.debug(`Shutter ${shutterSettings[s].shutterName} was moved manually to: ${shutterSettings[s].currentHeight}% - prevent trigger from driving back`);
`41`	`43`	`}`
`42`	`44`	`}`
`43`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -225,6 +225,7 @@ function startAdapter(options) {`
`225`	`225`	`if (adapter.config.currentShutterState == true && adapter.config.currentShutterStateTime) {`
`226`	`226`	`waitTime4StateCheck = (adapter.config.currentShutterStateTime ? adapter.config.currentShutterStateTime * 1000 : 60000);`
`227`	`227`	`}`
	`228`	`+`
`228`	`229`	`await sleep(waitTime4StateCheck);`
`229`	`230`
`230`	`231`	`for (const i in result) {`
`@@ -238,7 +239,6 @@ function startAdapter(options) {`
`238`	`239`	`}`
`239`	`240`	`if (typeof _shutterState != undefined && _shutterState != null && _shutterState.val != shutterSettings[s].currentHeight && _shutterState.val != shutterSettings[s].oldHeight && adapter.config.currentShutterState == true) {`
`240`	`241`
`241`		`- //await sleep(waitTime4StateCheck);`
`242`	`242`	`shutterSettings[s].currentAction = 'Manu_Mode';`
`243`	`243`	`shutterSettings[s].triggerAction = 'Manu_Mode';`
`244`	`244`