Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-01 20:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

HMInfo: change log-level, correct get showChilds parameter association

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@25978 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2022-04-18 14:50:17 +00:00
parent 7b61c065e0
commit d1c5f43c4a
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
FHEM/98_HMinfo.pm
View File

@ -273,7 +273,6 @@ sub HMinfo_init($){############################################################
my ($hm) = devspec2array("TYPE=HMinfo"); my ($hm) = devspec2array("TYPE=HMinfo");
Log3($hm,5,"debug: HMinfo_init"); Log3($hm,5,"debug: HMinfo_init");
foreach my $attrName (keys %{$attr{$hm}}){ foreach my $attrName (keys %{$attr{$hm}}){
#Log 1," update HM attributes - will update CUL_HM settings ocationally";
HMinfo_Attr("set",$hm, $attrName,$attr{$hm}{$attrName}); HMinfo_Attr("set",$hm, $attrName,$attr{$hm}{$attrName});
} }
@ -1266,7 +1265,7 @@ sub HMinfo_getCfgDefere($){####################################################
sub HMinfo_startBlocking(@){################################################### sub HMinfo_startBlocking(@){###################################################
my ($name,$fkt,$param) = @_; my ($name,$fkt,$param) = @_;
my $hash = $defs{$name}; my $hash = $defs{$name};
Log3 $hash,5,"HMinfo $name start blocking:$fkt"; Log3 $hash,4,"HMinfo $name start blocking:$fkt";
my $id = ++$hash->{nb}{cnt}; my $id = ++$hash->{nb}{cnt};
my $bl = BlockingCall($fkt, "$name;$id;$hash->{CL}{NAME},$param", my $bl = BlockingCall($fkt, "$name;$id;$hash->{CL}{NAME},$param",
"HMinfo_bpPost", 30, "HMinfo_bpPost", 30,
@ -1792,7 +1791,7 @@ sub HMinfo_GetFn($@) {#########################################################
$tfnm = $cv->GV->NAME if ($cv); $tfnm = $cv->GV->NAME if ($cv);
} }
if (!defined($ats->{TRIGGERTIME})) { #noansi: just for debugging if (!defined($ats->{TRIGGERTIME})) { #noansi: just for debugging
Log3 $hash,0,'HMinfo '.$name.' showTimer undefined TRIGGERTIME:' Log3 $hash,2,'HMinfo '.$name.' showTimer undefined TRIGGERTIME:'
.(defined($ats->{atNr})?' atNr:'.$ats->{atNr}:'') .(defined($ats->{atNr})?' atNr:'.$ats->{atNr}:'')
.' FN:'.$tfnm .' FN:'.$tfnm
.' ARG:'.$ats->{ARG}; .' ARG:'.$ats->{ARG};
@ -1814,7 +1813,7 @@ sub HMinfo_GetFn($@) {#########################################################
elsif($cmd eq "showChilds"){ elsif($cmd eq "showChilds"){
my ($type) = @a; my ($type) = @a;
$type = "all" if(!$type); $type = "all" if(!$type);
if ($type eq "all"){ if ($type ne "all"){
$ret = "BlockingCalls:\n".join("\nnext:----------\n", $ret = "BlockingCalls:\n".join("\nnext:----------\n",
map {(my $foo = $_) =~ s/(Pid:|Fn:|Arg:|Timeout:|ConnectedVia:)/\n $1/g; $foo;} map {(my $foo = $_) =~ s/(Pid:|Fn:|Arg:|Timeout:|ConnectedVia:)/\n $1/g; $foo;}
grep /(CUL_HM|HMinfo)/,BlockingInfo(undef,undef)); grep /(CUL_HM|HMinfo)/,BlockingInfo(undef,undef));
@ -2045,7 +2044,7 @@ sub HMinfo_SetFn($@) {#########################################################
CUL_HM_assignIO($defs{$simName}); CUL_HM_assignIO($defs{$simName});
my $id = $HMConfig::culHmModel2Id{$model}; my $id = $HMConfig::culHmModel2Id{$model};
Log 1,"testdevice my $id, $model"; Log 4,"testdevice my $id, $model";
CUL_HM_Parse($defs{ioPCB},"A00018400${hmId}00000010${id}4D592D434F464645453612060100"."::::"); CUL_HM_Parse($defs{ioPCB},"A00018400${hmId}00000010${id}4D592D434F464645453612060100"."::::");
CUL_HM_Set($defs{$simName},$simName,"clear","msgEvents"); CUL_HM_Set($defs{$simName},$simName,"clear","msgEvents");
@ -2431,7 +2430,7 @@ sub HMinfo_loadConfig($$@) {###################################################
} }
} }
} }
Log3 $hash,4,"HMinfo load config file:$fName" Log3 $hash,5,"HMinfo load config file:$fName"
."\n templateReDefinition:$cntTStart" ."\n templateReDefinition:$cntTStart"
."\n templateDef:$cntDef" ."\n templateDef:$cntDef"
."\n templateSet:$cntSet" ."\n templateSet:$cntSet"
@ -3691,7 +3690,7 @@ sub HMinfo_noDup(@) {#return list with no duplicates###########################
<li><B>entities</B> comma separated list of entities which refers to the temp lists following. <li><B>entities</B> comma separated list of entities which refers to the temp lists following.
The actual entity holding the templist must be given - which is channel 04 for RTs or channel 02 for TCs</li> The actual entity holding the templist must be given - which is channel 04 for RTs or channel 02 for TCs</li>
<li><B>tempList...</B> time and temp couples as used in the set tempList commands</li> <li><B>tempList...</B> time and temp couples as used in the set tempList commands</li>
<li><B>simDev -model-</B> simulate a device</li> <li><a id="HMinfo-simDev"><B>simDev -model-</B></a> simulate a device</li>
</ul> </ul>
<i>tempListG</i> (for all devices) <i>tempListG</i> (for all devices)
<br> <br>