code Style
This commit is contained in:
parent
ab5966fc79
commit
c0260bf7e5
@ -2643,25 +2643,24 @@ sub CreateSunRiseSetShuttersTimer($$) {
|
||||
## Ich brauche beim löschen des InternalTimer den Hash welchen ich mitgegeben habe,dieser muss gesichert werden
|
||||
$shutters->setInTimerFuncHash( \%funcHash );
|
||||
|
||||
|
||||
## Abfrage für die Sichtschutzfahrt am Morgen vor dem eigentlichen kompletten öffnen
|
||||
if ( $shutters->getPrivacyUpTime > 0
|
||||
and $shutters->getUp ne 'brightness' )
|
||||
{
|
||||
$shuttersSunriseUnixtime = PrivacyUpTime($shuttersDevHash,$shuttersSunriseUnixtime);
|
||||
$shuttersSunriseUnixtime =
|
||||
PrivacyUpTime( $shuttersDevHash, $shuttersSunriseUnixtime );
|
||||
}
|
||||
else {
|
||||
CommandDeleteReading( undef,
|
||||
$shuttersDev . ' ASC_Time_PrivacyDriveUp' )
|
||||
if (
|
||||
ReadingsVal( $shuttersDev, 'ASC_Time_PrivacyDriveUp', 'none' ) );
|
||||
CommandDeleteReading( undef, $shuttersDev . ' ASC_Time_PrivacyDriveUp' )
|
||||
if ( ReadingsVal( $shuttersDev, 'ASC_Time_PrivacyDriveUp', 'none' ) );
|
||||
}
|
||||
|
||||
## Abfrage für die Sichtschutzfahrt am Abend vor dem eigentlichen kompletten schließen
|
||||
if ( $shutters->getPrivacyDownTime > 0
|
||||
and $shutters->getDown ne 'brightness' )
|
||||
{
|
||||
$shuttersSunsetUnixtime = PrivacyDownTime($shuttersDevHash,$shuttersSunsetUnixtime);
|
||||
$shuttersSunsetUnixtime =
|
||||
PrivacyDownTime( $shuttersDevHash, $shuttersSunsetUnixtime );
|
||||
}
|
||||
else {
|
||||
CommandDeleteReading( undef,
|
||||
@ -2689,17 +2688,14 @@ sub PrivacyUpTime($$) {
|
||||
readingsSingleUpdate(
|
||||
$shuttersDevHash,
|
||||
'ASC_Time_PrivacyDriveUp',
|
||||
strftime(
|
||||
"%e.%m.%Y - %H:%M",
|
||||
localtime($shuttersSunriseUnixtime)
|
||||
),
|
||||
strftime( "%e.%m.%Y - %H:%M", localtime($shuttersSunriseUnixtime) ),
|
||||
0
|
||||
);
|
||||
## Setzt den PrivacyDown Modus für die Sichtschutzfahrt auf den Status 1
|
||||
$shutters->setPrivacyUpStatus(1);
|
||||
}
|
||||
|
||||
return $shuttersSunriseUnixtime
|
||||
return $shuttersSunriseUnixtime;
|
||||
}
|
||||
|
||||
sub PrivacyDownTime($$) {
|
||||
@ -2713,17 +2709,14 @@ sub PrivacyDownTime($$) {
|
||||
readingsSingleUpdate(
|
||||
$shuttersDevHash,
|
||||
'ASC_Time_PrivacyDriveDown',
|
||||
strftime(
|
||||
"%e.%m.%Y - %H:%M",
|
||||
localtime($shuttersSunsetUnixtime)
|
||||
),
|
||||
strftime( "%e.%m.%Y - %H:%M", localtime($shuttersSunsetUnixtime) ),
|
||||
0
|
||||
);
|
||||
## Setzt den PrivacyDown Modus für die Sichtschutzfahrt auf den Status 1
|
||||
$shutters->setPrivacyDownStatus(1);
|
||||
}
|
||||
|
||||
return $shuttersSunsetUnixtime
|
||||
return $shuttersSunsetUnixtime;
|
||||
}
|
||||
|
||||
## Funktion zum neu setzen der Timer und der Readings für Sunset/Rise
|
||||
@ -2995,7 +2988,9 @@ sub SunRiseShuttersAfterTimerFn($) {
|
||||
ShuttersCommandSet( $hash, $shuttersDev,
|
||||
$shutters->getPrivacyUpPos )
|
||||
unless (
|
||||
$shutters->getQueryShuttersPos( $shutters->getPrivacyUpPos )
|
||||
$shutters->getQueryShuttersPos(
|
||||
$shutters->getPrivacyUpPos
|
||||
)
|
||||
);
|
||||
}
|
||||
else {
|
||||
|
Loading…
Reference in New Issue
Block a user