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

fix Gifhub #79

Browse Source
This commit is contained in:
Marko Oldenburg 2020-08-10 09:47:15 +02:00
parent fbca7af3c6
commit 8a5a6cafdd
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
controls_AutoShuttersControl.txt
View File

@ -1,9 +1,9 @@
UPD 2020-08-06_14:32:42 97596 FHEM/73_AutoShuttersControl.pm
UPD 2020-07-26_17:36:29 74134 lib/FHEM/Automation/ShuttersControl.pm
UPD 2020-08-10_09:45:49 74134 lib/FHEM/Automation/ShuttersControl.pm
UPD 2020-06-22_09:41:40 2657 lib/FHEM/Automation/ShuttersControl/Dev.pm
UPD 2020-07-26_17:36:29 2496 lib/FHEM/Automation/ShuttersControl/Roommate.pm
UPD 2020-07-26_17:36:29 31376 lib/FHEM/Automation/ShuttersControl/Shutters.pm
UPD 2020-08-06_14:32:42 24209 lib/FHEM/Automation/ShuttersControl/Shading.pm
UPD 2020-08-10_09:46:48 24209 lib/FHEM/Automation/ShuttersControl/Shading.pm
UPD 2020-08-06_14:32:42 109110 lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm
UPD 2020-08-10_09:28:25 45519 lib/FHEM/Automation/ShuttersControl/Helper.pm
UPD 2020-06-22_09:41:40 2175 lib/FHEM/Automation/ShuttersControl/Window.pm

22
lib/FHEM/Automation/ShuttersControl.pm
View File

@ -1077,7 +1077,7 @@ sub CreateSunRiseSetShuttersTimer {
$ascDev->getAutoShuttersControlEvening eq 'on'
? (
$shutters->getDown eq 'roommate' ? 'roommate only' : strftime(
"%e.%m.%Y - %H:%M",
"%d.%m.%Y - %H:%M",
localtime($shuttersSunsetUnixtime)
)
)
@ -1091,7 +1091,7 @@ sub CreateSunRiseSetShuttersTimer {
$ascDev->getAutoShuttersControlMorning eq 'on'
? (
$shutters->getUp eq 'roommate' ? 'roommate only' : strftime(
"%e.%m.%Y - %H:%M",
"%d.%m.%Y - %H:%M",
localtime($shuttersSunriseUnixtime)
)
)
@ -1106,10 +1106,10 @@ sub CreateSunRiseSetShuttersTimer {
$shuttersDev . '_nextAstroTimeEvent',
(
$shuttersSunriseUnixtime < $shuttersSunsetUnixtime
? strftime( "%e.%m.%Y - %H:%M",
? strftime( "%d.%m.%Y - %H:%M",
localtime($shuttersSunriseUnixtime) )
: strftime(
"%e.%m.%Y - %H:%M", localtime($shuttersSunsetUnixtime)
"%d.%m.%Y - %H:%M", localtime($shuttersSunsetUnixtime)
)
)
);
@ -1613,12 +1613,12 @@ sub ShuttersInformation {
$ret .= "<td>$shuttersDev</td>";
$ret .= "<td> </td>";
$ret .= "<td>"
. strftime( "%e.%m.%Y - %H:%M:%S",
. strftime( "%d.%m.%Y - %H:%M:%S",
localtime( $shutters->getSunriseUnixTime ) )
. "</td>";
$ret .= "<td> </td>";
$ret .= "<td>"
. strftime( "%e.%m.%Y - %H:%M:%S",
. strftime( "%d.%m.%Y - %H:%M:%S",
localtime( $shutters->getSunsetUnixTime ) )
. "</td>";
$ret .= "<td> </td>";
@ -1869,7 +1869,7 @@ sub ASC_Debug {
if ( !AttrVal( $ascDev->getName, 'ASC_debug', 0 ) );
my $debugMsg = shift;
my $debugTimestamp = strftime( "%Y.%m.%e %T", localtime(time) );
my $debugTimestamp = strftime( "%Y.%m.%d %T", localtime(time) );
print(
encode_utf8(
@ -1897,7 +1897,7 @@ sub PrivacyUpTime {
if ( $shutters->getPrivacyUpStatus == 2 );
readingsSingleUpdate( $shuttersDevHash, 'ASC_Time_PrivacyDriveUp',
strftime( "%e.%m.%Y - %H:%M", localtime($privacyUpUnixtime) ), 1 );
strftime( "%d.%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
if ( $shutters->getPrivacyUpStatus != 2 ) {
@ -1910,7 +1910,7 @@ sub PrivacyUpTime {
$shuttersDevHash,
'ASC_Time_PrivacyDriveUp',
strftime(
"%e.%m.%Y - %H:%M",
"%d.%m.%Y - %H:%M",
localtime(
( $shuttersSunriseUnixtime - $shutters->getPrivacyUpTime )
+ 86400
@ -1940,7 +1940,7 @@ sub PrivacyDownTime {
if ( $shutters->getPrivacyDownStatus == 2 );
readingsSingleUpdate( $shuttersDevHash, 'ASC_Time_PrivacyDriveDown',
strftime( "%e.%m.%Y - %H:%M", localtime($privacyDownUnixtime) ),
strftime( "%d.%m.%Y - %H:%M", localtime($privacyDownUnixtime) ),
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
@ -1954,7 +1954,7 @@ sub PrivacyDownTime {
$shuttersDevHash,
'ASC_Time_PrivacyDriveDown',
strftime(
"%e.%m.%Y - %H:%M",
"%d.%m.%Y - %H:%M",
localtime(
( $shuttersSunsetUnixtime - $shutters->getPrivacyDownTime )
+ 86400

2
lib/FHEM/Automation/ShuttersControl/Shading.pm
View File

@ -619,7 +619,7 @@ sub ShadingProcessingDriveCommand {
. $FHEM::Automation::ShuttersControl::shutters->getShadingStatus
. ', Beschattungsstatus Zeitstempel: '
. strftime(
"%Y.%m.%e %T",
"%Y.%m.%d %T",
localtime(
$FHEM::Automation::ShuttersControl::shutters
->getShadingStatusTimestamp