remove all unless conditions
This commit is contained in:
parent
109a67e388
commit
4a5b4d9ac1
|
|
@ -1,12 +1,12 @@
|
|||
UPD 2020-06-29_08:37:58 97824 FHEM/73_AutoShuttersControl.pm
|
||||
UPD 2020-06-29_08:37:18 187109 lib/FHEM/Automation/ShuttersControl.pm
|
||||
UPD 2020-06-29_09:05:05 97824 FHEM/73_AutoShuttersControl.pm
|
||||
UPD 2020-06-29_09:58:24 187022 lib/FHEM/Automation/ShuttersControl.pm
|
||||
UPD 2020-06-22_09:41:40 2657 lib/FHEM/Automation/ShuttersControl/Dev.pm
|
||||
UPD 2020-06-22_09:41:40 2493 lib/FHEM/Automation/ShuttersControl/Roommate.pm
|
||||
UPD 2020-06-29_08:36:08 30157 lib/FHEM/Automation/ShuttersControl/Shutters.pm
|
||||
UPD 2020-06-29_09:05:05 30157 lib/FHEM/Automation/ShuttersControl/Shutters.pm
|
||||
UPD 2020-06-22_09:41:40 2175 lib/FHEM/Automation/ShuttersControl/Window.pm
|
||||
UPD 2020-06-22_09:41:40 11454 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm
|
||||
UPD 2020-06-22_09:41:40 7251 lib/FHEM/Automation/ShuttersControl/Dev/Readings.pm
|
||||
UPD 2020-06-29_08:36:04 52344 lib/FHEM/Automation/ShuttersControl/Shutters/Attr.pm
|
||||
UPD 2020-06-29_09:05:05 52344 lib/FHEM/Automation/ShuttersControl/Shutters/Attr.pm
|
||||
UPD 2020-06-22_09:41:40 2903 lib/FHEM/Automation/ShuttersControl/Shutters/Readings.pm
|
||||
UPD 2020-06-22_09:41:40 3972 lib/FHEM/Automation/ShuttersControl/Window/Attr.pm
|
||||
UPD 2020-06-22_09:41:40 2288 lib/FHEM/Automation/ShuttersControl/Window/Readings.pm
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ if ($@) {
|
|||
# JSON preference order
|
||||
local $ENV{PERL_JSON_BACKEND} =
|
||||
'Cpanel::JSON::XS,JSON::XS,JSON::PP,JSON::backportPP'
|
||||
unless ( defined( $ENV{PERL_JSON_BACKEND} ) );
|
||||
if ( !defined( $ENV{PERL_JSON_BACKEND} ) );
|
||||
|
||||
require JSON;
|
||||
import JSON qw( decode_json encode_json );
|
||||
|
|
@ -331,7 +331,7 @@ sub Define {
|
|||
my $hash = shift // return;
|
||||
my $aArg = shift // return;
|
||||
|
||||
return $@ unless ( FHEM::Meta::SetInternals($hash) );
|
||||
return $@ if ( !FHEM::Meta::SetInternals($hash) );
|
||||
use version 0.60; our $VERSION = FHEM::Meta::Get( $hash, 'version' );
|
||||
|
||||
return 'only one AutoShuttersControl instance allowed'
|
||||
|
|
@ -434,32 +434,32 @@ sub Notify {
|
|||
if ( $ascDev->getASCenable eq 'none' );
|
||||
CommandAttr( undef,
|
||||
$name . ' devStateIcon { ShuttersControl_DevStateIcon($name) }' )
|
||||
unless (
|
||||
if (
|
||||
AttrVal(
|
||||
$name, 'devStateIcon',
|
||||
'{ ShuttersControl_DevStateIcon($name) }'
|
||||
) eq '{ ShuttersControl_DevStateIcon($name) }'
|
||||
) ne '{ ShuttersControl_DevStateIcon($name) }'
|
||||
);
|
||||
CommandDeleteAttr( undef, $name . ' event-on-change-reading' )
|
||||
unless (
|
||||
AttrVal( $name, 'event-on-change-reading', 'none' ) eq 'none' );
|
||||
if (
|
||||
AttrVal( $name, 'event-on-change-reading', 'none' ) ne 'none' );
|
||||
CommandDeleteAttr( undef, $name . ' event-on-update-reading' )
|
||||
unless (
|
||||
AttrVal( $name, 'event-on-update-reading', 'none' ) eq 'none' );
|
||||
if (
|
||||
AttrVal( $name, 'event-on-update-reading', 'none' ) ne 'none' );
|
||||
|
||||
# Ist der Event ein globaler und passt zum Rest der Abfrage oben wird nach neuen Rolläden Devices gescannt und eine Liste im Rolladenmodul sortiert nach Raum generiert
|
||||
ShuttersDeviceScan($hash)
|
||||
unless ( ReadingsVal( $name, 'userAttrList', 'none' ) eq 'none' );
|
||||
if ( ReadingsVal( $name, 'userAttrList', 'none' ) ne 'none' );
|
||||
}
|
||||
return
|
||||
unless ( ref( $hash->{helper}{shuttersList} ) eq 'ARRAY'
|
||||
&& scalar( @{ $hash->{helper}{shuttersList} } ) > 0 );
|
||||
if ( ref( $hash->{helper}{shuttersList} ) ne 'ARRAY'
|
||||
&& scalar( @{ $hash->{helper}{shuttersList} } ) == 0 );
|
||||
|
||||
my $posReading = $shutters->getPosCmd;
|
||||
|
||||
if ( $devname eq $name ) {
|
||||
if ( grep m{^userAttrList:.rolled.out$}xms, @{$events} ) {
|
||||
unless ( scalar( @{ $hash->{helper}{shuttersList} } ) == 0 ) {
|
||||
if ( scalar( @{ $hash->{helper}{shuttersList} } ) > 0 ) {
|
||||
WriteReadingsShuttersList($hash);
|
||||
UserAttributs_Readings_ForShutters( $hash, 'add' );
|
||||
InternalTimer(
|
||||
|
|
@ -771,7 +771,7 @@ sub ShuttersDeviceScan {
|
|||
|
||||
CommandDeleteReading( undef, $name . ' .*_nextAstroTimeEvent' );
|
||||
|
||||
unless ( scalar(@list) > 0 ) {
|
||||
if ( scalar(@list) == 0 ) {
|
||||
readingsBeginUpdate($hash);
|
||||
readingsBulkUpdate( $hash, 'userAttrList', 'none' );
|
||||
readingsBulkUpdate( $hash, 'state', 'no shutters found' );
|
||||
|
|
@ -1902,16 +1902,16 @@ sub EventProcessingBrightness {
|
|||
);
|
||||
|
||||
return EventProcessingShadingBrightness( $hash, $shuttersDev, $events )
|
||||
unless (
|
||||
if (
|
||||
(
|
||||
$shutters->getDown eq 'brightness'
|
||||
|| $shutters->getUp eq 'brightness'
|
||||
$shutters->getDown ne 'brightness'
|
||||
&& $shutters->getUp ne 'brightness'
|
||||
)
|
||||
|| (
|
||||
(
|
||||
(
|
||||
(
|
||||
int( gettimeofday() / 86400 ) != int(
|
||||
int( gettimeofday() / 86400 ) == int(
|
||||
computeAlignTime( '24:00',
|
||||
$shutters->getTimeUpEarly ) / 86400
|
||||
)
|
||||
|
|
@ -1922,26 +1922,26 @@ sub EventProcessingBrightness {
|
|||
)
|
||||
)
|
||||
|| (
|
||||
int( gettimeofday() / 86400 ) != int(
|
||||
int( gettimeofday() / 86400 ) == int(
|
||||
computeAlignTime( '24:00',
|
||||
$shutters->getTimeUpWeHoliday ) / 86400
|
||||
)
|
||||
&& IsWe()
|
||||
&& $ascDev->getSunriseTimeWeHoliday eq 'on'
|
||||
&& $shutters->getTimeUpWeHoliday eq '01:25'
|
||||
&& $shutters->getTimeUpWeHoliday ne '01:25'
|
||||
)
|
||||
)
|
||||
&& int( gettimeofday() / 86400 ) == int(
|
||||
&& int( gettimeofday() / 86400 ) != int(
|
||||
computeAlignTime( '24:00', $shutters->getTimeUpLate ) /
|
||||
86400
|
||||
)
|
||||
)
|
||||
|| (
|
||||
int( gettimeofday() / 86400 ) != int(
|
||||
int( gettimeofday() / 86400 ) == int(
|
||||
computeAlignTime( '24:00', $shutters->getTimeDownEarly ) /
|
||||
86400
|
||||
)
|
||||
&& int( gettimeofday() / 86400 ) == int(
|
||||
&& int( gettimeofday() / 86400 ) != int(
|
||||
computeAlignTime( '24:00', $shutters->getTimeDownLate ) /
|
||||
86400
|
||||
)
|
||||
|
|
@ -2089,8 +2089,8 @@ sub EventProcessingBrightness {
|
|||
$shutters->setLastDrive('brightness privacy day open');
|
||||
ShuttersCommandSet( $hash, $shuttersDev,
|
||||
$shutters->getPrivacyUpPos )
|
||||
unless (
|
||||
!$shutters->getQueryShuttersPos(
|
||||
if (
|
||||
$shutters->getQueryShuttersPos(
|
||||
$shutters->getPrivacyUpPos
|
||||
)
|
||||
);
|
||||
|
|
@ -2243,7 +2243,7 @@ sub EventProcessingBrightness {
|
|||
}
|
||||
else {
|
||||
EventProcessingShadingBrightness( $hash, $shuttersDev, $events )
|
||||
unless ( $shutters->getPrivacyDownStatus == 2 );
|
||||
if ( $shutters->getPrivacyDownStatus != 2 );
|
||||
|
||||
ASC_Debug( 'EventProcessingBrightness: '
|
||||
. $shutters->getShuttersDev
|
||||
|
|
@ -2253,7 +2253,7 @@ sub EventProcessingBrightness {
|
|||
}
|
||||
else {
|
||||
EventProcessingShadingBrightness( $hash, $shuttersDev, $events )
|
||||
unless ( $shutters->getPrivacyDownStatus == 2 );
|
||||
if ( $shutters->getPrivacyDownStatus != 2 );
|
||||
|
||||
ASC_Debug( 'EventProcessingBrightness: '
|
||||
. $shutters->getShuttersDev
|
||||
|
|
@ -3102,7 +3102,7 @@ sub CreateSunRiseSetShuttersTimer {
|
|||
if ( defined( $shutters->getInTimerFuncHash ) );
|
||||
|
||||
## Setzt den Privacy Modus für die Sichtschutzfahrt auf den Status 0
|
||||
## 1 bedeutet das PrivacyDown Timer aktiviert wurde, 2 beudet das er im privacyDown ist
|
||||
## 1 bedeutet das Privacy Timer aktiviert wurde, 2 beudet das er im privacy ist
|
||||
## also das Rollo in privacy Position steht und VOR der endgültigen Nacht oder Tagfahrt
|
||||
$shutters->setPrivacyUpStatus(0)
|
||||
if ( !defined( $shutters->getPrivacyUpStatus ) );
|
||||
|
|
@ -3355,8 +3355,8 @@ sub SunSetShuttersAfterTimerFn {
|
|||
$shutters->setLastDrive('timer privacy night close');
|
||||
ShuttersCommandSet( $hash, $shuttersDev,
|
||||
$shutters->getPrivacyDownPos )
|
||||
unless (
|
||||
$shutters->getQueryShuttersPos( $shutters->getPrivacyDownPos )
|
||||
if (
|
||||
!$shutters->getQueryShuttersPos( $shutters->getPrivacyDownPos )
|
||||
);
|
||||
}
|
||||
else {
|
||||
|
|
@ -3378,7 +3378,7 @@ sub SunSetShuttersAfterTimerFn {
|
|||
}
|
||||
}
|
||||
|
||||
unless ( $shutters->getPrivacyDownStatus == 2 ) {
|
||||
if ( $shutters->getPrivacyDownStatus != 2 ) {
|
||||
$shutters->setSunrise(0);
|
||||
$shutters->setSunset(1);
|
||||
}
|
||||
|
|
@ -3456,8 +3456,8 @@ sub SunRiseShuttersAfterTimerFn {
|
|||
$shutters->setLastDrive('timer privacy day open');
|
||||
ShuttersCommandSet( $hash, $shuttersDev,
|
||||
$shutters->getPrivacyUpPos )
|
||||
unless (
|
||||
!$shutters->getQueryShuttersPos(
|
||||
if (
|
||||
$shutters->getQueryShuttersPos(
|
||||
$shutters->getPrivacyUpPos
|
||||
)
|
||||
);
|
||||
|
|
@ -3482,7 +3482,7 @@ sub SunRiseShuttersAfterTimerFn {
|
|||
}
|
||||
}
|
||||
|
||||
unless ( $shutters->getPrivacyUpStatus == 2 ) {
|
||||
if ( $shutters->getPrivacyUpStatus != 2 ) {
|
||||
$shutters->setSunrise(1);
|
||||
$shutters->setSunset(0);
|
||||
}
|
||||
|
|
@ -4559,11 +4559,11 @@ sub _SetCmdFn {
|
|||
my $idleDetection = $shutters->getIdleDetection;
|
||||
|
||||
return
|
||||
unless (
|
||||
$shutters->getASCenable eq 'on'
|
||||
&& $ascDev->getASCenable eq 'on'
|
||||
&& ( $idleDetection =~ m{^$idleDetectionValue$}xms
|
||||
|| $idleDetection eq 'none' )
|
||||
if (
|
||||
$shutters->getASCenable eq 'off'
|
||||
&& $ascDev->getASCenable eq 'off'
|
||||
&& ( $idleDetection !~ m{^$idleDetectionValue$}xms
|
||||
|| $idleDetection ne 'none' )
|
||||
);
|
||||
|
||||
if ( $shutters->getStatus != $posValue ) {
|
||||
|
|
@ -4721,7 +4721,7 @@ sub _setShuttersLastDriveDelayed {
|
|||
|
||||
sub ASC_Debug {
|
||||
return
|
||||
unless ( AttrVal( $ascDev->getName, 'ASC_debug', 0 ) );
|
||||
if ( !AttrVal( $ascDev->getName, 'ASC_debug', 0 ) );
|
||||
|
||||
my $debugMsg = shift;
|
||||
my $debugTimestamp = strftime( "%Y.%m.%e %T", localtime(time) );
|
||||
|
|
@ -4773,7 +4773,7 @@ sub PrivacyUpTime {
|
|||
strftime( "%e.%m.%Y - %H:%M", localtime($privacyUpUnixtime) ), 1 );
|
||||
## Setzt den PrivacyUp Modus für die Sichtschutzfahrt auf den Status 1
|
||||
## und gibt die Unixtime für die nächste Fahrt korrekt zurück
|
||||
unless ( $shutters->getPrivacyUpStatus == 2 ) {
|
||||
if ( $shutters->getPrivacyUpStatus != 2 ) {
|
||||
$shutters->setPrivacyUpStatus(1);
|
||||
$shuttersSunriseUnixtime = $privacyUpUnixtime;
|
||||
}
|
||||
|
|
@ -4817,7 +4817,7 @@ sub PrivacyDownTime {
|
|||
1 );
|
||||
## Setzt den PrivacyDown Modus für die Sichtschutzfahrt auf den Status 1
|
||||
## und gibt die Unixtime für die nächste Fahrt korrekt zurück
|
||||
unless ( $shutters->getPrivacyDownStatus == 2 ) {
|
||||
if ( $shutters->getPrivacyDownStatus != 2 ) {
|
||||
$shutters->setPrivacyDownStatus(1);
|
||||
$shuttersSunsetUnixtime = $privacyDownUnixtime;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user