FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-21 07:56:03 +00:00
Code Issues Releases Wiki Activity

improve templist handling

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@5252 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2014-03-18 10:12:23 +00:00
parent a39cfe9b4d
commit 8a87a8b460
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fhem/FHEM/10_CUL_HM.pm
View File

@ -2489,8 +2489,8 @@ sub CUL_HM_Get($@) {#+++++++++++++++++ get command+++++++++++++++++++++++++++++
} }
my $addInfo = ""; my $addInfo = "";
if ($md =~ m/(HM-CC-TC|ROTO_ZEL-STG-RM-FWT)/ && $chn eq "02"){$addInfo = CUL_HM_TCtempReadings($hash)} 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-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,7,8,9)} 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-PB-4DIS-WM") {$addInfo = CUL_HM_4DisText($hash)}
elsif ($md eq "HM-Sys-sRP-Pl") {$addInfo = CUL_HM_repReadings($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"); substr($hash->{DEF},6,2) eq "02");
} }
elsif ($md =~ m/HM-CC-RT-DN/){#handle temperature readings 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 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 elsif ($md eq "HM-PB-4DIS-WM"){#add text
CUL_HM_4DisText($hash) if ($list == 1) ; CUL_HM_4DisText($hash) if ($list == 1) ;
@ -5576,14 +5576,14 @@ sub CUL_HM_TCtempReadings($) {# parse TC temperature readings
} }
return $setting; return $setting;
} }
sub CUL_HM_TCITRTtempReadings($@) {# parse RT - TC-IT temperature readings sub CUL_HM_TCITRTtempReadings($$@) {# parse RT - TC-IT temperature readings
my ($hash,@list)=@_; my ($hash,$md,@list)=@_;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my $regPre = ((CUL_HM_getAttrInt($name,"expert") == 2)?"":"."); my $regPre = ((CUL_HM_getAttrInt($name,"expert") == 2)?"":".");
my @changedRead; my @changedRead;
my $setting=""; my $setting="";
my %idxN = (7=>"P1",8=>"P2",9=>"P3"); 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"); my @days = ("Sat", "Sun", "Mon", "Tue", "Wed", "Thu", "Fri");
foreach my $lst (@list){ foreach my $lst (@list){
my @r1; my @r1;
@ -5998,7 +5998,6 @@ sub CUL_HM_qEntity($$){ # add to queue
my $devN = CUL_HM_getDeviceName($name); my $devN = CUL_HM_getDeviceName($name);
return if (AttrVal($devN,"subType","") eq "virtual"); return if (AttrVal($devN,"subType","") eq "virtual");
return if ($defs{$devN}{helper}{q}{$q} eq "00"); #already requesting all return if ($defs{$devN}{helper}{q}{$q} eq "00"); #already requesting all
if ($devN eq $name){#config for all device if ($devN eq $name){#config for all device
$defs{$devN}{helper}{q}{$q}="00"; $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 my $next;# how long to wait for next timer
if (@{$mq->{qReqStat}}){$next = 1} if (@{$mq->{qReqStat}}){$next = 1}
elsif (@{$mq->{qReqConf}}){$next = $modules{CUL_HM}{hmAutoReadScan}} elsif (@{$mq->{qReqConf}}){$next = $modules{CUL_HM}{hmAutoReadScan}}
InternalTimer(gettimeofday()+$next,"CUL_HM_procQs","CUL_HM_procQs",0) InternalTimer(gettimeofday()+$next,"CUL_HM_procQs","CUL_HM_procQs",0)
if ($next); if ($next);
} }

14
fhem/FHEM/98_HMinfo.pm
View File

@ -573,6 +573,10 @@ sub HMinfo_tempList(@) { ######################################################
$val =~ s/ $//; $val =~ s/ $//;
@exec = (); @exec = ();
foreach my $eN(@el){ 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)); my $x = CUL_HM_Set($defs{$eN},$eN,$tln,"prep",split(" ",$val));
push @entryFail,$eN." :".$tln." respose:$x" if ($x != 1); push @entryFail,$eN." :".$tln." respose:$x" if ($x != 1);
push @exec,$eN." ".$tln." exec ".$val; push @exec,$eN." ".$tln." exec ".$val;
@ -1211,6 +1215,16 @@ sub HMinfo_SetFn($@) {#########################################################
$ret = HMinfo_archConfig($hash,$name,$opt,($a[0]?$a[0]:"")); $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 ### redirect set commands to get - thus the command also work in webCmd
elsif(HMinfo_GetFn($hash,$name,"?") =~ m/\b$cmd\b/){##---------------- elsif(HMinfo_GetFn($hash,$name,"?") =~ m/\b$cmd\b/){##----------------
unshift @a,$filter if ($filter); unshift @a,$filter if ($filter);