diff --git a/fhem/CHANGED b/fhem/CHANGED index 5939c4ee2..eedbf0206 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,6 @@ # Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Do not insert empty lines here, update check depends on it. + - change: 48_MieleAtHome: use id-tag instead of name-tag for docs - new: 50_SSFile: Module that integrates Synology Sile Station - bugfix: 98_WeekdayTimer: CONDITION now again is checked for entire day - feature: 74_GardenaSmartDevice: add support for SmartIrrigationControl diff --git a/fhem/FHEM/48_MieleAtHome.pm b/fhem/FHEM/48_MieleAtHome.pm index 956afc93a..1f114bf6b 100644 --- a/fhem/FHEM/48_MieleAtHome.pm +++ b/fhem/FHEM/48_MieleAtHome.pm @@ -35,7 +35,7 @@ use Encode qw(encode_utf8); use List::Util qw[min max]; use JSON; -my $version = "1.0.2"; +my $version = "1.1.0"; my $MAH_hasMimeBase64 = 1; @@ -1229,6 +1229,7 @@ sub MAH_calculateETA($$$) if ($statusRaw == 2 || $statusRaw == 7) { # On (but not running) or End my $eta = POSIX::strftime("%H:%M", localtime(time + $remainingSecs)); # ignore startOffsetSecs here as this is very strange my $etaHR = "+" . MAH_formatTime($remainingHour, $remainingMinute); + $etaHR = "Ende" if ($remainingHour == 0 && $remainingMinute == 0); return ($eta, $etaHR); } @@ -1237,7 +1238,7 @@ sub MAH_calculateETA($$$) my $etaHR = $eta; # write remaining minutes in the last 15 minutes instead of - $etaHR = sprintf("+0:%02d", ${remainingMinute}) if ($remainingSecs <= 15 * 60); + $etaHR = "+" . MAH_formatTime($remainingHour, $remainingMinute) if ($remainingSecs <= 15 * 60); return ($eta, $etaHR); # } @@ -1862,7 +1863,7 @@ sub MAH_getStacktrace() =begin html - +

MieleAtHome