FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-07 12:58:13 +00:00
Code Issues Releases Wiki Activity

HM-CC-TC desired-temp

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@1184 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2012-01-08 19:11:40 +00:00
parent 185a96030e
commit 6040c3993a
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
fhem/FHEM/10_CUL_HM.pm
View File

@ -251,7 +251,6 @@ CUL_HM_Parse($$)
my $tn = TimeNow(); my $tn = TimeNow();
if($cmd eq "8002") { # Ack / Nack if($cmd eq "8002") { # Ack / Nack
# Multi-channel device: Switch to the shadow source hash # Multi-channel device: Switch to the shadow source hash
my $chn = $2 if($p =~ m/^(..)(..)/); my $chn = $2 if($p =~ m/^(..)(..)/);
if($chn && $chn ne "01" && $chn ne "00") { if($chn && $chn ne "01" && $chn ne "00") {
@ -275,7 +274,7 @@ CUL_HM_Parse($$)
if($cmd ne "8002" && $shash->{cmdStack}) { if($cmd ne "8002" && $shash->{cmdStack}) {
# i have to tell something, dont care what it said # i have to tell something, dont care what it said
CUL_HM_SendCmd($shash, "++8002$id${src}00",1,0) # Send Ack CUL_HM_SendCmd($shash, "++8002$id${src}00",1,0) # Send Ack
if($id eq $dst && $cmd ne "8002"); if($id eq $dst && $p ne "00");
CUL_HM_ProcessCmdStack($shash); CUL_HM_ProcessCmdStack($shash);
push @event, ""; push @event, "";
@ -344,8 +343,6 @@ CUL_HM_Parse($$)
push @event, "temperature:$t"; push @event, "temperature:$t";
push @event, "humidity:$h"; push @event, "humidity:$h";
# If we have something to tell:
CUL_HM_SendCmd($shash, "++A112$id$src", 1, 1) if($shash->{cmdStack});
} }
if($cmd eq "A258" && $p =~ m/^(..)(..)/) { if($cmd eq "A258" && $p =~ m/^(..)(..)/) {
@ -443,6 +440,10 @@ CUL_HM_Parse($$)
push @event, "desired-temp:" .hex($1)/2; push @event, "desired-temp:" .hex($1)/2;
} }
if($cmd eq "A112" && $p =~ m/^0202(..)$/) { # Set desired temp
push @event, "desired-temp:" .hex($1)/2;
}
CUL_HM_SendCmd($shash, "++8002$id${src}00",1,0) # Send Ack CUL_HM_SendCmd($shash, "++8002$id${src}00",1,0) # Send Ack
if($id eq $dst && $cmd ne "8002"); if($id eq $dst && $cmd ne "8002");
@ -825,8 +826,7 @@ CUL_HM_Set($@)
my @h; my @h;
@h = split(" ", $h) if($h); @h = split(" ", $h) if($h);
my $isSender = (AttrVal($name, "hmClass", "") eq "sender" || my $isSender = (AttrVal($name,"hmClass","") eq "sender" || $md eq "HM-CC-TC");
AttrVal($name, "model", "") eq "HM-CC-TC");
if(!defined($h) && defined($culHmSubTypeSets{$st}{pct}) && $cmd =~ m/^\d+/) { if(!defined($h) && defined($culHmSubTypeSets{$st}{pct}) && $cmd =~ m/^\d+/) {
@ -866,8 +866,8 @@ CUL_HM_Set($@)
sprintf("++A011%s%s0400", $id,$dst)); sprintf("++A011%s%s0400", $id,$dst));
} elsif($cmd eq "pair") { ############################################# } elsif($cmd eq "pair") { #############################################
return "pair is not enabled for this type of device, ".
return "pair is not enabled for this device, use set <IODev> hmPairForSec" "use set <IODev> hmPairForSec"
if($isSender); if($isSender);
my $serialNr = AttrVal($name, "serialNr", undef); my $serialNr = AttrVal($name, "serialNr", undef);
@ -941,14 +941,16 @@ CUL_HM_Set($@)
} elsif($cmd =~ m/^desired-temp$/) { ################## } elsif($cmd =~ m/^desired-temp$/) { ##################
my $temp = CUL_HM_convTemp($a[2]); my $temp = CUL_HM_convTemp($a[2]);
return $temp if(length($temp) > 2); return $temp if(length($temp) > 2);
CUL_HM_PushCmdStack($hash, "++A112$id$dst"); # Wakeup...
CUL_HM_PushCmdStack($hash, CUL_HM_PushCmdStack($hash,
sprintf("++A011%s%s0201%s0000", $id,$dst,$temp)); sprintf("++A011%s%s0202%s", $id,$dst,$temp));
} elsif($cmd =~ m/^(day|night|party)-temp$/) { ################## } elsif($cmd =~ m/^(day|night|party)-temp$/) { ##################
my %tt = (day=>"03", night=>"04", party=>"06"); my %tt = (day=>"03", night=>"04", party=>"06");
my $tt = $tt{$1}; my $tt = $tt{$1};
my $temp = CUL_HM_convTemp($a[2]); my $temp = CUL_HM_convTemp($a[2]);
return $temp if(length($temp) > 2); return $temp if(length($temp) > 2);
CUL_HM_PushCmdStack($hash, "++A112$id$dst"); # Wakeup...
CUL_HM_pushConfig($hash, $id, $dst, 2, 5, "$tt$temp"); # List 5 CUL_HM_pushConfig($hash, $id, $dst, 2, 5, "$tt$temp"); # List 5
} elsif($cmd =~ m/^tempList(...)/) { ################################## } elsif($cmd =~ m/^tempList(...)/) { ##################################
@ -978,6 +980,7 @@ CUL_HM_Set($@)
$hash->{TEMPLIST}{$wd}{($idx-2)/2}{TEMP} = $a[$idx+1]; $hash->{TEMPLIST}{$wd}{($idx-2)/2}{TEMP} = $a[$idx+1];
$msg .= sprintf(" %02d:%02d %.1f", $h, $m, $a[$idx+1]); $msg .= sprintf(" %02d:%02d %.1f", $h, $m, $a[$idx+1]);
} }
CUL_HM_PushCmdStack($hash, "++A112$id$dst"); # Wakeup...
CUL_HM_pushConfig($hash, $id, $dst, 2, $list, $data); CUL_HM_pushConfig($hash, $id, $dst, 2, $list, $data);
my $vn = "tempList$wd"; my $vn = "tempList$wd";
@ -1045,7 +1048,7 @@ CUL_HM_Set($@)
my $dst2 = $dhash->{DEF}; my $dst2 = $dhash->{DEF};
my $chn2 = "01"; my $chn2 = "01";
if(length($dst2) == 8) { # shadow switch device for multi-channel switch if(length($dst2) == 8) { # shadow switch device for multi-channel switch
$chn2 = substr($dst2, 6, 2); $chn2 = substr($dst2, 6, 2);
$dst2 = substr($dst2, 0, 6); $dst2 = substr($dst2, 0, 6);
$dhash = $modules{CUL_HM}{defptr}{$dst2}; $dhash = $modules{CUL_HM}{defptr}{$dst2};
@ -1212,6 +1215,7 @@ CUL_HM_PushCmdStack($$)
{ {
my ($hash, $cmd) = @_; my ($hash, $cmd) = @_;
my @arr = (); my @arr = ();
$hash->{cmdStack} = \@arr if(!$hash->{cmdStack}); $hash->{cmdStack} = \@arr if(!$hash->{cmdStack});
push(@{$hash->{cmdStack}}, $cmd); push(@{$hash->{cmdStack}}, $cmd);
} }