FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 12:49:34 +00:00
Code Issues Releases Wiki Activity

revert TC mode setting

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@3769 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2013-08-23 08:20:57 +00:00
parent 9f8dcf9f5f
commit 2cbd58bb2a
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fhem/FHEM/10_CUL_HM.pm
View File

@ -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]);

11
fhem/FHEM/98_HMinfo.pm
View File

@ -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)

10
fhem/FHEM/HMConfig.pm
View File

@ -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 =>"<level> <relockDly> <speed>..."},