FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-04 11:26:55 +00:00
Code Issues Releases Wiki Activity

CUL_HM:update "press" comamnd and parsing - especially for virtuals. Minor fixes

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@22799 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2020-09-20 09:34:50 +00:00
parent 2fc9b29da4
commit a4c9280635
1 changed files with 62 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
fhem/FHEM/10_CUL_HM.pm
View File

@ -1130,7 +1130,7 @@ sub CUL_HM_Attr(@) {#################################
foreach my $IOname (@IOlst){ foreach my $IOname (@IOlst){
next if ( !defined $defs{$IOname}); next if ( !defined $defs{$IOname});
next if ( $modules{$defs{$IOname}{TYPE}}{AttrList} !~ m/logIDs/); next if ( $modules{$defs{$IOname}{TYPE}}{AttrList} !~ m/logIDs/);
CommandAttr(undef, "$IOname logIDs $newVal"); my $r = CommandAttr(undef, "$IOname logIDs $newVal");
} }
} }
} }
@ -3943,8 +3943,8 @@ sub CUL_HM_Get($@) {#+++++++++++++++++ get command+++++++++++++++++++++++++++++
return "" if(!$hash->{NAME}); return "" if(!$hash->{NAME});
my $name = $hash->{NAME}; my $name = $hash->{NAME};
return "" # return ""
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 = defined $defs{$devName}{helper}{mId} ? $culHmModel->{$defs{$devName}{helper}{mId}}{st} : AttrVal($devName, "subType", ""); my $st = defined $defs{$devName}{helper}{mId} ? $culHmModel->{$defs{$devName}{helper}{mId}}{st} : AttrVal($devName, "subType", "");
@ -4013,6 +4013,7 @@ sub CUL_HM_Get($@) {#+++++++++++++++++ get command+++++++++++++++++++++++++++++
} }
@cmdPrep = ("--") if (!scalar @cmdPrep); @cmdPrep = ("--") if (!scalar @cmdPrep);
my $usg = "Unknown argument $cmd, choose one of ".join(" ",sort @cmdPrep)." "; my $usg = "Unknown argument $cmd, choose one of ".join(" ",sort @cmdPrep)." ";
Log3 $name,(defined $modules{CUL_HM}{helper}{verbose}{allGetVerb} ? 0:5),"CUL_HM get $name $cmd";
return $usg; return $usg;
} }
@ -4387,15 +4388,19 @@ sub CUL_HM_SetList($$) {#+++++++++++++++++ get command basic list+++++++++++++++
$hash->{helper}{cmds}{lst}{condition} = join(",",sort grep /./,@cond); $hash->{helper}{cmds}{lst}{condition} = join(",",sort grep /./,@cond);
$hash->{helper}{cmds}{lst}{peer} = join",",sort grep/./,split",",InternalVal($name,"peerList",""); $hash->{helper}{cmds}{lst}{peer} = join",",sort grep/./,split",",InternalVal($name,"peerList","");
if ($peerLst ne ""){
if (grep /^press:/,@arr1){ if (grep /^press:/,@arr1){
if ($roleV){
push @arr1,"pressS:[(-peer-|{all})]";
push @arr1,"pressL:[(-peer-|{all})]";
}
elsif ($peerLst ne ""){
push @arr1,"pressS:[(-peer-|{self})]"; push @arr1,"pressS:[(-peer-|{self})]";
push @arr1,"pressL:[(-peer-|{self})]"; push @arr1,"pressL:[(-peer-|{self})]";
} }
}
else{#remove command else{#remove command
@arr1 = grep !/(trg|)(press|event|Press|Event)[SL]\S*?/,@arr1; @arr1 = grep !/(trg|)(press|event|Press|Event)[SL]\S*?/,@arr1;
} }
}
delete $hash->{helper}{cmds}{cmdList} ; delete $hash->{helper}{cmds}{cmdList} ;
foreach(@arr1){ foreach(@arr1){
@ -4454,7 +4459,6 @@ sub CUL_HM_SearchCmd($$) {#+++++++++++++++++ is command supported?++++++++++++++
} }
sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++
my ($hash, @a) = @_; my ($hash, @a) = @_;
# my $T0 = gettimeofday(); # my $T0 = gettimeofday();
@ -4566,6 +4570,7 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++
push @cmdPrep,"$cmdS$val"; push @cmdPrep,"$cmdS$val";
} }
@cmdPrep = ("--") if (!scalar @cmdPrep); @cmdPrep = ("--") if (!scalar @cmdPrep);
Log3 $name,(defined $modules{CUL_HM}{helper}{verbose}{allSetVerb} ? 0:5),"CUL_HM set $name $cmd";
return "Unknown argument $cmd, choose one of ".join(" ",@cmdPrep)." "; return "Unknown argument $cmd, choose one of ".join(" ",@cmdPrep)." ";
} }
@ -6213,72 +6218,77 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++
} }
elsif($cmd =~ m/^(press|event)/) { ##################################### elsif($cmd =~ m/^(press|event)/) { #####################################
#press =>"-peer- [-repCount(long only)-] [-repDelay-] ..." #press =>"[(long|{short})] [(-peer-|{all})] [(-repCount-|{0})] [(-repDelay-|{0.25})]"
#event =>"-peer- -cond- [-repCount(long only)-] [-repDelay-] ..." #press =>"[(long|{short})] [(noBurst|{Burst})] [(-peer-|{all})] [(-repCount-|{0})] [(-repDelay-|{0.25})]"
#press[LS] =>"-peer-"
#event[LS] =>"-peer- -cond-"
my ($trig,$type,$peer ,$cond,$mode,$modeCode,$repCnt,$repDly) = my ($trig,$type,$peer ,$cond,$mode,$modeCode,$repCnt,$repDly,$Burst) =
($1 ,"S" ,"self".$chn,"" ,0 ,"40" ,0 ,0.25) ;#defaults ($1 ,"S" ,"self".$chn,"" ,0 ,"40" ,1 ,0.25 ,1) ;#defaults
if ($cmd =~ m/^(press|event)(L|S)/){# set short/long and remove from Params if ($cmd =~ m/^(press|event)(L|S)/){# set short/long and remove from Params
$type = $2; $type = $2;
foreach(2,3,4,5,6){$a[$_] = "noArg" if(!defined $a[$_])}
} }
else{ else{
if (defined $a[2]){
if ($a[2] eq "long") {$type = "L";splice @a,2,1;} if ($a[2] eq "long") {$type = "L";splice @a,2,1;}
elsif($a[2] eq "short"){$type = "S";splice @a,2,1;} elsif($a[2] eq "short"){$type = "S";splice @a,2,1;}
# remove long/short
}
} }
if (defined $a[2] && $a[2] ne "noArg"){ # set peer and remove from Param list $peer = $a[2] if ($a[2] ne "noArg");
$peer = $a[2]; splice @a,2,1; # remove long/short or (no)Burst
splice @a,2,1; # remove long/short
if ($roleV){ # burst (just for virtuals) could be given
$Burst = 0 if($a[2] eq "noBurst");
splice @a,2,1; # remove long/short or (no)Burst
} }
if ($type eq "event"){# set condition for event (blank for press) if ($type eq "event"){# set condition for event (blank for press)
$modeCode = "41"; $modeCode = "41";
if (defined $a[2] && ($a[2] < 0 || $a[2] > 255)){ if ($a[2] < 0 || $a[2] > 255){
$cond = sprintf("%02X",$a[2]); $cond = sprintf("%02X",$a[2]);
} }
else{ else{
return "event requires a condition between 0 and 255"; return "event requires a condition between 0 and 255";
} }
} }
else{# type = press
if($type eq "L"){# set timing if releated if($type eq "L"){# set timing if releated
$mode = 64; $mode = 64;
if (defined $a[2]){# set $repCnt if($a[2] ne "noArg"){
return "repeat count must be numeric:$a[2] is illegal" if ($a[2] !~ m/^\d*$/); return "repeat count must be numeric:$a[2] is illegal" if ($a[2] !~ m/^\d*$/);
$repCnt = $a[2]; $repCnt = $a[2];
}
splice @a,2,1; # remove repeat count splice @a,2,1; # remove repeat count
}
else{ if($a[2] ne "noArg"){
$repCnt = 1;
}
if (defined $a[2]){# set $repDly
return "repeatDelay count must be numeric e.g. 0.25:$a[2] is illegal" if ($a[2] !~ m/^\d*\.?\d+$/); return "repeatDelay count must be numeric e.g. 0.25:$a[2] is illegal" if ($a[2] !~ m/^\d*\.?\d+$/);
$repDly = $a[2]; $repDly = $a[2];
splice @a,2,1; # remove repeat count
} }
else{ splice @a,2,1; # remove repeat count
$repDly = 0.25;
} }
} }
$hash->{helper}{count} = (!$hash->{helper}{count} ? 1 $hash->{helper}{count} = (!$hash->{helper}{count} ? 1
: $hash->{helper}{count}+1)%256; : $hash->{helper}{count}+1)%256;
if ($roleV){#serve all peers of virtual button if ($roleV){#serve all peers of virtual button
my @peerLchn = split(',',AttrVal($name,"peerIDs","")); $peer = ".*" if ($peer eq "all");
my @peerList = map{substr($_,0,6)} @peerLchn; # peer device IDs my @peerLchn = map{CUL_HM_name2Id($_)}
@peerList = grep !/000000/,grep !/^$/,CUL_HM_noDup(@peerList); # peer device IDs - clean grep/$peer/,
split(',',InternalVal($name,"peerList",""));
my @peerList = grep !/000000/,grep !/^$/
,CUL_HM_noDup(map{substr($_,0,6)} @peerLchn); # peer device IDs - clean
my $pc = sprintf("%02X%02X",hex($chn)+$mode,$hash->{helper}{count});# msg end my $pc = sprintf("%02X%02X",hex($chn)+$mode,$hash->{helper}{count});# msg end
my $snd = 0; my $snd = 0;
my @trigDest;
foreach my $peerDev (@peerList){# send once to each device (not each channel) foreach my $peerDev (@peerList){# send once to each device (not each channel)
my $pHash = CUL_HM_id2Hash($peerDev); my $pHash = CUL_HM_id2Hash($peerDev);
next if ( !$pHash next if ( !$pHash
|| !$pHash->{helper}{role} || !$pHash->{helper}{role}
|| !$pHash->{helper}{role}{prs}); || !$pHash->{helper}{role}{prs});
my $rxt = CUL_HM_getRxType($pHash); my $rxt = CUL_HM_getRxType($pHash);
$rxt = $rxt & 0x7d if (!$Burst); # if noBurst is requested just stript this options
my $peerFlag = ($rxt & 0x02) ? "B4" : "A4"; #burst my $peerFlag = ($rxt & 0x02) ? "B4" : "A4"; #burst
CUL_HM_PushCmdStack($pHash,"++${peerFlag}$modeCode$dst$peerDev$pc"); CUL_HM_PushCmdStack($pHash,"++${peerFlag}$modeCode$dst$peerDev$pc");
$snd = 1; $snd = 1;
@ -6288,6 +6298,7 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++
$n =~ s/_chn-\d\d$//; $n =~ s/_chn-\d\d$//;
delete $defs{$n}{helper}{dlvl};#stop desiredLevel supervision delete $defs{$n}{helper}{dlvl};#stop desiredLevel supervision
CUL_HM_stateUpdatDly($n,10); CUL_HM_stateUpdatDly($n,10);
push @trigDest,$n;
} }
if ($rxt & 0x80){#burstConditional if ($rxt & 0x80){#burstConditional
CUL_HM_SndCmd($pHash, "++B112$id".$peerDev); CUL_HM_SndCmd($pHash, "++B112$id".$peerDev);
@ -6297,8 +6308,15 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++
} }
} }
if(!$snd){# send 2 broadcast if no relevant peers if(!$snd){# send 2 broadcast if no relevant peers
push @trigDest,"broadcast";
CUL_HM_SndCmd($hash,"++8440${dst}000000$pc"); CUL_HM_SndCmd($hash,"++8440${dst}000000$pc");
} }
my $readVal = ($type eq "S" ? "short":"long")
.($Burst ? "" :" :noBurst")
.($type eq "S" ? "" :" count:$repCnt dly:$repDly")
." cnt: $hash->{helper}{count}"
;
CUL_HM_UpdtReadBulk($hash,1,map{"${trig}_$_:$readVal"} @trigDest);
} }
else{#serve internal channels for actor else{#serve internal channels for actor
my ($pDev,$pCh) = unpack 'A6A2',CUL_HM_name2Id($peer,$devHash)."01"; my ($pDev,$pCh) = unpack 'A6A2',CUL_HM_name2Id($peer,$devHash)."01";
@ -8016,6 +8034,7 @@ sub CUL_HM_protState($$){
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my $sProcIn = $hash->{helper}{prt}{sProc}; my $sProcIn = $hash->{helper}{prt}{sProc};
$sProcIn = 0 if(!defined $sProcIn);
if ($sProcIn == 3){#FW update processing if ($sProcIn == 3){#FW update processing
# do not change state - commandstack is bypassed # do not change state - commandstack is bypassed
return if ( $state !~ m/(Info_Cleared|_FWupdate)/); return if ( $state !~ m/(Info_Cleared|_FWupdate)/);