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

code style

Browse Source
This commit is contained in:
Marko Oldenburg 2019-05-01 11:45:46 +02:00
parent d2b3490e14
commit 898e3b1463
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
73_AutoShuttersControl.pm
View File

@ -584,8 +584,8 @@ sub ShuttersDeviceScan($) {
; # temporär muss später gelöscht werden ab Version 0.4.11beta6
delFromDevAttrList( $_, 'ASC_Wind_Pos' )
; # temporär muss später gelöscht werden ab Version 0.4.11beta6
CommandDeleteReading(undef,$_ . ' ASC_Time_PrivacyDriveUp')
if ( ReadingsVal($_,'ASC_Time_PrivacyDriveUp','none') ne 'none' )
CommandDeleteReading( undef, $_ . ' ASC_Time_PrivacyDriveUp' )
if ( ReadingsVal( $_, 'ASC_Time_PrivacyDriveUp', 'none' ) ne 'none' )
; # temporär muss später gelöscht werden ab Version 0.6.3
$shuttersList = $shuttersList . ',' . $_;
@ -866,32 +866,31 @@ sub EventProcessingWindowRec($@) {
)
{
ASC_Debug( 'EventProcessingWindowRec: '
. $shutters->getShuttersDev
. ' Event Closed' );
. $shutters->getShuttersDev
. ' Event Closed' );
if (
IsDay($shuttersDev)
IsDay($shuttersDev)
and ( ( $homemode ne 'asleep' and $homemode ne 'gotosleep' )
or $homemode eq 'none' )
and $shutters->getModeUp ne 'absent'
and $shutters->getModeUp ne 'off'
)
{
if ( $shutters->getShadingStatus eq 'in'
and $shutters->getShuttersPlace eq 'terrace'
and $shutters->getShadingPos != $shutters->getStatus
)
if ( $shutters->getShadingStatus eq 'in'
and $shutters->getShuttersPlace eq 'terrace'
and $shutters->getShadingPos != $shutters->getStatus )
{
$shutters->setLastDrive('shading in');
$shutters->setNoOffset(1);
$shutters->setDriveCmd($shutters->getShadingPos);
$shutters->setDriveCmd( $shutters->getShadingPos );
}
elsif ( $shutters->getStatus != $shutters->getOpenPos ) {
$shutters->setLastDrive('window closed at day');
$shutters->setNoOffset(1);
$shutters->setDriveCmd(
(
$shutters->getLastPos != $shutters->getClosedPos
$shutters->getLastPos != $shutters->getClosedPos
? $shutters->getLastPos
: $shutters->getOpenPos
)
@ -1536,8 +1535,7 @@ sub EventProcessingBrightness($@) {
}
}
else {
EventProcessingShadingBrightness( $hash, $shuttersDev,
$events );
EventProcessingShadingBrightness( $hash, $shuttersDev, $events );
ASC_Debug( 'EventProcessingBrightness: '
. $shutters->getShuttersDev
. ' - Brightness Event kam nicht innerhalb der Verarbeitungszeit für Sunset oder Sunris oder aber für beide wurden die entsprechendne Verarbeitungsschwellen nicht erreicht.'
@ -1875,9 +1873,10 @@ sub ShadingProcessing($@) {
: $getStatus < $getShadingPos
);
if ( not $queryShuttersShadingPos
and not (CheckIfShuttersWindowRecOpen($shuttersDev) == 2
and $shutters->getShuttersPlace eq 'terrace')
if (
not $queryShuttersShadingPos
and not( CheckIfShuttersWindowRecOpen($shuttersDev) == 2
and $shutters->getShuttersPlace eq 'terrace' )
)
{
$shutters->setLastDrive('shading in');