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

testing #94

Merged
marko merged 54 commits from testing into main 2022-01-14 07:48:29 +00:00
Conversation 0 Commits 54 Files Changed 17 +5 -6
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 004a15ea42 - Show all commits

2
controls_AutoShuttersControl.txt
View File

@ -5,7 +5,7 @@ UPD 2022-01-01_08:47:26 2405 lib/FHEM/Automation/ShuttersControl/Roommate.pm
UPD 2022-01-01_08:47:58 32020 lib/FHEM/Automation/ShuttersControl/Shutters.pm UPD 2022-01-01_08:47:58 32020 lib/FHEM/Automation/ShuttersControl/Shutters.pm
UPD 2022-01-01_08:42:08 25426 lib/FHEM/Automation/ShuttersControl/Shading.pm UPD 2022-01-01_08:42:08 25426 lib/FHEM/Automation/ShuttersControl/Shading.pm
UPD 2022-01-01_08:33:11 112138 lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm UPD 2022-01-01_08:33:11 112138 lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm
UPD 2022-01-01_08:37:31 40342 lib/FHEM/Automation/ShuttersControl/Helper.pm UPD 2022-01-01_09:03:33 40306 lib/FHEM/Automation/ShuttersControl/Helper.pm
UPD 2022-01-01_08:49:33 2211 lib/FHEM/Automation/ShuttersControl/Window.pm UPD 2022-01-01_08:49:33 2211 lib/FHEM/Automation/ShuttersControl/Window.pm
UPD 2022-01-01_08:29:01 11716 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm UPD 2022-01-01_08:29:01 11716 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm
UPD 2022-01-01_08:28:05 7265 lib/FHEM/Automation/ShuttersControl/Dev/Readings.pm UPD 2022-01-01_08:28:05 7265 lib/FHEM/Automation/ShuttersControl/Dev/Readings.pm

9
lib/FHEM/Automation/ShuttersControl/Helper.pm
View File

@ -685,17 +685,16 @@ sub ShuttersSunrise {
$shuttersSunriseUnixtime = $shuttersSunriseUnixtime =
( $shuttersSunriseUnixtime + 86400 ) ( $shuttersSunriseUnixtime + 86400 )
if ( $shuttersSunriseUnixtime < if ( $shuttersSunriseUnixtime <
( $oldFuncHash->{::sunrisetime} + 180 ) ( $oldFuncHash->{sunrisetime} + 180 )
&& $oldFuncHash->{::sunrisetime} < && $oldFuncHash->{sunrisetime} < ::gettimeofday() );
::gettimeofday() );
} }
} }
} }
elsif ( defined($oldFuncHash) && ref($oldFuncHash) eq 'HASH' ) { elsif ( defined($oldFuncHash) && ref($oldFuncHash) eq 'HASH' ) {
$shuttersSunriseUnixtime = ( $shuttersSunriseUnixtime + 86400 ) $shuttersSunriseUnixtime = ( $shuttersSunriseUnixtime + 86400 )
if ( $shuttersSunriseUnixtime < if ( $shuttersSunriseUnixtime <
( $oldFuncHash->{::sunrisetime} + 180 ) ( $oldFuncHash->{sunrisetime} + 180 )
&& $oldFuncHash->{::sunrisetime} < ::gettimeofday() ); && $oldFuncHash->{sunrisetime} < ::gettimeofday() );
} }
} }
elsif ( $FHEM::Automation::ShuttersControl::shutters->getUp eq 'time' ) elsif ( $FHEM::Automation::ShuttersControl::shutters->getUp eq 'time' )