From 8a87a8b460772fb83564c83b978b0dcfb2d0cc7f Mon Sep 17 00:00:00 2001
From: martinp876 <>
Date: Tue, 18 Mar 2014 10:12:23 +0000
Subject: [PATCH] improve templist handling

git-svn-id: https://svn.fhem.de/fhem/trunk@5252 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/10_CUL_HM.pm | 16 +++++++---------
 fhem/FHEM/98_HMinfo.pm | 14 ++++++++++++++
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/fhem/FHEM/10_CUL_HM.pm b/fhem/FHEM/10_CUL_HM.pm
index 1e1fed667..0ad59304a 100755
--- a/fhem/FHEM/10_CUL_HM.pm
+++ b/fhem/FHEM/10_CUL_HM.pm
@@ -2489,8 +2489,8 @@ sub CUL_HM_Get($@) {#+++++++++++++++++ get command+++++++++++++++++++++++++++++
       }
       my $addInfo = "";
       if    ($md =~ m/(HM-CC-TC|ROTO_ZEL-STG-RM-FWT)/ && $chn eq "02"){$addInfo = CUL_HM_TCtempReadings($hash)}
-      elsif ($md =~ m/HM-CC-RT-DN/ && $chn eq "04"){$addInfo = CUL_HM_TCITRTtempReadings($hash,7)}
-      elsif ($md =~ m/HM-TC-IT/    && $chn eq "02"){$addInfo = CUL_HM_TCITRTtempReadings($hash,7,8,9)}
+      elsif ($md =~ m/HM-CC-RT-DN/ && $chn eq "04"){$addInfo = CUL_HM_TCITRTtempReadings($hash,$md,7)}
+      elsif ($md =~ m/HM-TC-IT/    && $chn eq "02"){$addInfo = CUL_HM_TCITRTtempReadings($hash,$md,7,8,9)}
       elsif ($md eq "HM-PB-4DIS-WM")               {$addInfo = CUL_HM_4DisText($hash)}
       elsif ($md eq "HM-Sys-sRP-Pl")               {$addInfo = CUL_HM_repReadings($hash)}
 
@@ -5277,10 +5277,10 @@ sub CUL_HM_updtRegDisp($$$) {
                       substr($hash->{DEF},6,2) eq "02");
   }
   elsif ($md =~ m/HM-CC-RT-DN/){#handle temperature readings
-    CUL_HM_TCITRTtempReadings($hash,7)  if ($list == 7 && $chn eq "04");
+    CUL_HM_TCITRTtempReadings($hash,$md,7)  if ($list == 7 && $chn eq "04");
   }
   elsif ($md =~ m/HM-TC-IT-WM-W-EU/){#handle temperature readings
-    CUL_HM_TCITRTtempReadings($hash,$list)  if ($list >= 7 && $chn eq "02");
+    CUL_HM_TCITRTtempReadings($hash,$md,$list)  if ($list >= 7 && $chn eq "02");
   }
   elsif ($md eq "HM-PB-4DIS-WM"){#add text
     CUL_HM_4DisText($hash)  if ($list == 1) ;
@@ -5576,14 +5576,14 @@ sub CUL_HM_TCtempReadings($) {# parse TC temperature readings
   }
   return $setting;
 }
-sub CUL_HM_TCITRTtempReadings($@) {# parse RT - TC-IT temperature readings
-  my ($hash,@list)=@_;
+sub CUL_HM_TCITRTtempReadings($$@) {# parse RT - TC-IT temperature readings
+  my ($hash,$md,@list)=@_;
   my $name = $hash->{NAME};
   my $regPre = ((CUL_HM_getAttrInt($name,"expert") == 2)?"":".");
   my @changedRead;
   my $setting="";
   my %idxN = (7=>"P1",8=>"P2",9=>"P3");
-  $idxN{7} = "" if(scalar @list == 1);# not prefix for RT
+  $idxN{7} = "" if($md =~ m/CC-RT/);# not prefix for RT
   my @days = ("Sat", "Sun", "Mon", "Tue", "Wed", "Thu", "Fri");
   foreach my $lst (@list){
     my @r1;
@@ -5998,7 +5998,6 @@ sub CUL_HM_qEntity($$){  # add to queue
   my $devN = CUL_HM_getDeviceName($name);
   return if (AttrVal($devN,"subType","") eq "virtual");
   return if ($defs{$devN}{helper}{q}{$q} eq "00"); #already requesting all
-
   if ($devN eq $name){#config for all device
     $defs{$devN}{helper}{q}{$q}="00";
   }
@@ -6066,7 +6065,6 @@ sub CUL_HM_procQs($){#process non-wakeup queues
   my $next;# how long to wait for next timer
   if    (@{$mq->{qReqStat}}){$next = 1}
   elsif (@{$mq->{qReqConf}}){$next = $modules{CUL_HM}{hmAutoReadScan}}
-
   InternalTimer(gettimeofday()+$next,"CUL_HM_procQs","CUL_HM_procQs",0)
       if ($next);
 }
diff --git a/fhem/FHEM/98_HMinfo.pm b/fhem/FHEM/98_HMinfo.pm
index 86b9592d0..e159b8d33 100644
--- a/fhem/FHEM/98_HMinfo.pm
+++ b/fhem/FHEM/98_HMinfo.pm
@@ -573,6 +573,10 @@ sub HMinfo_tempList(@) { ######################################################
         $val =~ s/ $//;
         @exec = ();
         foreach my $eN(@el){
+          if ($tln =~ m/tempList(P.)/){
+            $val = lc($1)." ".$val;
+            $tln =~ s/P.//;
+          }
           my $x = CUL_HM_Set($defs{$eN},$eN,$tln,"prep",split(" ",$val));
           push @entryFail,$eN." :".$tln." respose:$x" if ($x != 1);
           push @exec,$eN." ".$tln." exec ".$val;
@@ -1211,6 +1215,16 @@ sub HMinfo_SetFn($@) {#########################################################
     $ret = HMinfo_archConfig($hash,$name,$opt,($a[0]?$a[0]:""));
   }
 
+  elsif($cmd eq "?")          {##action: get commandlist-----------------------
+    my @cmdLst =     
+           ( "autoReadReg","clear"  
+            ,"archConfig:-0,-a","saveConfig","loadConfig","purgeConfig","update"
+            ,"cpRegs"
+            ,"tempList tempListTmpl"
+            ,"templateDef","templateSet");
+    $ret = "Unknown argument $cmd, choose one of ".join (" ",sort @cmdLst);
+  }
+
   ### redirect set commands to get - thus the command also work in webCmd
   elsif(HMinfo_GetFn($hash,$name,"?") =~ m/\b$cmd\b/){##----------------
     unshift @a,$filter if ($filter);