Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove temp programming for TC-device - only allow channel

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@3371 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2013-06-30 17:31:02 +00:00
parent a526ec16f0
commit ba1a11fda9
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fhem/FHEM/10_CUL_HM.pm
View File

@ -1840,8 +1840,7 @@ sub CUL_HM_Set($@) {
#convert 'old' commands to current methodes like regSet and regBulk... #convert 'old' commands to current methodes like regSet and regBulk...
# Unify the interface # Unify the interface
if($cmd =~ m/^(displayMode|displayTemp|controlMode|decalcDay|displayTempUnit)$/ || if($cmd =~ m/^(day|night|party)-temp$/){ #
$cmd =~ m/^(day|night|party)-temp$/){ #
splice @a,1,0,"regSet";# make hash,regSet,reg,value splice @a,1,0,"regSet";# make hash,regSet,reg,value
($chn,$isChannel) = ("02","true");#force chn 02 ($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 "To many arguments, max is 24 pairs" if(@a > 50);
return "Bad format, use HH:MM TEMP ..." if(@a % 2); 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"); 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) { for(my $idx = 2; $idx < @a; $idx += 2) {
return "$a[$idx] is not in HH:MM format" return "$a[$idx] is not in HH:MM format"
if($a[$idx] !~ m/^([0-2]\d):([0-5]\d)/); if($a[$idx] !~ m/^([0-2]\d):([0-5]\d)/);

2
fhem/FHEM/98_HMinfo.pm
View File

@ -480,7 +480,7 @@ sub HMinfo_SetFnDly($) {#######################################################
; ;
} }
else{ else{
$ret = " Unknown argument "; return "autoReadReg clear configCheck param peerCheck peerXref protoEvents models regCheck register rssi saveConfig update";
} }
return $ret; return $ret;
} }

8
fhem/FHEM/HMConfig.pm
View File

@ -826,6 +826,11 @@ $culHmModelSets{"HM-RC-19-SW"} = $culHmModelSets{"HM-RC-19"};
#%{$culHmModelSets{"HM-RC-19-SW"}} = %{$culHmModelSets{"HM-RC-19"}}; copy #%{$culHmModelSets{"HM-RC-19-SW"}} = %{$culHmModelSets{"HM-RC-19"}}; copy
my %culHmChanSets = ( 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 => "<btnNumber> <actChn> ... single [set|unset] [actor|remote|both]", "HM-CC-TC02" =>{ peerChan => "<btnNumber> <actChn> ... single [set|unset] [actor|remote|both]",
"day-temp" => "[on,off,6.0..30.0]", "day-temp" => "[on,off,6.0..30.0]",
"night-temp" => "[on,off,6.0..30.0]", "night-temp" => "[on,off,6.0..30.0]",
@ -843,14 +848,13 @@ my %culHmChanSets = (
displayTempUnit => "[celsius|fahrenheit]", displayTempUnit => "[celsius|fahrenheit]",
controlMode => "[manual|auto|central|party]", controlMode => "[manual|auto|central|party]",
decalcDay => "day", decalcDay => "day",
sysTime => "" }, sysTime => "" },
"HM-SEC-WIN01" =>{ stop =>"", "HM-SEC-WIN01" =>{ stop =>"",
level =>"<level> <relockDly> <speed>..."}, level =>"<level> <relockDly> <speed>..."},
"HM-OU-CFM-PL01" =>{ led => "<color>[,<color>...] [<repeat>]"}, "HM-OU-CFM-PL01" =>{ led => "<color>[,<color>...] [<repeat>]"},
"HM-OU-CFM-PL02" =>{ playTone => "<MP3No>[,<MP3No>...] [<repeat>]"} "HM-OU-CFM-PL02" =>{ playTone => "<MP3No>[,<MP3No>...] [<repeat>]"}
); );
# clones- - - - - - - - - - - - - - - - - # clones- - - - - - - - - - - - - - - - -
$culHmChanSets{"HM-CC-TC00"} = $culHmChanSets{"HM-CC-TC02"};
$culHmChanSets{"HM-OU-CF-PL02"} = $culHmChanSets{"HM-OU-CF-PL01"}; $culHmChanSets{"HM-OU-CF-PL02"} = $culHmChanSets{"HM-OU-CF-PL01"};
# RC send BCAST to specific address. Is the meaning understood? # RC send BCAST to specific address. Is the meaning understood?