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

Allow TC pairing, remove CR..

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@2044 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2012-10-30 22:51:42 +00:00
parent 56698cef23
commit ffec4681e1
1 changed files with 3366 additions and 3363 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
FHEM/10_CUL_HM.pm
View File

@ -1445,22 +1445,23 @@ my %culHmSubTypeSets = (
); );
my %culHmModelSets = ( my %culHmModelSets = (
"HM-CC-TC"=>{ "HM-CC-TC"=>{
devicepair => "<btnNumber> device ... [single|dual] [set|unset] [actor|remote|both]",
"day-temp" => "temp", "day-temp" => "temp",
"night-temp" => "temp", "night-temp" => "temp",
"party-temp" => "temp", "party-temp" => "temp",
"desired-temp" => "temp", # does not work - only in manual mode?? "desired-temp" => "temp", # does not work - only in manual mode??
"tempListSat" => "HH:MM temp ...", tempListSat => "HH:MM temp ...",
"tempListSun" => "HH:MM temp ...", tempListSun => "HH:MM temp ...",
"tempListMon" => "HH:MM temp ...", tempListMon => "HH:MM temp ...",
"tempListTue" => "HH:MM temp ...", tempListTue => "HH:MM temp ...",
"tempListThu" => "HH:MM temp ...", tempListThu => "HH:MM temp ...",
"tempListWed" => "HH:MM temp ...", tempListWed => "HH:MM temp ...",
"tempListFri" => "HH:MM temp ...", tempListFri => "HH:MM temp ...",
"displayMode" => "[temp-only|temp-hum]", displayMode => "[temp-only|temp-hum]",
"displayTemp" => "[actual|setpoint]", displayTemp => "[actual|setpoint]",
"displayTempUnit" => "[celsius|fahrenheit]", displayTempUnit => "[celsius|fahrenheit]",
"controlMode" => "[manual|auto|central|party]", controlMode => "[manual|auto|central|party]",
"decalcDay" => "day", }, decalcDay => "day", },
"HM-CC-VD"=>{ "HM-CC-VD"=>{
valvePos => "position",}, valvePos => "position",},
"HM-RC-19"=> { "HM-RC-19"=> {
@ -2157,6 +2158,7 @@ CUL_HM_Set($@)
return "$target must be [actor|remote|both]" return "$target must be [actor|remote|both]"
if(defined($target) && (($target ne"actor") && if(defined($target) && (($target ne"actor") &&
($target ne"remote")&&($target ne"both"))); ($target ne"remote")&&($target ne"both")));
return "use climate chan to pair TC" if($md eq "HM-CC-TC" &&$chn ne "02");
$single = ($single eq "single")?1:"";#default to dual $single = ($single eq "single")?1:"";#default to dual
$set = ($set eq "unset")?0:1; $set = ($set eq "unset")?0:1;
@ -2200,9 +2202,9 @@ CUL_HM_Set($@)
else{ else{
my $bStr = sprintf("%02X",$b); my $bStr = sprintf("%02X",$b);
CUL_HM_PushCmdStack($hash, CUL_HM_PushCmdStack($hash,
"++".$flag."01${id}${dst}${bStr}$cmd${peerDst}${peerChn}00"); "++".$flag."01${id}${dst}${bStr}$cmd${peerDst}${peerChn}00");
CUL_HM_pushConfig($hash,$id, $dst,$b, CUL_HM_pushConfig($hash,$id, $dst,$b,$peerDst,hex($peerChn),4,"0100")
$peerDst,hex($peerChn),4,"0100"); if($md ne "HM-CC-TC");
} }
} }
} }
@ -3205,6 +3207,7 @@ CUL_HM_ActGetCreateHash()
if (!$modules{CUL_HM}{defptr}{"000000"}){ if (!$modules{CUL_HM}{defptr}{"000000"}){
DoTrigger("global", "UNDEFINED ActionDetector CUL_HM 000000"); DoTrigger("global", "UNDEFINED ActionDetector CUL_HM 000000");
$attr{ActionDetector}{actCycle} = 600; $attr{ActionDetector}{actCycle} = 600;
} }
my $defPtr = $modules{CUL_HM}{defptr}; my $defPtr = $modules{CUL_HM}{defptr};
my $actName = $defPtr->{"000000"}{NAME} if($defPtr->{"000000"}); my $actName = $defPtr->{"000000"}{NAME} if($defPtr->{"000000"});