diff --git a/fhem/CHANGED b/fhem/CHANGED index d3c60dbcb..0e7b4fe20 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: 93_DbLog: changed min/max val 999999 to system specific (~0 >> 1) - feature: HUEbridge: added get touchlink added get whitelist, set deletewhitelist new and extendet internals diff --git a/fhem/FHEM/93_DbLog.pm b/fhem/FHEM/93_DbLog.pm index 7793659f2..1302ea096 100644 --- a/fhem/FHEM/93_DbLog.pm +++ b/fhem/FHEM/93_DbLog.pm @@ -917,16 +917,16 @@ DbLog_Get($@) for(my $i=0; $i> 1); + $max[$i] = -(~0 >> 1); $sum[$i] = 0; $cnt[$i] = 0; $lastv[$i] = 0; $lastd[$i] = "undef"; $mind[$i] = "undef"; $maxd[$i] = "undef"; - $minval = 999999; - $maxval = -999999; + $minval = (~0 >> 1); + $maxval = -(~0 >> 1); $deltacalc = 0; if($readings[$i]->[3] && ($readings[$i]->[3] eq "delta-h" || $readings[$i]->[3] eq "delta-d")) { @@ -1131,9 +1131,9 @@ DbLog_Get($@) $sum[$i] += $out_value; $cnt[$i]++; $out_tstamp = DbLog_implode_datetime($lasttstamp{year}, $lasttstamp{month}, $lasttstamp{day}, $lasttstamp{hour}, "30", "00"); - #$minval = 999999; + #$minval = (~0 >> 1); $minval = $maxval; -# $maxval = -999999; +# $maxval = -(~0 >> 1); $writeout=1; } } elsif ($readings[$i]->[3] && $readings[$i]->[3] eq "delta-d") { @@ -1150,9 +1150,9 @@ DbLog_Get($@) $sum[$i] += $out_value; $cnt[$i]++; $out_tstamp = DbLog_implode_datetime($lasttstamp{year}, $lasttstamp{month}, $lasttstamp{day}, "12", "00", "00"); -# $minval = 999999; +# $minval = (~0 >> 1); $minval = $maxval; -# $maxval = -999999; +# $maxval = -(~0 >> 1); $writeout=1; } } else { @@ -1254,8 +1254,8 @@ DbLog_Get($@) #Ueberfuehren der gesammelten Werte in die globale Variable %data for(my $j=0; $j> 1) ? "undef" : $min[$j]; + $data{"max$k"} = $max[$j] == -(~0 >> 1) ? "undef" : $max[$j]; $data{"avg$k"} = $cnt[$j] ? sprintf("%0.2f", $sum[$j]/$cnt[$j]) : "undef"; $data{"sum$k"} = $sum[$j]; $data{"cnt$k"} = $cnt[$j] ? $cnt[$j] : "undef";