fix IsDay Fn for weekend condition

This commit is contained in:
Marko Oldenburg 2020-10-12 07:44:54 +02:00
parent 2c6f8bacab
commit b71a74b52e
2 changed files with 11 additions and 3 deletions

View File

@ -3,9 +3,9 @@ UPD 2020-10-05_13:30:47 74159 lib/FHEM/Automation/ShuttersControl.pm
UPD 2020-06-22_09:41:40 2657 lib/FHEM/Automation/ShuttersControl/Dev.pm
UPD 2020-07-26_17:36:29 2496 lib/FHEM/Automation/ShuttersControl/Roommate.pm
UPD 2020-08-12_11:00:05 31376 lib/FHEM/Automation/ShuttersControl/Shutters.pm
UPD 2020-10-05_13:39:37 25490 lib/FHEM/Automation/ShuttersControl/Shading.pm
UPD 2020-10-05_13:53:53 25490 lib/FHEM/Automation/ShuttersControl/Shading.pm
UPD 2020-10-05_13:44:21 109905 lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm
UPD 2020-10-05_13:52:22 45518 lib/FHEM/Automation/ShuttersControl/Helper.pm
UPD 2020-10-12_07:43:59 45903 lib/FHEM/Automation/ShuttersControl/Helper.pm
UPD 2020-06-22_09:41:40 2175 lib/FHEM/Automation/ShuttersControl/Window.pm
UPD 2020-07-26_17:36:29 11569 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm
UPD 2020-07-03_11:29:10 7251 lib/FHEM/Automation/ShuttersControl/Dev/Readings.pm

View File

@ -284,7 +284,15 @@ sub _IsDay {
$FHEM::Automation::ShuttersControl::shutters
->getTimeUpEarly ) / 86400
)
&& !IsWe()
&& ( !IsWe()
|| ( IsWe()
&& ( $FHEM::Automation::ShuttersControl::ascDev
->getSunriseTimeWeHoliday eq 'off'
|| $FHEM::Automation::ShuttersControl::shutters
->getTimeUpWeHoliday eq '01:25'
)
)
)
)
|| (
int( gettimeofday() / 86400 ) != int(