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

98_HMinfo: uppercase model handling - some corrections

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@19179 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2019-04-14 09:51:26 +00:00
parent fc19b63579
commit 334d774042
1 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
fhem/FHEM/98_HMinfo.pm
View File

@ -637,7 +637,7 @@ sub HMinfo_burstCheck(@) { ####################################################
my $prxt = CUL_HM_getRxType($defs{$pn}); my $prxt = CUL_HM_getRxType($defs{$pn});
next if (!($prxt & 0x82)); # not a burst peer next if (!($prxt & 0x82)); # not a burst peer
my $pnb = ReadingsVal($eName,"R-$pn-peerNeedsBurst",ReadingsVal($eName,".R-$pn-peerNeedsBurst",undef)); my $pnb = ReadingsVal($eName,"R-$pn-peerNeedsBurst" ,ReadingsVal($eName,".R-$pn-peerNeedsBurst",undef));
if (!$pnb) {push @needBurstMiss, "$eName:$pn";} if (!$pnb) {push @needBurstMiss, "$eName:$pn";}
elsif($pnb !~ m /on/){push @needBurstFail, "$eName:$pn";} elsif($pnb !~ m /on/){push @needBurstFail, "$eName:$pn";}
@ -710,34 +710,13 @@ sub HMinfo_tempList(@) { ######################################################
my $ret; my $ret;
if ($action eq "save"){ if ($action eq "save"){
# foreach my $eN(HMinfo_getEntities("d")){#search and select channel
# my $md = AttrVal($eN,"model","");
# my $chN; #tempList channel name
# if ($md =~ m/(HM-CC-RT-DN-BoM|HM-CC-RT-DN)/){
# $chN = $defs{$eN}{channel_04};
# }
# elsif ($md =~ m/(ROTO_ZEL-STG-RM-FWT|HM-CC-TC|HM-TC-IT-WM-W-EU)/){
# $chN = $defs{$eN}{channel_02};
# }
# next if (!$chN || !$defs{$chN} || $chN !~ m/$filter/);
# print aSave "\nentities:$chN";
# my @tl = sort grep /tempList(P[123])?[SMFWT]/,keys %{$defs{$chN}{READINGS}};
# if (scalar @tl != 7 && scalar @tl != 21){
# print aSave "\nincomplete:$chN only data for ".join(",",@tl);
# push @incmpl,$chN;
# next;
# }
# foreach my $rd (@tl){
# print aSave "\n$rd>$defs{$chN}{READINGS}{$rd}{VAL}";
# }
# }
my @chList; my @chList;
my @storeList; my @storeList;
my @incmpl; my @incmpl;
foreach my $eN(HMinfo_getEntities("d")){#search and select channel foreach my $eN(HMinfo_getEntities("d")){#search and select channel
my $md = AttrVal($eN,"model",""); my $md = AttrVal($eN,"model","");
my $chN; #tempList channel name my $chN; #tempList channel name
if ($md =~ m/(HM-CC-RT-DN-BoM|HM-CC-RT-DN)/){ if ($md =~ m/(HM-CC-RT-DN-BOM|HM-CC-RT-DN)/){
$chN = $defs{$eN}{channel_04}; $chN = $defs{$eN}{channel_04};
} }
elsif ($md =~ m/(ROTO_ZEL-STG-RM-FWT|HM-CC-TC|HM-TC-IT-WM-W-EU)/){ elsif ($md =~ m/(ROTO_ZEL-STG-RM-FWT|HM-CC-TC|HM-TC-IT-WM-W-EU)/){
@ -805,7 +784,7 @@ sub HMinfo_tempListTmpl(@) { ##################################################
next if (!$eN); next if (!$eN);
my $md = AttrVal($eN,"model",""); my $md = AttrVal($eN,"model","");
my $chN; #tempList channel name my $chN; #tempList channel name
if ($md =~ m/(HM-CC-RT-DN-BoM|HM-CC-RT-DN)/){$chN = $defs{$eN}{channel_04};} if ($md =~ m/(HM-CC-RT-DN-BOM|HM-CC-RT-DN)/){$chN = $defs{$eN}{channel_04};}
elsif ($md =~ m/(ROTO_ZEL-STG-RM-FWT|-TC)/) {$chN = $defs{$eN}{channel_02};} elsif ($md =~ m/(ROTO_ZEL-STG-RM-FWT|-TC)/) {$chN = $defs{$eN}{channel_02};}
next if (!$chN || !$defs{$chN} || $chN !~ m/$filter/); next if (!$chN || !$defs{$chN} || $chN !~ m/$filter/);
push @el,$chN; push @el,$chN;