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

- bugfix: correct correction factors for EMEM in 15_CUL_EM.pm

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@269 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
borisneubert 2008-11-15 20:20:45 +00:00
parent e32f7a428c
commit a7069a2bb6
3 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -440,3 +440,4 @@
devices in fhem (Boris 2008-11-02) devices in fhem (Boris 2008-11-02)
- feature: X10 support for pgm3 (Boris 2008-11-02) - feature: X10 support for pgm3 (Boris 2008-11-02)
- bugfix: FHT short message warning - bugfix: FHT short message warning
- bugfix: correct correction factors for EMEM in 15_CUL_EM.pm

33
fhem/FHEM/15_CUL_EM.pm
View File

@ -29,8 +29,8 @@ CUL_EM_Define($$)
my ($hash, $def) = @_; my ($hash, $def) = @_;
my @a = split("[ \t][ \t]*", $def); my @a = split("[ \t][ \t]*", $def);
return "wrong syntax: define <name> CUL_EM <code> [corr]" return "wrong syntax: define <name> CUL_EM <code> [corr1 corr2]"
if(int(@a) < 3 || int(@a) > 4); if(int(@a) != 3 && int(@a) != 5);
return "Define $a[0]: wrong CODE format: valid is 1-12" return "Define $a[0]: wrong CODE format: valid is 1-12"
if($a[2] !~ m/^\d$/ || $a[2] < 1 || $a[2] > 12); if($a[2] !~ m/^\d$/ || $a[2] < 1 || $a[2] > 12);
@ -38,16 +38,22 @@ CUL_EM_Define($$)
if($a[2] >= 1 && $a[2] <= 4) { # EMWZ: nRotation in 5 minutes if($a[2] >= 1 && $a[2] <= 4) { # EMWZ: nRotation in 5 minutes
my $c = (int(@a) > 3 ? $a[3] : 150); my $c = (int(@a) > 3 ? $a[3] : 150);
$hash->{corr} = (12/$c); $hash->{corr1} = (12/$c);
$hash->{corr2} = (12/$c);
} elsif($a[2] >= 5 && $a[2] <= 8) { # EMEM: 0.01 } elsif($a[2] >= 5 && $a[2] <= 8) { # EMEM
$hash->{corr} = (int(@a) > 3 ? $a[3] : 0.01); # corr1 is the correction factor for power
$hash->{corr1} = (int(@a) > 3 ? $a[3] : 0.01);
# corr2 is the correction factor for energy
$hash->{corr2} = (int(@a) > 3 ? $a[4] : 0.001);
} elsif($a[2] >= 9 && $a[2] <= 12) { # EMGZ: 0.01 } elsif($a[2] >= 9 && $a[2] <= 12) { # EMGZ: 0.01
$hash->{corr} = (int(@a) > 3 ? $a[3] : 0.01); $hash->{corr1} = (int(@a) > 3 ? $a[3] : 0.01);
$hash->{corr2} = (int(@a) > 3 ? $a[4] : 0.01);
} else { } else {
$hash->{corr} = 1; $hash->{corr1} = 1;
$hash->{corr2} = 1;
} }
$defptr{$a[2]} = $hash; $defptr{$a[2]} = $hash;
return undef; return undef;
@ -78,16 +84,17 @@ CUL_EM_Parse($$)
my $cum = hex($a[ 9].$a[10].$a[ 7].$a[ 8]); my $cum = hex($a[ 9].$a[10].$a[ 7].$a[ 8]);
my $lst = hex($a[13].$a[14].$a[11].$a[12]); my $lst = hex($a[13].$a[14].$a[11].$a[12]);
my $top = hex($a[17].$a[18].$a[15].$a[16]); my $top = hex($a[17].$a[18].$a[15].$a[16]);
my $val = sprintf("CNT %d CUM: %d 5MIN: %d TOP: %d", my $val = sprintf("CNT: %d CUM: %d 5MIN: %d TOP: %d",
$cnt, $cum, $lst, $top); $cnt, $cum, $lst, $top);
if($defptr{$cde}) { if($defptr{$cde}) {
$hash = $defptr{$cde}; $hash = $defptr{$cde};
my $corr = $hash->{corr}; my $corr1 = $hash->{corr1}; # EMEM power correction factor
$cum *= $corr; my $corr2 = $hash->{corr2}; # EMEM energy correction factor
$lst *= $corr; $cum *= $corr2;
$top *= $corr; $lst *= $corr1;
$val = sprintf("CNT %d CUM: %0.3f 5MIN: %0.3f TOP: %0.3f", $top *= $corr1;
$val = sprintf("CNT: %d CUM: %0.3f 5MIN: %0.3f TOP: %0.3f",
$cnt, $cum, $lst, $top); $cnt, $cum, $lst, $top);
my $n = $hash->{NAME}; my $n = $hash->{NAME};
Log GetLogLevel($n,1), "CUL_EM $n: $val"; Log GetLogLevel($n,1), "CUL_EM $n: $val";

6
fhem/HISTORY
View File

@ -321,4 +321,8 @@ Fri Jul 25 18:14:26 MEST 2008
- Boris Sun Nov 02 CET 2008 - Boris Sun Nov 02 CET 2008
- feature: new modules 00_CM11.pm and 20_X10.pm for integration of X10 - feature: new modules 00_CM11.pm and 20_X10.pm for integration of X10
devices in fhem devices in fhem
- feature: X10 support for pgm3 - feature: X10 support for pgm3
- Boris Sat Nov 15 CET 2008
- bugfix: correct correction factors for EMEM in 15_CUL_EM.pm