FHEM/mod-AutoShuttersControl
1
0
Fork 0
Code Issues 12 Pull Requests Releases 9 Wiki Activity

Merge branch 'dev' of git.cooltux.net:FHEM/mod-AutoShuttersControl into dev

Browse Source
This commit is contained in:
Marko Oldenburg
2022-12-20 13:56:59 +01:00
parent 587d4e4316 6f137256e0
commit f216e1b308
2 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
controls_AutoShuttersControl.txt
View File

@@ -1,5 +1,5 @@
UPD 2022-08-29_13:31:39 116288 FHEM/73_AutoShuttersControl.pm UPD 2022-12-15_09:41:38 116288 FHEM/73_AutoShuttersControl.pm
UPD 2022-08-30_18:07:51 76465 lib/FHEM/Automation/ShuttersControl.pm UPD 2022-12-15_09:55:10 76615 lib/FHEM/Automation/ShuttersControl.pm
UPD 2022-01-14_08:49:13 2691 lib/FHEM/Automation/ShuttersControl/Dev.pm UPD 2022-01-14_08:49:13 2691 lib/FHEM/Automation/ShuttersControl/Dev.pm
UPD 2022-01-14_08:49:13 2677 lib/FHEM/Automation/ShuttersControl/Roommate.pm UPD 2022-01-14_08:49:13 2677 lib/FHEM/Automation/ShuttersControl/Roommate.pm
UPD 2022-03-05_09:12:41 32016 lib/FHEM/Automation/ShuttersControl/Shutters.pm UPD 2022-03-05_09:12:41 32016 lib/FHEM/Automation/ShuttersControl/Shutters.pm

10
lib/FHEM/Automation/ShuttersControl.pm
View File

@@ -1447,10 +1447,14 @@ sub SunRiseShuttersAfterTimerFn {
|| $shutters->getSelfDefenseMode eq 'off' || $shutters->getSelfDefenseMode eq 'off'
|| ( || (
$ascDev->getSelfDefense eq 'on' $ascDev->getSelfDefense eq 'on'
&& ( $shutters->getSelfDefenseMode eq 'gone' && (
|| $shutters->getSelfDefenseMode eq 'absent' ) (
$shutters->getSelfDefenseMode eq 'gone'
&& $ascDev->getResidentsStatus ne 'gone' && $ascDev->getResidentsStatus ne 'gone'
&& $ascDev->getResidentsStatus ne 'absent' )
|| ( $shutters->getSelfDefenseMode eq 'absent'
&& $ascDev->getResidentsStatus ne 'absent' )
)
) )
) )
&& ( && (