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

# 2013-01-08 klaus.schauer

Browse Source 
# eltakoShutter: stop command patched
# Log $ll2: uniform issue



git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@2456 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2013-01-08 14:33:59 +00:00
parent f65e6c39b0
commit 1823f7018c
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
FHEM/10_EnOcean.pm
View File

@ -176,7 +176,7 @@ EnOcean_Set($@)
if($cmd eq "teach") { if($cmd eq "teach") {
my $data=sprintf("A502000000%s00", $subDef); my $data=sprintf("A502000000%s00", $subDef);
Log $ll2, $st . ".Teach: " . $data; Log $ll2, "EnOcean: set $name $cmd SenderID: $subDef";
# len:000a optlen:00 pakettype:1(radio) # len:000a optlen:00 pakettype:1(radio)
IOWrite($hash, "000A0001", $data); IOWrite($hash, "000A0001", $data);
@ -195,8 +195,6 @@ EnOcean_Set($@)
} elsif($cmd eq "dimup") { } elsif($cmd eq "dimup") {
return "Usage: $cmd percent [dimspeed 1-100]" if(@a<2 or $a[1]>100); return "Usage: $cmd percent [dimspeed 1-100]" if(@a<2 or $a[1]>100);
$dimVal+=$a[1]; $dimVal+=$a[1];
Log $ll2, "$st.$cmd val:" . $hash->{VALUE} .
" par:" . $a[1] . " val:" . $dimVal;
shift(@a); shift(@a);
if(defined($a[1])) { if(defined($a[1])) {
$dimTime=$a[1]; $dimTime=$a[1];
@ -220,6 +218,7 @@ EnOcean_Set($@)
$dimTime=1; $dimTime=1;
$onoff=0; $onoff=0;
$sendDimCmd=1; $sendDimCmd=1;
$dimVal=0;
} else { } else {
return "Unknown argument $cmd, choose one of dim:slider,0,1,100 ". return "Unknown argument $cmd, choose one of dim:slider,0,1,100 ".
@ -235,7 +234,7 @@ EnOcean_Set($@)
my $data=sprintf("A502%02X%02X%02X%s00", my $data=sprintf("A502%02X%02X%02X%s00",
$dimVal, $dimTime, $onoff|0x08, $subDef); $dimVal, $dimTime, $onoff|0x08, $subDef);
IOWrite($hash, "000A0001", $data); IOWrite($hash, "000A0001", $data);
Log $ll2, $st." ".$cmd.": ".$data.$subDef; Log $ll2, "EnOcean: set $name $cmd $dimVal";
} }
########################### ###########################
@ -245,8 +244,7 @@ EnOcean_Set($@)
my $shutCmd = 0x00; my $shutCmd = 0x00;
if($cmd eq "teach") { if($cmd eq "teach") {
my $data=sprintf("A5FFF80D80%s00", $subDef); my $data=sprintf("A5FFF80D80%s00", $subDef);
Log $ll2, $st . ".Teach: " . $data; Log $ll2, "EnOcean: set $name $cmd SenderID: $subDef";
# len:000a optlen:00 pakettype:1(radio) # len:000a optlen:00 pakettype:1(radio)
IOWrite($hash, "000A0001", $data); IOWrite($hash, "000A0001", $data);
@ -278,13 +276,13 @@ EnOcean_Set($@)
return "Unknown argument " . $cmd . ", choose one of up down stop teach" return "Unknown argument " . $cmd . ", choose one of up down stop teach"
} }
shift(@a); shift(@a);
if($shutCmd) { if($shutCmd || ($cmd eq "stop")) {
$updateState = 0; $updateState = 0;
# EEP: A5/3F/7F Universal ??? # EEP: A5/3F/7F Universal ???
my $data = sprintf("A5%02X%02X%02X%02X%s00", my $data = sprintf("A5%02X%02X%02X%02X%s00",
0x00, $shutTime, $shutCmd, 0x08, $subDef); 0x00, $shutTime, $shutCmd, 0x08, $subDef);
IOWrite($hash, "000A0001", $data); IOWrite($hash, "000A0001", $data);
Log $ll2, $st . ".$cmd" . $data; Log $ll2, "EnOcean: set $name $cmd";
} }
########################### ###########################