FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-07 19:04:20 +00:00
Code Issues Releases Wiki Activity

bugfixing

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@1778 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
bentele 2012-07-31 18:40:10 +00:00
parent b71a71de42
commit daccf9e721
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
fhem/contrib/70_SML.pm
View File

@ -8,7 +8,7 @@
# #
# $Id$ # $Id$
# #
# Version = 1.0 # Version = 2.0
# #
############################################################################## ##############################################################################
# #
@ -53,24 +53,24 @@ sub
energy_State($$$$) energy_State($$$$)
{ {
my ($hash, $tim, $vt, $val) = @_; my ($hash, $tim, $vt, $val) = @_;
# Log 4, "time: $tim"; Log 4, "time: $tim";
# Log 4, "name: $vt"; Log 4, "name: $vt";
# Log 4, "value: $val"; Log 4, "value: $val";
$hash->{READINGS}{$vt}{VAL} = $val; $hash->{READINGS}{$vt}{VAL} = $val;
$hash->{READINGS}{$vt}{TIME} = TimeNow(); $hash->{READINGS}{$vt}{TIME} = TimeNow();
# Log 4, "$hash->{NAME} VAL: $hash->{READINGS}{$vt}{VAL}"; Log 4, "$hash->{NAME} VAL: $hash->{READINGS}{$vt}{VAL}";
return undef; return undef;
} }
sub sub
energy_Set($$$$) energy_Set($$$$)
{ {
my ($hash, $tim, $vt, $val) = @_; my ($hash, $tim, $vt, $val) = @_;
# Log 4, "time: $tim"; Log 4, "time: $tim";
# Log 4, "name: $vt"; Log 4, "name: $vt";
# Log 4, "value: $val"; Log 4, "value: $val";
$hash->{READINGS}{$vt}{VAL} = $val; $hash->{READINGS}{$vt}{VAL} = $val;
$hash->{READINGS}{$vt}{TIME} = TimeNow(); $hash->{READINGS}{$vt}{TIME} = TimeNow();
# Log 4, "$hash->{NAME} VAL: $hash->{READINGS}{$vt}{VAL}"; Log 4, "$hash->{NAME} VAL: $hash->{READINGS}{$vt}{VAL}";
return undef; return undef;
} }
@ -211,11 +211,10 @@ if ( $success == 0 and $summary > 0 and $counts > 0)
$hash->{READINGS}{avgPower}{VAL} = $avg; $hash->{READINGS}{avgPower}{VAL} = $avg;
$hash->{READINGS}{avgPower}{TIME} = $timenow; $hash->{READINGS}{avgPower}{TIME} = $timenow;
$log = "min: $min max: $max last: $last avg: $avg"; $log = "min: $min max: $max last: $last avg: $avg";
DoTrigger($hash->{NAME}, undef) if ($init_done); $hash->{STATE} = "min: $min max: $max last: $last avg: $avg";
$hash->{STATE} = "min: $min max: $max last: $last avg: $avg"; my $newpower = $avg/(3600/$interval);
my $newpower = $avg/(3600/$interval); $newpower = $newpower/1000;
$newpower = $newpower/1000; $newpower =sprintf("%.6f",$newpower);
$newpower =sprintf("%.6f",$newpower);
my ($date, $month, $day, $hour, $min, $sec) = $timenow =~ /^(\d\d\d\d)-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d)/; my ($date, $month, $day, $hour, $min, $sec) = $timenow =~ /^(\d\d\d\d)-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d)/;
# ######### DAYPOWER # ######### DAYPOWER
if ( $hash->{READINGS}{DAYPOWER}{VAL} eq "-1" ){ if ( $hash->{READINGS}{DAYPOWER}{VAL} eq "-1" ){
@ -233,6 +232,7 @@ if ( $success == 0 and $summary > 0 and $counts > 0)
}else{ # es ist eine Tag vergangen }else{ # es ist eine Tag vergangen
$hash->{READINGS}{DAYPOWER}{VAL} = $newpower; $hash->{READINGS}{DAYPOWER}{VAL} = $newpower;
Log 4, "$hash->{NAME} new day timenow: $timenow newpower $newpower powlast $powLast"; Log 4, "$hash->{NAME} new day timenow: $timenow newpower $newpower powlast $powLast";
$log .= " day: $newpower";
} }
} }
# ######### MONTH # ######### MONTH
@ -251,6 +251,7 @@ if ( $success == 0 and $summary > 0 and $counts > 0)
}else{ # es ist eine Monat vergangen }else{ # es ist eine Monat vergangen
$hash->{READINGS}{MONTHPOWER}{VAL} = $newpower; $hash->{READINGS}{MONTHPOWER}{VAL} = $newpower;
Log 4, "$hash->{NAME} Neuer Monat timenow: $timenow newpower $newpower powlast $powLast"; Log 4, "$hash->{NAME} Neuer Monat timenow: $timenow newpower $newpower powlast $powLast";
$log .= " month: $newpower";
} }
} }
# ######### YEARPOWER # ######### YEARPOWER
@ -269,6 +270,7 @@ if ( $success == 0 and $summary > 0 and $counts > 0)
}else{ # es ist eine Jahr vergangen }else{ # es ist eine Jahr vergangen
$hash->{READINGS}{YEARPOWER}{VAL} = $newpower; $hash->{READINGS}{YEARPOWER}{VAL} = $newpower;
Log 4, "$hash->{NAME} Neues Jahr timenow: $timenow newpower $newpower powlast $powLast"; Log 4, "$hash->{NAME} Neues Jahr timenow: $timenow newpower $newpower powlast $powLast";
$log .= " year: $newpower";
} }
} }
# ######### TOTALPOWER # ######### TOTALPOWER
@ -283,9 +285,11 @@ if ( $success == 0 and $summary > 0 and $counts > 0)
$hash->{READINGS}{TOTALPOWER}{VAL} = $powLast; $hash->{READINGS}{TOTALPOWER}{VAL} = $powLast;
$log .= " total: $powLast"; $log .= " total: $powLast";
} }
push @{$hash->{CHANGED}}, $log; push @{$hash->{CHANGED}}, $log;
DoTrigger($hash->{NAME}, undef) if ($init_done);
Log 3, "$hash->{NAME} write log file: $log";
}else{ }else{
Log 3, "$hash->{NAME} can't update - device send a error"; Log 3, "$hash->{NAME} can't update - device send a error";
} }
return undef; return undef;