diff --git a/fhem/CHANGED b/fhem/CHANGED index e786f2787..87f5cbe31 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,7 @@ # Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Do not insert empty lines here, update check depends on it. + - bugfix: 73_AutoShuttersControl: fix shutters drive after partyMode off and + shutter have partyMode off attribut - feature: 93_DbRep: FHEM command "dbReadingsVal" implemented - change: 49_SSCam: Meta.json and minor code change - change: 50_MOBILEALERTSGW: Checksum check added diff --git a/fhem/FHEM/73_AutoShuttersControl.pm b/fhem/FHEM/73_AutoShuttersControl.pm index 74846f098..d369d2a91 100644 --- a/fhem/FHEM/73_AutoShuttersControl.pm +++ b/fhem/FHEM/73_AutoShuttersControl.pm @@ -44,7 +44,7 @@ use strict; use warnings; use FHEM::Meta; -my $version = '0.6.0'; +my $version = '0.6.1'; sub AutoShuttersControl_Initialize($) { my ($hash) = @_; @@ -693,6 +693,18 @@ sub WriteReadingsShuttersList($) { 'none' ) eq 'none' ); + + ### associatedWith damit man sieht das der Rollladen mit einem ASC Device verbunden ist + readingsSingleUpdate( + $defs{$_}, + 'associatedWith', + ( + ReadingsVal( $_, 'associatedWith', $name ) eq $name + ? $name + : ReadingsVal( $_, 'associatedWith', 'none' ) . ',' . $name + ), + 0 + ); } readingsBulkUpdate( $hash, 'state', 'active' ); readingsEndUpdate( $hash, 0 ); @@ -1281,9 +1293,22 @@ sub EventProcessingBrightness($@) { ) or ( ( - int( gettimeofday() / 86400 ) != int( - computeAlignTime( '24:00', $shutters->getTimeUpEarly ) / - 86400 + ( + ( + int( gettimeofday() / 86400 ) != int( + computeAlignTime( '24:00', + $shutters->getTimeUpEarly ) / 86400 + ) + and not IsWe() + ) + or ( + int( gettimeofday() / 86400 ) != int( + computeAlignTime( '24:00', + $shutters->getTimeUpWeHoliday ) / 86400 + ) + and IsWe() + and $ascDev->getSunriseTimeWeHoliday eq 'on' + ) ) and int( gettimeofday() / 86400 ) == int( computeAlignTime( '24:00', $shutters->getTimeUpLate ) / @@ -1859,6 +1884,9 @@ sub EventProcessingPartyMode($) { foreach my $shuttersDev ( @{ $hash->{helper}{shuttersList} } ) { $shutters->setShuttersDev($shuttersDev); + next + if ( $shutters->getPartyMode eq 'off' ); + if ( not IsDay($shuttersDev) and $shutters->getModeDown ne 'off' and IsAfterShuttersManualBlocking($shuttersDev) ) @@ -4325,7 +4353,7 @@ sub getPartyMode { my $self = shift; my $name = $self->{name}; - return ReadingsVal( $name, 'partyMode', 'none' ); + return ReadingsVal( $name, 'partyMode', 'off' ); } sub getHardLockOut { @@ -5083,7 +5111,8 @@ sub getblockAscDrivesAfterManual {