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

CUL_HM:improve template-commands refresh. Commandlist will be updated more frequent and with every get <entity> cmdList

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@22021 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2020-05-24 08:43:32 +00:00
parent 6ed0c7a38f
commit a89f8cc521
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fhem/FHEM/10_CUL_HM.pm
View File

@ -3976,6 +3976,7 @@ sub CUL_HM_Get($@) {#+++++++++++++++++ get command+++++++++++++++++++++++++++++
my $info .= " Gets ------\n"; my $info .= " Gets ------\n";
$info .= join("\n",sort @arr); $info .= join("\n",sort @arr);
$info .= "\n\n Sets ------\n"; $info .= "\n\n Sets ------\n";
$hash->{helper}{cmds}{TmplTs}=gettimeofday();# force re-arrange of template commands
$info .= join("\n",map{if($_ !~ m/]../){(my $foo = $_) =~ s/\|/\n\t/g; $foo;}else{$_}} sort (CUL_HM_SetList($name))); $info .= join("\n",map{if($_ !~ m/]../){(my $foo = $_) =~ s/\|/\n\t/g; $foo;}else{$_}} sort (CUL_HM_SetList($name)));
#my $a = CUL_HMTmplSetCmd($name)." "; #my $a = CUL_HMTmplSetCmd($name)." ";
@ -4192,8 +4193,10 @@ sub CUL_HM_SetList($) {#+++++++++++++++++ get command basic list++++++++++++++++
$hash->{helper}{cmds}{cmdList} = \@arr1cmd; $hash->{helper}{cmds}{cmdList} = \@arr1cmd;
$hash->{helper}{cmds}{cmdKey} = $cmdKey; $hash->{helper}{cmds}{cmdKey} = $cmdKey;
} }
my $tmplStamp = CUL_HM_getTemplateModify(); my $tmplStamp = CUL_HM_getTemplateModify();
if( $hash->{helper}{cmds}{TmplKey} ne InternalVal($name,"peerList","").":".$tmplStamp){ my $tmplAssTs = (defined $hash->{helper}{cmds}{TmplTs} ? $hash->{helper}{cmds}{TmplTs}:"noAssTs");# template assign timestamp
if( $hash->{helper}{cmds}{TmplKey} ne InternalVal($name,"peerList","").":$tmplStamp:$tmplAssTs"){
my @arr1 = map{"$_:-value-"}split(" ",CUL_HMTmplSetParam($name)); my @arr1 = map{"$_:-value-"}split(" ",CUL_HMTmplSetParam($name));
push @arr1, map{(my $foo = $_) =~ s/:(.*)/:[$1]/; $foo;} push @arr1, map{(my $foo = $_) =~ s/:(.*)/:[$1]/; $foo;}
map{(my $foo = $_) =~ s/,/|/g; $foo;} map{(my $foo = $_) =~ s/,/|/g; $foo;}
@ -4203,6 +4206,7 @@ sub CUL_HM_SetList($) {#+++++++++++++++++ get command basic list++++++++++++++++
$hash->{helper}{cmds}{TmplKey} = InternalVal($name,"peerList","") $hash->{helper}{cmds}{TmplKey} = InternalVal($name,"peerList","")
.":$tmplStamp" .":$tmplStamp"
.":$tmplAssTs"
; ;
} }
@ -6490,7 +6494,7 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++
} }
} }
} }
################################################################################################################ ###############################################################################
elsif($cmd =~ m/^(pair|getVersion)$/) { #################################### elsif($cmd =~ m/^(pair|getVersion)$/) { ####################################
$state = ""; $state = "";
my $serial = ReadingsVal($name, "D-serialNr", undef); my $serial = ReadingsVal($name, "D-serialNr", undef);
@ -8477,6 +8481,7 @@ sub CUL_HM_chgExpLvl($){# update visibility and set internal values for expert
} }
sub CUL_HM_setTmplDisp($){ # remove register if outdated sub CUL_HM_setTmplDisp($){ # remove register if outdated
my $tHash = shift; my $tHash = shift;
$tHash->{helper}{cmds}{TmplTs} = gettimeofday(); #set marker to update command list
delete $tHash->{READINGS}{$_} foreach (grep /^tmpl_/ ,keys %{$tHash->{READINGS}}); delete $tHash->{READINGS}{$_} foreach (grep /^tmpl_/ ,keys %{$tHash->{READINGS}});
if ($tHash->{helper}{expert}{tpl} && (%HMConfig::culHmTpl)){ if ($tHash->{helper}{expert}{tpl} && (%HMConfig::culHmTpl)){
foreach (keys %{$tHash->{helper}{tmpl}}){ foreach (keys %{$tHash->{helper}{tmpl}}){