From ba1a11fda97180b4055f53bcdf6bfb4c33a30f11 Mon Sep 17 00:00:00 2001 From: martinp876 <> Date: Sun, 30 Jun 2013 17:31:02 +0000 Subject: [PATCH] remove temp programming for TC-device - only allow channel git-svn-id: https://svn.fhem.de/fhem/trunk@3371 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/10_CUL_HM.pm | 7 +++---- fhem/FHEM/98_HMinfo.pm | 2 +- fhem/FHEM/HMConfig.pm | 8 ++++++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/fhem/FHEM/10_CUL_HM.pm b/fhem/FHEM/10_CUL_HM.pm index 2774a1d6c..5f2701af7 100755 --- a/fhem/FHEM/10_CUL_HM.pm +++ b/fhem/FHEM/10_CUL_HM.pm @@ -1840,8 +1840,7 @@ sub CUL_HM_Set($@) { #convert 'old' commands to current methodes like regSet and regBulk... # Unify the interface - if($cmd =~ m/^(displayMode|displayTemp|controlMode|decalcDay|displayTempUnit)$/ || - $cmd =~ m/^(day|night|party)-temp$/){ # + if($cmd =~ m/^(day|night|party)-temp$/){ # splice @a,1,0,"regSet";# make hash,regSet,reg,value ($chn,$isChannel) = ("02","true");#force chn 02 } @@ -2384,8 +2383,8 @@ sub CUL_HM_Set($@) { return "To many arguments, max is 24 pairs" if(@a > 50); return "Bad format, use HH:MM TEMP ..." if(@a % 2); return "Last time spec must be 24:00" if($a[@a-2] ne "24:00"); - my $data = ""; - my $msg = ""; + + my ($data,$msg) = ("",""); for(my $idx = 2; $idx < @a; $idx += 2) { return "$a[$idx] is not in HH:MM format" if($a[$idx] !~ m/^([0-2]\d):([0-5]\d)/); diff --git a/fhem/FHEM/98_HMinfo.pm b/fhem/FHEM/98_HMinfo.pm index 0d02ee2da..70e476f98 100644 --- a/fhem/FHEM/98_HMinfo.pm +++ b/fhem/FHEM/98_HMinfo.pm @@ -480,7 +480,7 @@ sub HMinfo_SetFnDly($) {####################################################### ; } else{ - $ret = " Unknown argument "; + return "autoReadReg clear configCheck param peerCheck peerXref protoEvents models regCheck register rssi saveConfig update"; } return $ret; } diff --git a/fhem/FHEM/HMConfig.pm b/fhem/FHEM/HMConfig.pm index 7f5e476a1..27f9e2e6a 100644 --- a/fhem/FHEM/HMConfig.pm +++ b/fhem/FHEM/HMConfig.pm @@ -826,6 +826,11 @@ $culHmModelSets{"HM-RC-19-SW"} = $culHmModelSets{"HM-RC-19"}; #%{$culHmModelSets{"HM-RC-19-SW"}} = %{$culHmModelSets{"HM-RC-19"}}; copy my %culHmChanSets = ( + "HM-CC-TC00" =>{ "day-temp" => "[on,off,6.0..30.0]", + "night-temp" => "[on,off,6.0..30.0]", + "party-temp" => "[on,off,6.0..30.0]", + "desired-temp" => "[on,off,6.0..30.0]", + sysTime => "" }, "HM-CC-TC02" =>{ peerChan => " ... single [set|unset] [actor|remote|both]", "day-temp" => "[on,off,6.0..30.0]", "night-temp" => "[on,off,6.0..30.0]", @@ -843,14 +848,13 @@ my %culHmChanSets = ( displayTempUnit => "[celsius|fahrenheit]", controlMode => "[manual|auto|central|party]", decalcDay => "day", - sysTime => "" }, + sysTime => "" }, "HM-SEC-WIN01" =>{ stop =>"", level =>" ..."}, "HM-OU-CFM-PL01" =>{ led => "[,...] []"}, "HM-OU-CFM-PL02" =>{ playTone => "[,...] []"} ); # clones- - - - - - - - - - - - - - - - - -$culHmChanSets{"HM-CC-TC00"} = $culHmChanSets{"HM-CC-TC02"}; $culHmChanSets{"HM-OU-CF-PL02"} = $culHmChanSets{"HM-OU-CF-PL01"}; # RC send BCAST to specific address. Is the meaning understood?