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 +9 -12
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 663ce748e2 - Show all commits

2
controls_AutoShuttersControl.txt
View File

@ -1,5 +1,5 @@
UPD 2022-01-01_20:15:38 115601 FHEM/73_AutoShuttersControl.pm UPD 2022-01-01_20:15:38 115601 FHEM/73_AutoShuttersControl.pm
UPD 2022-01-02_08:24:03 75862 lib/FHEM/Automation/ShuttersControl.pm UPD 2022-01-02_08:30:53 75824 lib/FHEM/Automation/ShuttersControl.pm
UPD 2022-01-02_07:57:18 2691 lib/FHEM/Automation/ShuttersControl/Dev.pm UPD 2022-01-02_07:57:18 2691 lib/FHEM/Automation/ShuttersControl/Dev.pm
UPD 2022-01-02_07:57:18 2677 lib/FHEM/Automation/ShuttersControl/Roommate.pm UPD 2022-01-02_07:57:18 2677 lib/FHEM/Automation/ShuttersControl/Roommate.pm
UPD 2022-01-02_08:24:00 32016 lib/FHEM/Automation/ShuttersControl/Shutters.pm UPD 2022-01-02_08:24:00 32016 lib/FHEM/Automation/ShuttersControl/Shutters.pm

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

@ -402,15 +402,12 @@ sub Notify {
if ( if (
( (
grep { /^DEFINED.$name$/ }, grep { /^DEFINED.$name$/ }
@{$events} && $devname eq 'global' && $::init_done @{$events} && $devname eq 'global' && $::init_done
) )
|| ( || ( grep { /^INITIALIZED$/ } @{$events}
grep { /^INITIALIZED$/ }, or grep { /^REREADCFG$/ } @{$events}
@{$events} or grep { /^REREADCFG$/ }, or grep { /^MODIFIED.$name$/ } @{$events} )
@{$events} or grep { /^MODIFIED.$name$/ },
@{$events}
)
&& $devname eq 'global' && $devname eq 'global'
) )
{ {
@ -452,7 +449,7 @@ sub Notify {
my $posReading = $shutters->getPosCmd; my $posReading = $shutters->getPosCmd;
if ( $devname eq $name ) { if ( $devname eq $name ) {
if ( grep { /^userAttrList:.rolled.out$/ }, @{$events} ) { if ( grep { /^userAttrList:.rolled.out$/ } @{$events} ) {
if ( scalar( @{ $hash->{helper}{shuttersList} } ) > 0 ) { if ( scalar( @{ $hash->{helper}{shuttersList} } ) > 0 ) {
WriteReadingsShuttersList($hash); WriteReadingsShuttersList($hash);
UserAttributs_Readings_ForShutters( $hash, 'add' ); UserAttributs_Readings_ForShutters( $hash, 'add' );
@ -477,10 +474,10 @@ sub Notify {
::ReadingsVal( $name, 'controlShading', 'off' ) ne 'off' ); ::ReadingsVal( $name, 'controlShading', 'off' ) ne 'off' );
} }
} }
elsif ( grep { /^partyMode:.off$/ }, @{$events} ) { elsif ( grep { /^partyMode:.off$/ } @{$events} ) {
EventProcessingPartyMode($hash); EventProcessingPartyMode($hash);
} }
elsif ( grep { /^sunriseTimeWeHoliday:.(on|off)$/ }, @{$events} ) { elsif ( grep { /^sunriseTimeWeHoliday:.(on|off)$/ } @{$events} ) {
RenewSunRiseSetShuttersTimer($hash); RenewSunRiseSetShuttersTimer($hash);
} }
} }
@ -496,7 +493,7 @@ sub Notify {
EventProcessingGeneral( $hash, undef, join( ' ', @{$events} ) ); EventProcessingGeneral( $hash, undef, join( ' ', @{$events} ) );
} }
} }
elsif ( grep { /^($posReading):\s\d{1,3}(\.\d{1,3})?$/ }, @{$events} ) { elsif ( grep { /^($posReading):\s\d{1,3}(\.\d{1,3})?$/ } @{$events} ) {
ASC_Debug( 'Notify: ' ASC_Debug( 'Notify: '
. ' ASC_Pos_Reading Event vom Rollo ' . ' ASC_Pos_Reading Event vom Rollo '
. $devname . $devname