FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-07 16:59:18 +00:00
Code Issues Releases Wiki Activity

CUL_HM: power meter used chan2 , corrected to chan 1 now

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@12555 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2016-11-12 19:47:07 +00:00
parent 4259777d37
commit cd97752111
1 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
fhem/FHEM/10_CUL_HM.pm
View File

@ -2295,9 +2295,9 @@ sub CUL_HM_Parse($$) {#########################################################
push @evtEt,[$mh{shash},1,"gasCntCalc:".($eo + $eCnt)];
}
elsif ($mh{mTp} eq "5E" ||$mh{mTp} eq "5F" ) { # POWER_EVENT_CYCLIC
$mh{shash} = $modules{CUL_HM}{defptr}{$mh{src}."02"}
if($modules{CUL_HM}{defptr}{$mh{src}."02"});
my ($eCnt,$P,$I,$U,$F) = map{hex($_)} unpack 'A6A6A4A4A2',$mh{p};
$mh{shash} = $modules{CUL_HM}{defptr}{$mh{src}."01"}
if($modules{CUL_HM}{defptr}{$mh{src}."01"});
my ($eCnt,$P) = map{hex($_)} unpack 'A6A6',$mh{p};
$eCnt = ($eCnt&0x7fffff)/10; #0.0 ..838860.7 Wh
$P = $P /100; #0.0 ..167772.15 W
@ -2305,25 +2305,6 @@ sub CUL_HM_Parse($$) {#########################################################
push @evtEt,[$mh{shash},1,"power:" .$P];
my $sumState = "eState:E: $eCnt P: $P";
if (defined $I){
$I = $I /1; #0.0 ..65535.0 mA
push @evtEt,[$mh{shash},1,"current:" .$I];
push @evtEt,[$defs{$mh{devH}->{channel_04}},1,"state:$I" ] if ($mh{devH}->{channel_04});
$sumState .= " I: $I";
}
if (defined $U){
$U = $U /10; #0.0 ..6553.5 mV
push @evtEt,[$mh{shash},1,"voltage:" .$U];
push @evtEt,[$defs{$mh{devH}->{channel_05}},1,"state:$U" ] if ($mh{devH}->{channel_05});
$sumState .= " U: $U";
}
if (defined $F){
$F -= 256 if ($F > 127);
$F = $F/100+50; # 48.72..51.27 Hz
push @evtEt,[$mh{shash},1,"frequency:".$F];
push @evtEt,[$defs{$mh{devH}->{channel_06}},1,"state:$F" ] if ($mh{devH}->{channel_06});
$sumState .= " f: $F";
}
push @evtEt,[$mh{shash},1,$sumState];
push @evtEt,[$mh{shash},1,"boot:" .(($eCnt&0x800000)?"on":"off")];