FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-23 02:31:53 +00:00
Code Issues Releases Wiki Activity

winmatic keydef calls put into a function

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@962 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2011-07-30 09:17:16 +00:00
parent 335e686eb0
commit 115e759acb
1 changed files with 29 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
fhem/FHEM/10_CUL_HM.pm
View File

@ -80,7 +80,7 @@ my %culHmModel=(
"003A" => "HM-CC-VD", # Actuator, battery/etc missing "003A" => "HM-CC-VD", # Actuator, battery/etc missing
"003B" => "HM-RC-4-B", "003B" => "HM-RC-4-B",
"003C" => "HM-WDS20-TH-O", "003C" => "HM-WDS20-TH-O",
"003D" => "HM-WDS10-TH-O", "003D" => "HM-WDS10-TH-O", # Reported to work (2011-07-26)
"003E" => "HM-WDS30-T-O", "003E" => "HM-WDS30-T-O",
"003F" => "HM-WDS40-TH-I", "003F" => "HM-WDS40-TH-I",
"0040" => "HM-WDS100-C6-O", # Identical to KS550? "0040" => "HM-WDS100-C6-O", # Identical to KS550?
@ -321,8 +321,10 @@ CUL_HM_Parse($$)
push @event, "motion:"; #added peterp push @event, "motion:"; #added peterp
# A0D258410143DFABC82AD0601240E # A0D258410143DFABC82AD0601240E
} }
push @event, "cover:closed" if($p =~ m/^0601..00$/); # By peterp if($cmd =~ m/^.610/) {
push @event, "cover:open" if($p =~ m/^0601..0E$/); push @event, "cover:closed" if($p =~ m/^0601..00$/); # By peterp
push @event, "cover:open" if($p =~ m/^0601..0E$/);
}
CUL_HM_SendCmd($shash, "++8002".$id.$src."0101${state}00",1,0) CUL_HM_SendCmd($shash, "++8002".$id.$src."0101${state}00",1,0)
if($id eq $dst && $cmd ne "8002"); # Send Ack if($id eq $dst && $cmd ne "8002"); # Send Ack
@ -583,7 +585,7 @@ my %culHmSubTypeSets = (
remote => remote =>
{ text => "<btn> [on|off] <txt1> <txt2>" }, { text => "<btn> [on|off] <txt1> <txt2>" },
winMatic => winMatic =>
{ matic => "<btn>", read => "<btn>", config => "<btn> <txt1> <txt2>", create => "<txt>" }, { matic => "<btn>", read => "<btn>", keydef => "<btn> <txt1> <txt2>", create => "<txt>" },
); );
my %culHmModelSets = ( my %culHmModelSets = (
"HM-CC-TC"=> "HM-CC-TC"=>
@ -776,65 +778,29 @@ CUL_HM_Set($@)
} elsif($cmd eq "read") { ################################### } elsif($cmd eq "read") { ###################################
$sndcmd = sprintf("++B001%s%s0104%s%02X03", $id, $dst, $id, $a[2]); $sndcmd = sprintf("++B001%s%s0104%s%02X03", $id, $dst, $id, $a[2]);
} elsif($cmd eq "config") { ##################################### } elsif($cmd eq "keydef") { #####################################
if ($a[3] eq "tilt") { if ($a[3] eq "tilt") {
$sndcmd = sprintf("++B001%s%s0105%s%02X03", $id, $dst, $id, $a[2]); $sndcmd = CUL_HM_maticFn($hash, $id, $dst, $a[2], "0B220D838B228D83");
CUL_HM_SendCmd ($hash, $sndcmd, 2, 2);
$sndcmd = sprintf("++A001%s%s01080B220D838B228D83", $id, $dst);
sleep (2);
CUL_HM_SendCmd ($hash, $sndcmd, 2, 2);
sleep(2);
$sndcmd = sprintf("++A001%s%s0106", $id, $dst);
} elsif ($a[3] eq "close") { } elsif ($a[3] eq "close") {
$sndcmd = sprintf("++B001%s%s0105%s%02X03", $id, $dst, $id, $a[2]); $sndcmd = CUL_HM_maticFn($hash, $id, $dst, $a[2], "0B550D838B558D83");
CUL_HM_SendCmd($hash, $sndcmd, 2, 2);
$sndcmd = sprintf("++A001%s%s01080B550D838B558D83", $id, $dst);
sleep(2);
CUL_HM_SendCmd($hash, $sndcmd, 2, 2);
sleep(2);
$sndcmd = sprintf("++A001%s%s0106", $id, $dst);
} elsif ($a[3] eq "closed") { } elsif ($a[3] eq "closed") {
$sndcmd = sprintf("++B001%s%s0105%s%02X03", $id, $dst, $id, $a[2]); $sndcmd = CUL_HM_maticFn($hash, $id, $dst, $a[2], "0F008F00");
CUL_HM_SendCmd($hash, $sndcmd , 2, 2);
$sndcmd = sprintf("++A001%s%s01080F008F00", $id, $dst);
sleep(2);
CUL_HM_SendCmd($hash, $sndcmd , 2, 2);
sleep(2);
$sndcmd = sprintf("++A001%s%s0106", $id, $dst);
} elsif ($a[3] eq "bolt") { } elsif ($a[3] eq "bolt") {
$sndcmd = sprintf("++B001%s%s0105%s%02X03", $id, $dst, $id, $a[2]); $sndcmd = CUL_HM_maticFn($hash, $id, $dst, $a[2], "0FFF8FFF");
CUL_HM_SendCmd($hash, $sndcmd , 2, 2);
$sndcmd = sprintf("++A001%s%s01080FFF8FFF", $id, $dst);
sleep(2);
CUL_HM_SendCmd($hash, $sndcmd , 2, 2);
sleep(2);
$sndcmd = sprintf("++A001%s%s0106", $id, $dst);
} elsif ($a[3] eq "delete") { } elsif ($a[3] eq "delete") {
$sndcmd = sprintf("++B001%s%s0102%s%02X%s", $id, $dst, $id, $a[2], $chn); $sndcmd = sprintf("++B001%s%s0102%s%02X%s", $id, $dst, $id, $a[2], $chn);
} elsif ($a[3] eq "speedclose") { } elsif ($a[3] eq "speedclose") {
$sndcmd = sprintf("++B001%s%s0105%s%02X03", $id, $dst, $id, $a[2]); $sndcmd = CUL_HM_maticFn($hash, $id, $dst, $a[2],
CUL_HM_SendCmd($hash, $sndcmd , 2, 2); sprintf("23%02XA3%02X", $sndcmd, $sndcmd));
$sndcmd = $a[4]*2;
$sndcmd = sprintf("++A001%s%s010823%02XA3%02X", $id, $dst, $sndcmd, $sndcmd);
sleep(2);
CUL_HM_SendCmd($hash, $sndcmd , 2, 2);
sleep(2);
$sndcmd = sprintf("++A001%s%s0106", $id, $dst);
} elsif ($a[3] eq "speedtilt") { } elsif ($a[3] eq "speedtilt") {
$sndcmd = sprintf("++B001%s%s0105%s%02X03", $id, $dst, $id, $a[2]); $sndcmd = CUL_HM_maticFn($hash, $id, $dst, $a[2],
CUL_HM_SendCmd($hash, $sndcmd , 2, 2); sprintf("22%02XA2%02X", $sndcmd, $sndcmd));
$sndcmd = $a[4]*2;
$sndcmd = sprintf("++A001%s%s010822%02XA2%02X", $id, $dst, $sndcmd, $sndcmd);
sleep(2);
CUL_HM_SendCmd($hash, $sndcmd , 2, 2);
sleep(2);
$sndcmd = sprintf("++A001%s%s0106", $id, $dst);
} }
} }
@ -1234,4 +1200,18 @@ CUL_HM_pushConfig($$$$$$)
sprintf("++A001%s%s%02X06",$src,$dst,$chn)); sprintf("++A001%s%s%02X06",$src,$dst,$chn));
} }
sub
CUL_HM_maticFn($$$$$)
{
my ($hash, $id, $dst, $a2, $cfg) = @_;
my $sndcmd = sprintf("++B001%s%s0105%s%02X03", $id, $dst, $id, $a2);
CUL_HM_SendCmd ($hash, $sndcmd, 2, 2);
$sndcmd = sprintf("++A001%s%s01080%s", $id, $dst, $cfg);
sleep (2);
CUL_HM_SendCmd ($hash, $sndcmd, 2, 2);
sleep(2);
$sndcmd = sprintf("++A001%s%s0106", $id, $dst);
return $sndcmd;
}
1; 1;