From dd900b957674e6213be528dad2c35e9b6d99ccf0 Mon Sep 17 00:00:00 2001 From: martinp876 Date: Fri, 23 Aug 2013 08:20:57 +0000 Subject: [PATCH] revert TC mode setting git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@3769 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/10_CUL_HM.pm | 3 +++ fhem/FHEM/98_HMinfo.pm | 11 +++++++---- fhem/FHEM/HMConfig.pm | 10 +++++----- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/fhem/FHEM/10_CUL_HM.pm b/fhem/FHEM/10_CUL_HM.pm index 92bbdfb22..d4c602494 100755 --- a/fhem/FHEM/10_CUL_HM.pm +++ b/fhem/FHEM/10_CUL_HM.pm @@ -2064,6 +2064,9 @@ sub CUL_HM_Set($@) { @a = ($a[0],"regBulk","RegL_01:",split(" ",$l1.$l2)); } + elsif($cmd =~ m /(displayMode|displayTemp|displayTempUnit|controlMode|decalcDay)/) { + splice @a,1,3, ("regSet",$a[1],$a[2]); + } elsif($cmd eq "partyMode") { ################################################ my $days = $a[3]; my ($eH,$eM) = split(':',$a[2]); diff --git a/fhem/FHEM/98_HMinfo.pm b/fhem/FHEM/98_HMinfo.pm index 62d4ffebf..811a0b1f8 100644 --- a/fhem/FHEM/98_HMinfo.pm +++ b/fhem/FHEM/98_HMinfo.pm @@ -62,8 +62,7 @@ sub HMinfo_getParam(@) { ###################################################### push @paramList,sprintf("%-20s",($para eq "undefined"?"-":$para)); $found = 1 if ($para ne "undefined") ; } - return $found,sprintf("%-20s: %s",$eName,join "\t|",@paramList); - return sprintf("%-20s: %s",$eName,join "\t|",@paramList); + return $found,sprintf("%-20s\t: %s",$eName,join "\t|",@paramList); } sub HMinfo_regCheck(@) { ###################################################### my @entities = @_; @@ -240,10 +239,14 @@ sub HMinfo_SetFn($$) {######################################################### my $id = $defs{$dName}{DEF}; my ($found,$para) = HMinfo_getParam($id,"protState","protCmdPend","protSnd", "protLastRcv","protResndFail","protResnd","protNack"); - $para =~ s/ last_at//g; + $para =~ s/( last_at|20..-|\|)//g; + my @pl = split "\t",$para; + $_ =~ s/\s+$|//g foreach (@pl); + $para = sprintf("%-20s%-22s|%-18s|%-18s|%-14s|%-18s|%-18s|%-18s", + $pl[0],$pl[1],$pl[2],$pl[3],$pl[4],$pl[5],$pl[6],$pl[7]); push @paramList,$para; } - my $hdr = sprintf("%-20s:%-23s|%-23s|%-23s|%-23s|%-23s|%-23s|%-23s", + my $hdr = sprintf("%-20s:%-21s|%-18s|%-18s|%-14s|%-18s|%-18s|%-18s", "name","protState","protCmdPend","protSnd", "protLastRcv","protResndFail","protResnd","protNack"); $ret = $cmd." done:" ."\n ".$hdr ."\n ".(join "\n ",sort @paramList) diff --git a/fhem/FHEM/HMConfig.pm b/fhem/FHEM/HMConfig.pm index e93c939c9..e7d7cec11 100644 --- a/fhem/FHEM/HMConfig.pm +++ b/fhem/FHEM/HMConfig.pm @@ -1009,11 +1009,11 @@ my %culHmChanSets = ( ,tempListWed =>"HH:MM temp ..." ,tempListFri =>"HH:MM temp ..." ,partyMode =>"HH:MM durationDays" -# ,displayMode =>"[temp-only|temp-hum]" -# ,displayTemp =>"[actual|setpoint]" -# ,displayTempUnit=>"[celsius|fahrenheit]" -# ,controlMode =>"[manual|auto|central|party]" -# ,decalcDay =>"day", + ,displayMode =>"[temp-only|temp-hum]" + ,displayTemp =>"[actual|setpoint]" + ,displayTempUnit=>"[celsius|fahrenheit]" + ,controlMode =>"[manual|auto|central|party]" + ,decalcDay =>"day", ,sysTime =>"" }, "HM-SEC-WIN01" =>{ stop =>"", level =>" ..."},