Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

once more valvePos, enhance resend dimmer/blind

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@5001 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2014-02-20 17:59:57 +00:00
parent 7df90d77f0
commit e735f56ca6
2 changed files with 75 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
FHEM/00_CUL.pm
View File

@ -688,7 +688,10 @@ CUL_XmitDlyHM($$$)
$modules{CUL_HM}{defptr}{$id}{helper}{io} && $modules{CUL_HM}{defptr}{$id}{helper}{io} &&
$modules{CUL_HM}{defptr}{$id}{helper}{io}{nextSend}) { $modules{CUL_HM}{defptr}{$id}{helper}{io}{nextSend}) {
my $dDly = $modules{CUL_HM}{defptr}{$id}{helper}{io}{nextSend} - $now; my $dDly = $modules{CUL_HM}{defptr}{$id}{helper}{io}{nextSend} - $now;
$dDly -= 0.04 if ($mTy eq "02"); #$dDly -= 0.04 if ($mTy eq "02");# while HM devices need a rest there are
# still some devices that need faster
# reactionfor ack.
# Mode needs to be determined
if ($dDly > 0.01){# wait less then 10 ms will not work if ($dDly > 0.01){# wait less then 10 ms will not work
$dDly = 0.1 if($dDly > 0.1); $dDly = 0.1 if($dDly > 0.1);
Log3 $hash->{NAME}, 5, "CUL $id dly:".int($dDly*1000)."ms"; Log3 $hash->{NAME}, 5, "CUL $id dly:".int($dDly*1000)."ms";

126
FHEM/10_CUL_HM.pm
View File

@ -288,12 +288,14 @@ sub CUL_HM_updateConfig($){
$hash->{helper}{vd}{msgRed}= 0 if(!defined $hash->{helper}{vd}{msgRed}); $hash->{helper}{vd}{msgRed}= 0 if(!defined $hash->{helper}{vd}{msgRed});
($hash->{helper}{vd}{msgCnt},$hash->{helper}{vd}{next}) = ($hash->{helper}{vd}{msgCnt},$hash->{helper}{vd}{next}) =
split(";",ReadingsVal($name,".next","0;".gettimeofday())) if(!defined $hash->{helper}{vd}{next}); split(";",ReadingsVal($name,".next","0;".gettimeofday())) if(!defined $hash->{helper}{vd}{next});
CUL_HM_Set($hash,$name,"valvePos",ReadingsVal($name,"valvePosTC","")); my $d =ReadingsVal($name,"valvePosTC","");
$d =~ s/ %//;
CUL_HM_Set($hash,$name,"valvePos",$d);
CUL_HM_Set($hash,$name,"virtTemp",ReadingsVal($name,"temperature","")); CUL_HM_Set($hash,$name,"virtTemp",ReadingsVal($name,"temperature",""));
CUL_HM_Set($hash,$name,"virtHum" ,ReadingsVal($name,"humidity","")); CUL_HM_Set($hash,$name,"virtHum" ,ReadingsVal($name,"humidity",""));
CUL_HM_UpdtReadSingle($hash,"valveCtrl","restart",1) if (ReadingsVal($name,"valvePosTC",""));
RemoveInternalTimer("valvePos:$vId"); RemoveInternalTimer("valvePos:$vId");
RemoveInternalTimer("valveTmr:$vId"); RemoveInternalTimer("valveTmr:$vId");
CUL_HM_UpdtReadSingle($hash,"valveCtrl","restart",1) if (ReadingsVal($name,"valvePosTC",""));
InternalTimer(ReadingsVal($name,".next",1) InternalTimer(ReadingsVal($name,".next",1)
,"CUL_HM_valvePosUpdt","valvePos:$vId",0); ,"CUL_HM_valvePosUpdt","valvePos:$vId",0);
} }
@ -1281,8 +1283,7 @@ sub CUL_HM_Parse($$) {#########################################################
($mTp eq "10" && $p =~ m/^06/)) { # or Info_Status message here ($mTp eq "10" && $p =~ m/^06/)) { # or Info_Status message here
my $rSUpdt = 0;# require status update my $rSUpdt = 0;# require status update
my ($subType,$chn,$val,$err) = ($1,hex($2),hex($3)/2,hex($4)) my ($subType,$chn,$val,$err) = ($mI[0],hex($mI[1]),hex($mI[2])/2,hex($mI[3]));
if($p =~ m/^(..)(..)(..)(..)/);
$chn = sprintf("%02X",$chn&0x3f); $chn = sprintf("%02X",$chn&0x3f);
my $chId = $src.$chn; my $chId = $src.$chn;
$shash = $modules{CUL_HM}{defptr}{$chId} $shash = $modules{CUL_HM}{defptr}{$chId}
@ -1334,11 +1335,18 @@ sub CUL_HM_Parse($$) {#########################################################
&& !($err&0x70)){ #stopped and not timedOn && !($err&0x70)){ #stopped and not timedOn
if ($mI[2] ne $shash->{helper}{dlvl}){#level not met, repeat if ($mI[2] ne $shash->{helper}{dlvl}){#level not met, repeat
Log3 $name,3,"CUL_HM $name repeat, level $mI[2] instead of $shash->{helper}{dlvl}"; Log3 $name,3,"CUL_HM $name repeat, level $mI[2] instead of $shash->{helper}{dlvl}";
CUL_HM_PushCmdStack($shash,$shash->{helper}{dlvlCmd}); if ($shash->{helper}{dlvlCmd}){# first try
CUL_HM_ProcessCmdStack($shash); CUL_HM_PushCmdStack($shash,$shash->{helper}{dlvlCmd});
CUL_HM_ProcessCmdStack($shash);
delete $shash->{helper}{dlvlCmd};# will prevent second try
}
else{# no second try - alarm and stop
push @event,"levelMissed:desired:".hex($shash->{helper}{dlvl})/2;
delete $shash->{helper}{dlvl};# we only make one attempt
}
} }
else{ else{
delete $shash->{helper}{dlvl}; delete $shash->{helper}{dlvl};# we only make one attempt
} }
} }
if ($st ne "switch"){ if ($st ne "switch"){
@ -1443,13 +1451,26 @@ sub CUL_HM_Parse($$) {#########################################################
$shash = $modules{CUL_HM}{defptr}{$src."02"} $shash = $modules{CUL_HM}{defptr}{$src."02"}
if($modules{CUL_HM}{defptr}{$src."02"}); if($modules{CUL_HM}{defptr}{$src."02"});
my ($eCnt,$P,$I,$U,$F) = map{hex($_)} unpack 'A6A6A4A4A2',$p; my ($eCnt,$P,$I,$U,$F) = map{hex($_)} unpack 'A6A6A4A4A2',$p;
push @event, "energy:" .($eCnt&0x7fffff)/10;# 0.0 ..838860.7 Wh $eCnt = ($eCnt&0x7fffff)/10; #0.0 ..838860.7 Wh
push @event, "power:" . $P /100; # 0.0 ..167772.15 W $P = $P /100; #0.0 ..167772.15 W
push @event, "current:" . $I /1; # 0.0 ..65535.0 mA $I = $I /1; #0.0 ..65535.0 mA
push @event, "voltage:" . $U /10; # 0.0 ..6553.5 mV $U = $U /10; #0.0 ..6553.5 mV
$F = hex($F);$F -= 256 if ($F > 127); $F = hex($F);$F -= 256 if ($F > 127);
push @event, "frequency:".($F/100+50); # 48.72..51.27 Hz $F = $F/100+50; # 48.72..51.27 Hz
push @event, "energy:" .$eCnt;
push @event, "power:" .$P;
push @event, "current:" .$I;
push @event, "voltage:" .$U;
push @event, "frequency:".$F;
push @event, "boot:" .(($eCnt&0x800000)?"on":"off"); push @event, "boot:" .(($eCnt&0x800000)?"on":"off");
push @entities,CUL_HM_UpdtReadSingle($defs{$devHash->{channel_02}},'state',$eCnt,1) if ($devHash->{channel_02});
push @entities,CUL_HM_UpdtReadSingle($defs{$devHash->{channel_03}},'state',$P ,1) if ($devHash->{channel_03});
push @entities,CUL_HM_UpdtReadSingle($defs{$devHash->{channel_04}},'state',$I ,1) if ($devHash->{channel_04});
push @entities,CUL_HM_UpdtReadSingle($defs{$devHash->{channel_05}},'state',$U ,1) if ($devHash->{channel_05});
push @entities,CUL_HM_UpdtReadSingle($defs{$devHash->{channel_06}},'state',$F ,1) if ($devHash->{channel_06});
if($eCnt == 0 && $mTp eq "5E" && hex($mNo) < 3 ){ if($eCnt == 0 && $mTp eq "5E" && hex($mNo) < 3 ){
push @entities,CUL_HM_UpdtReadSingle($devHash,'powerOn',"-",1); push @entities,CUL_HM_UpdtReadSingle($devHash,'powerOn',"-",1);
push @event, "energyOffset:".ReadingsVal($shash->{NAME},"energy",0)+ push @event, "energyOffset:".ReadingsVal($shash->{NAME},"energy",0)+
@ -2342,30 +2363,27 @@ sub CUL_HM_updtSDTeam(@){#in: TeamName, optional caller name and its new state
} }
return CUL_HM_UpdtReadSingle($defs{$name},"state",$dStat,1); return CUL_HM_UpdtReadSingle($defs{$name},"state",$dStat,1);
} }
#+++++++++++++++++ get command+++++++++++++++++++++++++++++++++++++++++++++++++
sub CUL_HM_Get($@) { sub CUL_HM_Get($@) {#+++++++++++++++++ get command+++++++++++++++++++++++++++++
my ($hash, @a) = @_; my ($hash, @a) = @_;
return "no get value specified" if(@a < 2); return "no value specified" if(@a < 2);
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my $devName = InternalVal($name,"device",$name); my $devName = InternalVal($name,"device",$name);
my $st = AttrVal($devName, "subType", ""); my $st = AttrVal($devName, "subType", "");
my $md = AttrVal($devName, "model", ""); my $md = AttrVal($devName, "model", "");
my $mId = CUL_HM_getMId($hash);
my $cmd = $a[1]; my $cmd = $a[1];
my $dst = $hash->{DEF}; my ($dst,$chn) = unpack 'A6A2',$hash->{DEF}.'01';#default to chn 01 for dev
return "" if (!$dst); return "" if (!defined $chn);
my $isChannel = (length($dst) == 8)?"true":"";
my $chn = ($isChannel)?substr($dst,6,2):"01";
$dst = substr($dst,0,6);
my $roleC = $hash->{helper}{role}{chn}?1:0; #entity may act in multiple roles my $roleC = $hash->{helper}{role}{chn}?1:0; #entity may act in multiple roles
my $roleD = $hash->{helper}{role}{dev}?1:0; my $roleD = $hash->{helper}{role}{dev}?1:0;
my $roleV = $hash->{helper}{role}{vrt}?1:0; my $roleV = $hash->{helper}{role}{vrt}?1:0;
my $fkt = $hash->{helper}{fkt}?$hash->{helper}{fkt}:""; my $fkt = $hash->{helper}{fkt}?$hash->{helper}{fkt}:"";
my $h = $culHmGlobalGets->{$cmd}; my $h = undef;
$h = $culHmGlobalGets->{$cmd};
$h = $culHmSubTypeGets->{$st}{$cmd} if(!defined($h) && $culHmSubTypeGets->{$st}); $h = $culHmSubTypeGets->{$st}{$cmd} if(!defined($h) && $culHmSubTypeGets->{$st});
$h = $culHmModelGets->{$md}{$cmd} if(!defined($h) && $culHmModelGets->{$md}); $h = $culHmModelGets->{$md}{$cmd} if(!defined($h) && $culHmModelGets->{$md});
my @h; my @h;
@ -2546,36 +2564,32 @@ sub CUL_HM_Get($@) {
CUL_HM_ProcessCmdStack($devHash) if ($rxType & 0x03);#burst/all CUL_HM_ProcessCmdStack($devHash) if ($rxType & 0x03);#burst/all
return ""; return "";
} }
sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++
#+++++++++++++++++ set command+++++++++++++++++++++++++++++++++++++++++++++++++
sub CUL_HM_Set($@) {
my ($hash, @a) = @_; my ($hash, @a) = @_;
return "no value specified" if(@a < 2);
my $act = join(" ", @a[1..$#a]); my $act = join(" ", @a[1..$#a]);
my $ret;
return "no set value specified" if(@a < 2);
my $name = $hash->{NAME}; my $name = $hash->{NAME};
return "device ignored due to attr 'ignore'" return "device ignored due to attr 'ignore'"
if (CUL_HM_getAttrInt($name,"ignore")); if (CUL_HM_getAttrInt($name,"ignore"));
my $devName = InternalVal($name,"device",$name); my $devName = InternalVal($name,"device",$name);
my $st = AttrVal($devName, "subType", ""); my $st = AttrVal($devName, "subType", "");
my $md = AttrVal($devName, "model" , ""); my $md = AttrVal($devName, "model" , "");
my $flag = CUL_HM_getFlag($hash); #set burst flag my $flag = CUL_HM_getFlag($hash); #set burst flag
my $cmd = $a[1]; my $cmd = $a[1];
my $dst = $hash->{DEF}; my ($dst,$chn) = unpack 'A6A2',$hash->{DEF}.'01';#default to chn 01 for dev
my $isChannel = (length($dst) == 8)?"true":""; return "" if (!defined $chn);
my $chn = ($isChannel)?substr($dst,6,2):"01";
$dst = substr($dst,0,6);
my $roleC = $hash->{helper}{role}{chn}?1:0; #entity may act in multiple roles my $roleC = $hash->{helper}{role}{chn}?1:0; #entity may act in multiple roles
my $roleD = $hash->{helper}{role}{dev}?1:0; my $roleD = $hash->{helper}{role}{dev}?1:0;
my $roleV = $hash->{helper}{role}{vrt}?1:0; my $roleV = $hash->{helper}{role}{vrt}?1:0;
my $mdCh = $md.($isChannel?$chn:"00"); # chan specific commands? my $fkt = $hash->{helper}{fkt}?$hash->{helper}{fkt}:"";
my $fkt = $hash->{helper}{fkt}?$hash->{helper}{fkt}:"";
my $h = undef; my $h = undef;
$h = $culHmGlobalSets->{$cmd} if( $st ne "virtual"); $h = $culHmGlobalSets->{$cmd} if( !$roleV);
$h = $culHmGlobalSetsVrtDev->{$cmd} if(!defined($h) &&($st eq "virtual"||!$st) && $roleD); $h = $culHmGlobalSetsVrtDev->{$cmd} if(!defined($h) &&( $roleV || !$st) && $roleD);
$h = $culHmGlobalSetsDevice->{$cmd} if(!defined($h) && $st ne "virtual" && $roleD); $h = $culHmGlobalSetsDevice->{$cmd} if(!defined($h) && !$roleV && $roleD);
$h = $culHmSubTypeDevSets->{$st}{$cmd}if(!defined($h) && $st ne "virtual" && $roleD); $h = $culHmSubTypeDevSets->{$st}{$cmd}if(!defined($h) && !$roleV && $roleD);
$h = $culHmGlobalSetsChn->{$cmd} if(!defined($h) && $st ne "virtual" && $roleC); $h = $culHmGlobalSetsChn->{$cmd} if(!defined($h) && !$roleV && $roleC);
$h = $culHmSubTypeSets->{$st}{$cmd} if(!defined($h) && $culHmSubTypeSets->{$st} && $roleC); $h = $culHmSubTypeSets->{$st}{$cmd} if(!defined($h) && $culHmSubTypeSets->{$st} && $roleC);
$h = $culHmModelSets->{$md}{$cmd} if(!defined($h) && $culHmModelSets->{$md} ); $h = $culHmModelSets->{$md}{$cmd} if(!defined($h) && $culHmModelSets->{$md} );
$h = $culHmChanSets->{$md."00"}{$cmd} if(!defined($h) && $culHmChanSets->{$md."00"} && $roleD); $h = $culHmChanSets->{$md."00"}{$cmd} if(!defined($h) && $culHmChanSets->{$md."00"} && $roleD);
@ -2718,9 +2732,8 @@ sub CUL_HM_Set($@) {
$cmd = $a[1];# get converted command $cmd = $a[1];# get converted command
#if chn cmd is executed on device but refers to a channel? #if chn cmd is executed on device but refers to a channel?
my $chnHash = (!$roleC && $modules{CUL_HM}{defptr}{$dst."01"})?
my $chnHash = (!$isChannel && $modules{CUL_HM}{defptr}{$dst."01"})?
$modules{CUL_HM}{defptr}{$dst."01"}:$hash; $modules{CUL_HM}{defptr}{$dst."01"}:$hash;
my $devHash = CUL_HM_getDeviceHash($hash); my $devHash = CUL_HM_getDeviceHash($hash);
my $state = "set_".join(" ", @a[1..(int(@a)-1)]); my $state = "set_".join(" ", @a[1..(int(@a)-1)]);
@ -3143,7 +3156,7 @@ sub CUL_HM_Set($@) {
elsif($cmd eq "display") { ################################################## elsif($cmd eq "display") { ##################################################
my (undef,undef,undef,$t,$c,$u,$snd,$blk,$symb) = @_; my (undef,undef,undef,$t,$c,$u,$snd,$blk,$symb) = @_;
return "cmd only possible for device or its display channel" return "cmd only possible for device or its display channel"
if ($isChannel && $chn ne "12"); if ($roleC && $chn ne "12");
my %symbol=(off => 0x0000, my %symbol=(off => 0x0000,
bulb =>0x0100,switch =>0x0200,window =>0x0400,door=>0x0800, bulb =>0x0100,switch =>0x0200,window =>0x0400,door=>0x0800,
blind=>0x1000,scene =>0x2000,phone =>0x4000,bell=>0x8000, blind=>0x1000,scene =>0x2000,phone =>0x4000,bell=>0x8000,
@ -3403,6 +3416,7 @@ sub CUL_HM_Set($@) {
} }
elsif($cmd =~ m/^(valvePos|virtTemp|virtHum)$/) { ########################### elsif($cmd =~ m/^(valvePos|virtTemp|virtHum)$/) { ###########################
my $valu = $a[2]; my $valu = $a[2];
my %lim = (valvePos =>{min=>0 ,max=>99 ,rd =>"valvePosTC" ,u =>" %"}, my %lim = (valvePos =>{min=>0 ,max=>99 ,rd =>"valvePosTC" ,u =>" %"},
virtTemp =>{min=>-20,max=>50 ,rd =>"temperature",u =>"" }, virtTemp =>{min=>-20,max=>50 ,rd =>"temperature",u =>"" },
virtHum =>{min=>0 ,max=>99 ,rd =>"humidity" ,u =>"" },); virtHum =>{min=>0 ,max=>99 ,rd =>"humidity" ,u =>"" },);
@ -3809,17 +3823,17 @@ sub CUL_HM_valvePosUpdt(@) {#update valve position periodically to please valve
if ($hashVd->{cmd}){ if ($hashVd->{cmd}){
if ($hashVd->{typ} == 1){ if ($hashVd->{typ} == 1){
my $vc = ReadingsVal($name,"valveCtrl","init"); my $vc = ReadingsVal($name,"valveCtrl","init");
if ( $vc ne 'restart' if ($vc eq 'restart'){
&&(( $vc ne "init" CUL_HM_UpdtReadSingle($hash,"valveCtrl","unknown",1)
&& $hashVd->{msgRed} <= $hashVd->{miss}) }
|| $hash->{helper}{virtTC} ne "00")) { elsif( ($vc ne "init" && $hashVd->{msgRed} <= $hashVd->{miss})
$hashVd->{msgSent} = 1; || $hash->{helper}{virtTC} ne "00") {
$hashVd->{nextL} = $tn;#last send $hashVd->{msgSent} = 1;
CUL_HM_PushCmdStack($hash,sprintf("%02X%s%s%s" CUL_HM_PushCmdStack($hash,sprintf("%02X%s%s%s"
,$msgCnt ,$msgCnt
,$hashVd->{cmd} ,$hashVd->{cmd}
,$hash->{helper}{virtTC} ,$hash->{helper}{virtTC}
,$hashVd->{val})); ,$hashVd->{val}));
} }
InternalTimer($tn+10,"CUL_HM_valvePosTmr","valveTmr:$vId",0); InternalTimer($tn+10,"CUL_HM_valvePosTmr","valveTmr:$vId",0);
} }