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

signed for power meter frequency calculation

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@4820 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2014-02-06 12:39:20 +00:00
parent 230e23049b
commit fa3fb8489b
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fhem/FHEM/10_CUL_HM.pm
View File

@ -273,16 +273,14 @@ sub CUL_HM_updateConfig($){
$hash->{helper}{role}{vrt} = 1;
if ( $hash->{helper}{fkt}
&& $hash->{helper}{fkt} =~ m/^(vdCtrl|virtThSens)$/){
my $n = ReadingsVal($name,".next",0);
my $now = gettimeofday();
$n = $now if ($n<$now);
my $vId = substr($id."01",0,8);
$hash->{helper}{virtTC} = "00";
CUL_HM_Set($hash,$name,"valvePos",ReadingsVal($name,"valvePosTC",""));
CUL_HM_Set($hash,$name,"virtTemp",ReadingsVal($name,"temperature",""));
CUL_HM_Set($hash,$name,"virtHum" ,ReadingsVal($name,"humidity",""));
RemoveInternalTimer("valvePos:$vId");
InternalTimer($n,"CUL_HM_valvePosUpdt","valvePos:$vId",0);
InternalTimer(ReadingsVal($name,".next",1)
,"CUL_HM_valvePosUpdt","valvePos:$vId",0);
}
}
@ -1308,7 +1306,8 @@ sub CUL_HM_Parse($$) {##############################
push @event, "power:" . hex($P )/100; # 0.0 ..167772.15 W
push @event, "current:" . hex($I )/1; # 0.0 ..65535.0 mA
push @event, "voltage:" . hex($U )/10; # 0.0 ..6553.5 mV
push @event, "frequency:".(hex($F )/100+50); # 48.72..51.27 Hz
$F = hex($F);$F -= 256 if ($F > 127);
push @event, "frequency:".($F/100+50); # 48.72..51.27 Hz
push @event, "boot:" .((hex($eCnt)&0x800000)?"on":"off");
}
}