code Style
This commit is contained in:
parent
ab5966fc79
commit
c0260bf7e5
@ -1711,7 +1711,7 @@ sub EventProcessingBrightness($@) {
|
|||||||
$brightnessMaxVal = $ascDev->getBrightnessMaxVal;
|
$brightnessMaxVal = $ascDev->getBrightnessMaxVal;
|
||||||
}
|
}
|
||||||
|
|
||||||
my $brightnessPrivacyUpVal = $shutters->getPrivacyUpTime;
|
my $brightnessPrivacyUpVal = $shutters->getPrivacyUpTime;
|
||||||
my $brightnessPrivacyDownVal = $shutters->getPrivacyDownTime;
|
my $brightnessPrivacyDownVal = $shutters->getPrivacyDownTime;
|
||||||
|
|
||||||
ASC_Debug( 'EventProcessingBrightness: '
|
ASC_Debug( 'EventProcessingBrightness: '
|
||||||
@ -1759,8 +1759,8 @@ sub EventProcessingBrightness($@) {
|
|||||||
86400
|
86400
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
and ( $1 > $brightnessMaxVal
|
and ( $1 > $brightnessMaxVal
|
||||||
or $1 > $brightnessPrivacyUpVal )
|
or $1 > $brightnessPrivacyUpVal )
|
||||||
and $shutters->getUp eq 'brightness'
|
and $shutters->getUp eq 'brightness'
|
||||||
and not $shutters->getSunrise
|
and not $shutters->getSunrise
|
||||||
and $ascDev->getAutoShuttersControlMorning eq 'on'
|
and $ascDev->getAutoShuttersControlMorning eq 'on'
|
||||||
@ -1808,23 +1808,23 @@ sub EventProcessingBrightness($@) {
|
|||||||
and $ascDev->getResidentsStatus eq 'home' )
|
and $ascDev->getResidentsStatus eq 'home' )
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
|
|
||||||
if ( $1 < $brightnessMaxVal
|
if ( $1 < $brightnessMaxVal
|
||||||
and $1 > $brightnessPrivacyUpVal )
|
and $1 > $brightnessPrivacyUpVal )
|
||||||
{
|
{
|
||||||
$shutters->setLastDrive('privacy position');
|
$shutters->setLastDrive('privacy position');
|
||||||
ShuttersCommandSet( $hash, $shuttersDev,
|
ShuttersCommandSet( $hash, $shuttersDev,
|
||||||
$shutters->getPrivacyUpPos )
|
$shutters->getPrivacyUpPos )
|
||||||
if (
|
if (
|
||||||
$shutters->getQueryShuttersPos(
|
$shutters->getQueryShuttersPos(
|
||||||
$shutters->getPrivacyUpPos
|
$shutters->getPrivacyUpPos
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
ASC_Debug( 'EventProcessingBrightness: '
|
ASC_Debug( 'EventProcessingBrightness: '
|
||||||
. $shutters->getShuttersDev
|
. $shutters->getShuttersDev
|
||||||
. ' - Verarbeitung für Sunset Privacy Down. Roommatestatus korrekt zum fahren. Fahrbefehl wird an die Funktion FnShuttersCommandSet gesendet. Grund des fahrens: '
|
. ' - Verarbeitung für Sunset Privacy Down. Roommatestatus korrekt zum fahren. Fahrbefehl wird an die Funktion FnShuttersCommandSet gesendet. Grund des fahrens: '
|
||||||
. $shutters->getLastDrive );
|
. $shutters->getLastDrive );
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$shutters->setLastDrive(
|
$shutters->setLastDrive(
|
||||||
@ -1835,9 +1835,9 @@ sub EventProcessingBrightness($@) {
|
|||||||
$shutters->getOpenPos );
|
$shutters->getOpenPos );
|
||||||
|
|
||||||
ASC_Debug( 'EventProcessingBrightness: '
|
ASC_Debug( 'EventProcessingBrightness: '
|
||||||
. $shutters->getShuttersDev
|
. $shutters->getShuttersDev
|
||||||
. ' - Verarbeitung für Sunrise. Roommatestatus korrekt zum fahren. Fahrbefehl wird an die Funktion FnShuttersCommandSet gesendet. Grund des fahrens: '
|
. ' - Verarbeitung für Sunrise. Roommatestatus korrekt zum fahren. Fahrbefehl wird an die Funktion FnShuttersCommandSet gesendet. Grund des fahrens: '
|
||||||
. $shutters->getLastDrive );
|
. $shutters->getLastDrive );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
@ -2643,25 +2643,24 @@ sub CreateSunRiseSetShuttersTimer($$) {
|
|||||||
## Ich brauche beim löschen des InternalTimer den Hash welchen ich mitgegeben habe,dieser muss gesichert werden
|
## Ich brauche beim löschen des InternalTimer den Hash welchen ich mitgegeben habe,dieser muss gesichert werden
|
||||||
$shutters->setInTimerFuncHash( \%funcHash );
|
$shutters->setInTimerFuncHash( \%funcHash );
|
||||||
|
|
||||||
|
|
||||||
## Abfrage für die Sichtschutzfahrt am Morgen vor dem eigentlichen kompletten öffnen
|
## Abfrage für die Sichtschutzfahrt am Morgen vor dem eigentlichen kompletten öffnen
|
||||||
if ( $shutters->getPrivacyUpTime > 0
|
if ( $shutters->getPrivacyUpTime > 0
|
||||||
and $shutters->getUp ne 'brightness' )
|
and $shutters->getUp ne 'brightness' )
|
||||||
{
|
{
|
||||||
$shuttersSunriseUnixtime = PrivacyUpTime($shuttersDevHash,$shuttersSunriseUnixtime);
|
$shuttersSunriseUnixtime =
|
||||||
|
PrivacyUpTime( $shuttersDevHash, $shuttersSunriseUnixtime );
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
CommandDeleteReading( undef,
|
CommandDeleteReading( undef, $shuttersDev . ' ASC_Time_PrivacyDriveUp' )
|
||||||
$shuttersDev . ' ASC_Time_PrivacyDriveUp' )
|
if ( ReadingsVal( $shuttersDev, 'ASC_Time_PrivacyDriveUp', 'none' ) );
|
||||||
if (
|
|
||||||
ReadingsVal( $shuttersDev, 'ASC_Time_PrivacyDriveUp', 'none' ) );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
## Abfrage für die Sichtschutzfahrt am Abend vor dem eigentlichen kompletten schließen
|
## Abfrage für die Sichtschutzfahrt am Abend vor dem eigentlichen kompletten schließen
|
||||||
if ( $shutters->getPrivacyDownTime > 0
|
if ( $shutters->getPrivacyDownTime > 0
|
||||||
and $shutters->getDown ne 'brightness' )
|
and $shutters->getDown ne 'brightness' )
|
||||||
{
|
{
|
||||||
$shuttersSunsetUnixtime = PrivacyDownTime($shuttersDevHash,$shuttersSunsetUnixtime);
|
$shuttersSunsetUnixtime =
|
||||||
|
PrivacyDownTime( $shuttersDevHash, $shuttersSunsetUnixtime );
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
CommandDeleteReading( undef,
|
CommandDeleteReading( undef,
|
||||||
@ -2679,51 +2678,45 @@ sub CreateSunRiseSetShuttersTimer($$) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
sub PrivacyUpTime($$) {
|
sub PrivacyUpTime($$) {
|
||||||
my ($shuttersDevHash,$shuttersSunriseUnixtime) = @_;
|
my ( $shuttersDevHash, $shuttersSunriseUnixtime ) = @_;
|
||||||
|
|
||||||
if ( ( $shuttersSunriseUnixtime - $shutters->getPrivacyUpTime ) >
|
if ( ( $shuttersSunriseUnixtime - $shutters->getPrivacyUpTime ) >
|
||||||
( gettimeofday() + 1 ) )
|
( gettimeofday() + 1 ) )
|
||||||
{
|
{
|
||||||
$shuttersSunriseUnixtime =
|
$shuttersSunriseUnixtime =
|
||||||
$shuttersSunriseUnixtime - $shutters->getPrivacyUpTime;
|
$shuttersSunriseUnixtime - $shutters->getPrivacyUpTime;
|
||||||
readingsSingleUpdate(
|
readingsSingleUpdate(
|
||||||
$shuttersDevHash,
|
$shuttersDevHash,
|
||||||
'ASC_Time_PrivacyDriveUp',
|
'ASC_Time_PrivacyDriveUp',
|
||||||
strftime(
|
strftime( "%e.%m.%Y - %H:%M", localtime($shuttersSunriseUnixtime) ),
|
||||||
"%e.%m.%Y - %H:%M",
|
|
||||||
localtime($shuttersSunriseUnixtime)
|
|
||||||
),
|
|
||||||
0
|
0
|
||||||
);
|
);
|
||||||
## Setzt den PrivacyDown Modus für die Sichtschutzfahrt auf den Status 1
|
## Setzt den PrivacyDown Modus für die Sichtschutzfahrt auf den Status 1
|
||||||
$shutters->setPrivacyUpStatus(1);
|
$shutters->setPrivacyUpStatus(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $shuttersSunriseUnixtime
|
return $shuttersSunriseUnixtime;
|
||||||
}
|
}
|
||||||
|
|
||||||
sub PrivacyDownTime($$) {
|
sub PrivacyDownTime($$) {
|
||||||
my ($shuttersDevHash,$shuttersSunsetUnixtime) = @_;
|
my ( $shuttersDevHash, $shuttersSunsetUnixtime ) = @_;
|
||||||
|
|
||||||
if ( ( $shuttersSunsetUnixtime - $shutters->getPrivacyDownTime ) >
|
if ( ( $shuttersSunsetUnixtime - $shutters->getPrivacyDownTime ) >
|
||||||
( gettimeofday() + 1 ) )
|
( gettimeofday() + 1 ) )
|
||||||
{
|
{
|
||||||
$shuttersSunsetUnixtime =
|
$shuttersSunsetUnixtime =
|
||||||
$shuttersSunsetUnixtime - $shutters->getPrivacyDownTime;
|
$shuttersSunsetUnixtime - $shutters->getPrivacyDownTime;
|
||||||
readingsSingleUpdate(
|
readingsSingleUpdate(
|
||||||
$shuttersDevHash,
|
$shuttersDevHash,
|
||||||
'ASC_Time_PrivacyDriveDown',
|
'ASC_Time_PrivacyDriveDown',
|
||||||
strftime(
|
strftime( "%e.%m.%Y - %H:%M", localtime($shuttersSunsetUnixtime) ),
|
||||||
"%e.%m.%Y - %H:%M",
|
|
||||||
localtime($shuttersSunsetUnixtime)
|
|
||||||
),
|
|
||||||
0
|
0
|
||||||
);
|
);
|
||||||
## Setzt den PrivacyDown Modus für die Sichtschutzfahrt auf den Status 1
|
## Setzt den PrivacyDown Modus für die Sichtschutzfahrt auf den Status 1
|
||||||
$shutters->setPrivacyDownStatus(1);
|
$shutters->setPrivacyDownStatus(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $shuttersSunsetUnixtime
|
return $shuttersSunsetUnixtime;
|
||||||
}
|
}
|
||||||
|
|
||||||
## Funktion zum neu setzen der Timer und der Readings für Sunset/Rise
|
## Funktion zum neu setzen der Timer und der Readings für Sunset/Rise
|
||||||
@ -2801,7 +2794,7 @@ sub RenewSunRiseSetShuttersTimer($) {
|
|||||||
delFromDevAttrList( $_, 'ASC_Shading_Angle_Right' );
|
delFromDevAttrList( $_, 'ASC_Shading_Angle_Right' );
|
||||||
|
|
||||||
$attr{$_}{ASC_PrivacyDownValue_beforeNightClose} =
|
$attr{$_}{ASC_PrivacyDownValue_beforeNightClose} =
|
||||||
AttrVal( $_, 'ASC_PrivacyDownTime_beforNightClose', 'none' )
|
AttrVal( $_, 'ASC_PrivacyDownTime_beforNightClose', 'none' )
|
||||||
if ( AttrVal( $_, 'ASC_PrivacyDownTime_beforNightClose', 'none' ) ne
|
if ( AttrVal( $_, 'ASC_PrivacyDownTime_beforNightClose', 'none' ) ne
|
||||||
'none' );
|
'none' );
|
||||||
delFromDevAttrList( $_, 'ASC_PrivacyDownTime_beforNightClose' );
|
delFromDevAttrList( $_, 'ASC_PrivacyDownTime_beforNightClose' );
|
||||||
@ -2994,9 +2987,11 @@ sub SunRiseShuttersAfterTimerFn($) {
|
|||||||
$shutters->setLastDrive('privacy position');
|
$shutters->setLastDrive('privacy position');
|
||||||
ShuttersCommandSet( $hash, $shuttersDev,
|
ShuttersCommandSet( $hash, $shuttersDev,
|
||||||
$shutters->getPrivacyUpPos )
|
$shutters->getPrivacyUpPos )
|
||||||
unless (
|
unless (
|
||||||
$shutters->getQueryShuttersPos( $shutters->getPrivacyUpPos )
|
$shutters->getQueryShuttersPos(
|
||||||
);
|
$shutters->getPrivacyUpPos
|
||||||
|
)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$shutters->setLastDrive('day open');
|
$shutters->setLastDrive('day open');
|
||||||
|
Loading…
Reference in New Issue
Block a user