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

valvPos - restrict to one VD

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@4707 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2014-01-21 16:07:04 +00:00
parent 2c6918ee1c
commit b6aff95e95
1 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
fhem/FHEM/10_CUL_HM.pm
View File

@ -169,7 +169,7 @@ sub CUL_HM_Initialize($) {
#statistics #statistics
$hash->{stat}{s}{dummy}=0; $hash->{stat}{s}{dummy}=0;
$hash->{stat}{r}{dummy}=0; $hash->{stat}{r}{dummy}=0;
RemoveInternalTimer("CUL_HM_statCntRfresh"); RemoveInternalTimer("StatCntRfresh");
InternalTimer(gettimeofday()+3600*20,"CUL_HM_statCntRfresh","StatCntRfresh", 0); InternalTimer(gettimeofday()+3600*20,"CUL_HM_statCntRfresh","StatCntRfresh", 0);
CUL_HM_initRegHash(); CUL_HM_initRegHash();
@ -3172,24 +3172,28 @@ sub CUL_HM_Set($@) {
} }
else { else {
my $vp = $a[2]; my $vp = $a[2];
foreach my $peer (split(',',AttrVal($name,"peerIDs",""))) { my @pId = grep !/^$/,split(',',AttrVal($name,"peerIDs",""));
next if (length($peer) != 8); return "virtual TC support one VD only. Correct number of peers"
my $ph = CUL_HM_id2Hash($peer); if (scalar @pId != 1);
my $ph = CUL_HM_id2Hash($pId[0]);
return "peerID $pId[0] is not assigned to a device " if (!$ph);
$hash->{helper}{vd}{id} = substr($pId[0],0,6);
CUL_HM_UpdtReadBulk($ph,1, CUL_HM_UpdtReadBulk($ph,1,
"state:set_$vp %", "state:set_$vp %",
"ValveDesired:$vp %") "ValveDesired:$vp %");
if ($ph);
}
readingsSingleUpdate($hash,"valvePosTC","$vp %",0); readingsSingleUpdate($hash,"valvePosTC","$vp %",0);
$hash->{helper}{vd}{idh} = hex(substr($dst,2,2))*20077; $hash->{helper}{vd}{idh} = hex(substr($dst,2,2))*20077;
$hash->{helper}{vd}{idl} = hex(substr($dst,4,2))*256; $hash->{helper}{vd}{idl} = hex(substr($dst,4,2))*256;
$hash->{helper}{vd}{msgCnt} = 1 if (!defined $hash->{helper}{vd}{msgCnt}); $hash->{helper}{vd}{msgCnt} = 1 if (!defined $hash->{helper}{vd}{msgCnt});
if (!$hash->{helper}{virtTC}){ if (!$hash->{helper}{virtTC}){
$hash->{helper}{vd}{ackT} = "" if (!defined$hash->{helper}{vd}{ackT}); $hash->{helper}{vd}{ackT} = "" if (!defined$hash->{helper}{vd}{ackT});
$hash->{helper}{vd}{miss} = 0 if (!defined$hash->{helper}{vd}{miss});
$hash->{helper}{vd}{next} = gettimeofday() $hash->{helper}{vd}{next} = gettimeofday()
if (!defined $hash->{helper}{vd}{next}); if (!defined $hash->{helper}{vd}{next});
$hash->{helper}{virtTC} = "03"; $hash->{helper}{virtTC} = "03";
CUL_HM_valvePosUpdt("valvePos:$dst$chn"); CUL_HM_valvePosUpdt("valvePos:$dst$chn");
CUL_HM_UpdtReadSingle($hash,"valveCtrl","init",1)
}; };
$hash->{helper}{virtTC} = "03"; $hash->{helper}{virtTC} = "03";
$state = "ValveAdjust:$vp %"; $state = "ValveAdjust:$vp %";
@ -3526,13 +3530,11 @@ sub CUL_HM_valvePosUpdt(@) {#update valve position periodically to please valve
$vp =~ s/ %//; $vp =~ s/ %//;
$vp *=2.56; $vp *=2.56;
$vp = 255 if ($vp >255); $vp = 255 if ($vp >255);
foreach my $peer (sort(split(',',AttrVal($name,"peerIDs","")))) {
next if (length($peer) != 8);
CUL_HM_PushCmdStack($hash,sprintf("%02XA258%s%s%s%02X" CUL_HM_PushCmdStack($hash,sprintf("%02XA258%s%s%s%02X"
,$msgCnt,substr($vId,0,6) ,$msgCnt,substr($vId,0,6)
,substr($peer,0,6) ,$hash->{helper}{vd}{id}
,$hash->{helper}{virtTC},$vp)); ,$hash->{helper}{virtTC},$vp));
}
my $tn = gettimeofday(); my $tn = gettimeofday();
$hash->{helper}{vd}{nextF} = $hash->{helper}{vd}{next} + $nextTimer; $hash->{helper}{vd}{nextF} = $hash->{helper}{vd}{next} + $nextTimer;
@ -3546,19 +3548,23 @@ sub CUL_HM_valvePosTmr(@) {#calc next vd wakeup
my($in ) = @_; my($in ) = @_;
my(undef,$vId) = split(':',$in); my(undef,$vId) = split(':',$in);
my $hash = CUL_HM_id2Hash($vId); my $hash = CUL_HM_id2Hash($vId);
my $ackTime;
foreach my $peer (sort(split(',',AttrVal($hash->{NAME},"peerIDs","")))) { my $pn = CUL_HM_id2Name($hash->{helper}{vd}{id});
next if (length($peer) != 8); my $ackTime = ReadingsTimestamp($pn, "ValvePosition", "");
my $pn = CUL_HM_id2Name(substr($peer,0,6));
$ackTime = ReadingsTimestamp($pn, "ValvePosition", "");
}
if (!$ackTime || $ackTime eq $hash->{helper}{vd}{ackT} ){ if (!$ackTime || $ackTime eq $hash->{helper}{vd}{ackT} ){
$hash->{helper}{vd}{next} = $hash->{helper}{vd}{nextF}; $hash->{helper}{vd}{next} = $hash->{helper}{vd}{nextF};
$hash->{helper}{vd}{miss}++;
CUL_HM_UpdtReadSingle($hash,"valveCtrl","lost",1)
if( $hash->{helper}{vd}{miss} > 6
&& ReadingsVal($hash->{NAME},"valveCtrl","") ne "lost");
Log3 $hash->{NAME},5,"CUL_HM $hash->{NAME} virtualTC use fail-timer"; Log3 $hash->{NAME},5,"CUL_HM $hash->{NAME} virtualTC use fail-timer";
} }
else{ else{
$hash->{helper}{vd}{next} = $hash->{helper}{vd}{nextM}; $hash->{helper}{vd}{next} = $hash->{helper}{vd}{nextM};
CUL_HM_UpdtReadSingle($hash,"valveCtrl","ok",1)
if(ReadingsVal($hash->{NAME},"valveCtrl","") ne "ok");
$hash->{helper}{vd}{miss} = 0;
} }
$hash->{helper}{vd}{ackT} = $ackTime; $hash->{helper}{vd}{ackT} = $ackTime;
InternalTimer($hash->{helper}{vd}{next},"CUL_HM_valvePosUpdt","valvePos:$vId",0); InternalTimer($hash->{helper}{vd}{next},"CUL_HM_valvePosUpdt","valvePos:$vId",0);
@ -4092,8 +4098,8 @@ sub CUL_HM_statCntRfresh($) {# update statistic once a day
} }
CUL_HM_statCnt($_,"u") if ($_ ne "dummy"); CUL_HM_statCnt($_,"u") if ($_ ne "dummy");
} }
RemoveInternalTimer("CUL_HM_statCntRfresh"); RemoveInternalTimer("StatCntRfresh");
InternalTimer(gettimeofday()+3600*20,"CUL_HM_statCntRfresh","StatCntRfrh",0); InternalTimer(gettimeofday()+3600*20,"CUL_HM_statCntRfresh","StatCntRfresh",0);
} }
sub CUL_HM_respPendRm($) {#del response related entries in messageing entity sub CUL_HM_respPendRm($) {#del response related entries in messageing entity