FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 03:06:37 +00:00
Code Issues Releases Wiki Activity

CUL_HM:search cmd corrected

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@22612 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2020-08-16 07:16:37 +00:00
parent b2682fdfeb
commit 0ac758ee5d
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
fhem/FHEM/10_CUL_HM.pm
View File

@ -271,7 +271,6 @@ sub CUL_HM_updateConfig($){##########################
CUL_HM_updtDeviceModel($_,AttrVal($_,"modelForce",AttrVal($_,"model","")),1) if($attr{$_}{".mId"}); CUL_HM_updtDeviceModel($_,AttrVal($_,"modelForce",AttrVal($_,"model","")),1) if($attr{$_}{".mId"});
} }
} }
foreach my $name (@{$modules{CUL_HM}{helper}{updtCfgLst}}){ foreach my $name (@{$modules{CUL_HM}{helper}{updtCfgLst}}){
my $hash = $defs{$name}; my $hash = $defs{$name};
next if (!$hash->{DEF}); # likely renamed next if (!$hash->{DEF}); # likely renamed
@ -4236,21 +4235,20 @@ sub CUL_HM_SetList($$) {#+++++++++++++++++ get command basic list+++++++++++++++
my $hash = $defs{$name}; my $hash = $defs{$name};
my $changes = 0; my $changes = 0;
if($hash->{helper}{cmds}{cmdKey} ne $cmdKey){ if(!$cmdKey){
if(!$cmdKey){ my $devName = InternalVal($name,"device",$name);
my $devName = InternalVal($name,"device",$name); my (undef,$chn) = unpack 'A6A2',$hash->{DEF}.'01';#default to chn 01 for dev
my (undef,$chn) = unpack 'A6A2',$hash->{DEF}.'01';#default to chn 01 for dev $cmdKey = ($hash->{helper}{role}{chn}?1:0)
$cmdKey = ($hash->{helper}{role}{chn}?1:0) .":".($hash->{helper}{role}{dev}?1:0)
.":".($hash->{helper}{role}{dev}?1:0) .":".($hash->{helper}{role}{vrt}?1:0)
.":".($hash->{helper}{role}{vrt}?1:0) .":".($hash->{helper}{fkt}?$hash->{helper}{fkt}:"")
.":".($hash->{helper}{fkt}?$hash->{helper}{fkt}:"") .":".$devName
.":".$devName .":".($defs{$devName}{helper}{mId} ? $defs{$devName}{helper}{mId}:"")
.":".($defs{$devName}{helper}{mId} ? $defs{$devName}{helper}{mId}:"") .":".$chn
.":".$chn .":".InternalVal($name,"peerList","")
.":".InternalVal($name,"peerList","") ;# update cmds entry in case
;# update cmds entry in case }
} if( $hash->{helper}{cmds}{cmdKey} ne $cmdKey){
my ($roleC,$roleD,$roleV,$fkt,$devName,$mId,$chn,$peerLst) = split(":", $cmdKey); my ($roleC,$roleD,$roleV,$fkt,$devName,$mId,$chn,$peerLst) = split(":", $cmdKey);
my $st = $mId ne "" ? $culHmModel->{$mId}{st} : AttrVal($devName, "subType", ""); my $st = $mId ne "" ? $culHmModel->{$mId}{st} : AttrVal($devName, "subType", "");
my $md = $mId ne "" ? $culHmModel->{$mId}{name} : AttrVal($devName, "model" , ""); my $md = $mId ne "" ? $culHmModel->{$mId}{name} : AttrVal($devName, "model" , "");
@ -4344,8 +4342,7 @@ sub CUL_HM_SetList($$) {#+++++++++++++++++ get command basic list+++++++++++++++
} }
sub CUL_HM_SearchCmd($$) {#+++++++++++++++++ is command supported?+++++++++++++++ sub CUL_HM_SearchCmd($$) {#+++++++++++++++++ is command supported?+++++++++++++++
my($name,$findCmd)=@_; my($name,$findCmd)=@_;
CUL_HM_SetList($name,"") if (!defined $defs{$name}{helper}{cmds}{cmdLst}); CUL_HM_SetList($name,"") if ($defs{$name}{helper}{cmds}{cmdKey} eq "");
# CUL_HM_Set($defs{$name},$name,"?") if (!defined $defs{$name}{helper}{cmds}{cmdLst});
return defined $defs{$name}{helper}{cmds}{cmdLst}{$findCmd} ? 1 : 0; return defined $defs{$name}{helper}{cmds}{cmdLst}{$findCmd} ? 1 : 0;
} }