diff --git a/fhem/CHANGED b/fhem/CHANGED index 236cb36dc..a197c3e5b 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. + - bugfix: 88_Timer: fixed stop internalTimer if no value to sort (sortTimer) - change: 88_HMCCU: Minor changes - change: 71_ZM_Monitor: now writing internal 'model' - feature: 74_AMADDevice: add class support for openApp, diff --git a/fhem/FHEM/88_Timer.pm b/fhem/FHEM/88_Timer.pm index ad8327b5f..091cca11f 100644 --- a/fhem/FHEM/88_Timer.pm +++ b/fhem/FHEM/88_Timer.pm @@ -155,8 +155,6 @@ sub Timer_Set($$$@) { my $array_diff_cnt1 = 0; # need to check 1 + 1 my $array_diff_cnt2 = 0; # need to check 1 + 1 - RemoveInternalTimer($hash, "Timer_Check"); - foreach my $readingsName (sort keys %{$hash->{READINGS}}) { if ($readingsName =~ /^Timer_(\d+)$/) { my $value = ReadingsVal($name, $readingsName, 0); @@ -173,6 +171,8 @@ sub Timer_Set($$$@) { for (my $i=0; $i Rueckgabe -> Javascript) */ function show_popup(button) { FW_cmd(FW_root+\'?cmd={Timer_Popup("'.$name.'","\'+button+\'")}&XHR=1"'.$FW_CSRF.'"\', function(data){popup_return(data)}); } @@ -804,7 +804,7 @@ sub FW_pushed_savebutton { readingsBulkUpdate($hash, "state" , $state, 1); readingsEndUpdate($hash, 1); - ## popup user message ## + ## popup user message (jump to javascript) ## if ($popup != 0) { FW_directNotify("FILTER=(room=)?$name", "#FHEMWEB:WEB", "show_popup(".$selected_buttons[0].")", ""); $reload = 0 if ($reload != 0); # reset, need to right running @@ -818,7 +818,7 @@ sub FW_pushed_savebutton { return; } -### separate popup for user ### +### Popup DEF - Zusammenbau (Rueckgabe -> Javascript) ### sub Timer_Popup { my $name = shift; my $selected_button = shift; @@ -881,7 +881,7 @@ sub Timer_Check($) { my $state;; Log3 $name, 5, "$name: Check is running, Sonnenaufgang $sunriseValues[0]:$sunriseValues[1]:$sunriseValues[2], Sonnenuntergang $sunsetValues[0]:$sunsetValues[1]:$sunsetValues[2]"; - Log3 $name, 5, "$name: Check is running, drift $microseconds microSeconds"; + Log3 $name, 4, "$name: Check is running, drift $microseconds microSeconds"; foreach my $d (keys %{$hash->{READINGS}}) { if ($d =~ /^Timer_\d+$/) {