FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-02 13:05:12 +00:00
Code Issues Releases Wiki Activity

93_DbLog: changed min/max val 999999 to system specific (~0 >> 1); FORUM #41626 & #41787

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@9374 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rapster 2015-10-04 18:34:13 +00:00
parent 4b280fd2a6
commit 2e2f4f852f
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # 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. # 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 - feature: HUEbridge: added get touchlink
added get whitelist, set deletewhitelist added get whitelist, set deletewhitelist
new and extendet internals new and extendet internals

4
fhem/FHEM/42_SYSMON.pm
View File

@ -4319,7 +4319,7 @@ sub SYSMON_ShowBarChartHtml($;$) {
my $sysmon = {}; my $sysmon = {};
my $html=''; my $html='';
if(defined($main::defs{$dev}{READINGS})) { if(defined($main::defs{$dev}{READINGS})) {
foreach my $r (keys($main::defs{$dev}{READINGS})){ foreach my $r (keys %{$main::defs{$dev}->{READINGS}}){
$sysmon->{$r} = $main::defs{$dev}{READINGS}{$r}{VAL}; $sysmon->{$r} = $main::defs{$dev}{READINGS}{$r}{VAL};
} }
} else { } else {
@ -4597,7 +4597,7 @@ sub SYSMON_ShowBarChartHtml_alt($;$$){
# access sysmon data.. # access sysmon data..
#my $sysmon = SYSMON_getValues($dev); #my $sysmon = SYSMON_getValues($dev);
my $sysmon = {}; my $sysmon = {};
foreach my $r (keys($main::defs{$dev}{READINGS})){ foreach my $r (keys %{$main::defs{$dev}->{READINGS}}){
$sysmon->{$r} = $main::defs{$dev}{READINGS}{$r}{VAL}; $sysmon->{$r} = $main::defs{$dev}{READINGS}{$r}{VAL};
} }

20
fhem/FHEM/93_DbLog.pm
View File

@ -917,16 +917,16 @@ DbLog_Get($@)
for(my $i=0; $i<int(@readings); $i++) { for(my $i=0; $i<int(@readings); $i++) {
# ueber alle Readings # ueber alle Readings
# Variablen initialisieren # Variablen initialisieren
$min[$i] = 999999; $min[$i] = (~0 >> 1);
$max[$i] = -999999; $max[$i] = -(~0 >> 1);
$sum[$i] = 0; $sum[$i] = 0;
$cnt[$i] = 0; $cnt[$i] = 0;
$lastv[$i] = 0; $lastv[$i] = 0;
$lastd[$i] = "undef"; $lastd[$i] = "undef";
$mind[$i] = "undef"; $mind[$i] = "undef";
$maxd[$i] = "undef"; $maxd[$i] = "undef";
$minval = 999999; $minval = (~0 >> 1);
$maxval = -999999; $maxval = -(~0 >> 1);
$deltacalc = 0; $deltacalc = 0;
if($readings[$i]->[3] && ($readings[$i]->[3] eq "delta-h" || $readings[$i]->[3] eq "delta-d")) { 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; $sum[$i] += $out_value;
$cnt[$i]++; $cnt[$i]++;
$out_tstamp = DbLog_implode_datetime($lasttstamp{year}, $lasttstamp{month}, $lasttstamp{day}, $lasttstamp{hour}, "30", "00"); $out_tstamp = DbLog_implode_datetime($lasttstamp{year}, $lasttstamp{month}, $lasttstamp{day}, $lasttstamp{hour}, "30", "00");
#$minval = 999999; #$minval = (~0 >> 1);
$minval = $maxval; $minval = $maxval;
# $maxval = -999999; # $maxval = -(~0 >> 1);
$writeout=1; $writeout=1;
} }
} elsif ($readings[$i]->[3] && $readings[$i]->[3] eq "delta-d") { } elsif ($readings[$i]->[3] && $readings[$i]->[3] eq "delta-d") {
@ -1150,9 +1150,9 @@ DbLog_Get($@)
$sum[$i] += $out_value; $sum[$i] += $out_value;
$cnt[$i]++; $cnt[$i]++;
$out_tstamp = DbLog_implode_datetime($lasttstamp{year}, $lasttstamp{month}, $lasttstamp{day}, "12", "00", "00"); $out_tstamp = DbLog_implode_datetime($lasttstamp{year}, $lasttstamp{month}, $lasttstamp{day}, "12", "00", "00");
# $minval = 999999; # $minval = (~0 >> 1);
$minval = $maxval; $minval = $maxval;
# $maxval = -999999; # $maxval = -(~0 >> 1);
$writeout=1; $writeout=1;
} }
} else { } else {
@ -1254,8 +1254,8 @@ DbLog_Get($@)
#Ueberfuehren der gesammelten Werte in die globale Variable %data #Ueberfuehren der gesammelten Werte in die globale Variable %data
for(my $j=0; $j<int(@readings); $j++) { for(my $j=0; $j<int(@readings); $j++) {
my $k = $j+1; my $k = $j+1;
$data{"min$k"} = $min[$j] == 999999 ? "undef" : $min[$j]; $data{"min$k"} = $min[$j] == (~0 >> 1) ? "undef" : $min[$j];
$data{"max$k"} = $max[$j] == -999999 ? "undef" : $max[$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{"avg$k"} = $cnt[$j] ? sprintf("%0.2f", $sum[$j]/$cnt[$j]) : "undef";
$data{"sum$k"} = $sum[$j]; $data{"sum$k"} = $sum[$j];
$data{"cnt$k"} = $cnt[$j] ? $cnt[$j] : "undef"; $data{"cnt$k"} = $cnt[$j] ? $cnt[$j] : "undef";