mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
Marc Hoppe
2012-03-11 17:36:18 +01:00
parent 0ad35c9742
commit 2cfb5f7cee
1 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
FHEM/10_EnOcean.pm
View File

@@ -90,8 +90,9 @@ sub EnOcean_Attr($)
if($a[2] eq "subType") {
Log $ll2, "EO_Attr subtype";
if($a[3] eq "eltakoDimmer") {
Log $ll2, "EO_Attr subtype dimmer";
if( $a[3] eq "eltakoDimmer"
or $a[3] eq "eltakoSwitch") {
Log $ll2, "EO_Attr subtype dimmer/switch";
$attr{$name}{eventMap}="B0:on B1:off"
}
}
@@ -163,6 +164,7 @@ EnOcean_Set($@)
$hash->{READINGS}{$cmd}{TIME} = $tn;
$hash->{READINGS}{$cmd}{VAL} = $arg;
###########################
} elsif($st eq "eltakoDimmer") {
my $sendDimCmd=0;
my $time=AttrVal($name, "time", 0);
@@ -239,25 +241,33 @@ EnOcean_Set($@)
}
###########################
} elsif($st eq "eltakoSwitch") {
my $sendCmd=0;
my $onoff=1;
} elsif($st eq "eltakoRollCtrl") {
if($cmd eq "teach") {
my $data=sprintf("A5FFF80D80%s00", $hash->{DEF});
Log $ll2, "eltakoRollCtrl.Teach: " . $data;
my $idSrc=EnOcean_GetMyDeviceId($hash);
my $data=sprintf("A501000000%s00", $idSrc);
Log $ll2, "$st.Teach: " . $data;
IOWrite($hash, "000A0001", $data); # len:000a optlen:00 pakettype:1(radio)
} elsif($cmd eq "on" or $cmd eq "B0") {
$sendCmd=1;
} elsif($cmd eq "off" or $cmd eq "B1") {
$onoff=0;
$sendCmd=1;
} else {
my %eltakoRollCtrlCommands = ( down=>0x02, up=>0x01, stop=>0x00 );
my $usage = "Usage: (" . join("|", sort keys %eltakoRollCtrlCommands) . ") [time 0-255 sek]";
my $rollcmd= $eltakoRollCtrlCommands{$cmd};
return $usage if( (!defined($rollcmd)) or (@a<1) );
my $time=0;
if(defined($a[1])) { $time=$a[1]; } # time
shift(@a);
# EEP: A5/3F/7F Universal ???
my $data=sprintf("A5%02X%02X%02X%02X%s00", 0, $time, $rollcmd, 0x08, $hash->{DEF});
return "Unknown argument $cmd, choose one of: teach, on ,off";
}
if($sendDimCmd) {
# EEP: A5/38/08 Central Command ->Typ 0x01: Switch
my $idSrc=EnOcean_GetMyDeviceId($hash);
my $data=sprintf("A5010000%02X%s00", $onoff|0x08, $idSrc);
IOWrite($hash, "000A0001", $data);
Log $ll2, "eltakoRollCtrl.$cmd" . $data;
Log $ll2, "$st.$cmd: " . $data;
}
###########################
@@ -291,6 +301,7 @@ EnOcean_Set($@)
return undef;
}
#############################
sub
EnOcean_Parse($$)
@@ -462,11 +473,6 @@ EnOcean_Parse($$)
} elsif($db_3 eq 0x02) { # dimm
push @event, "3:state:" . (($db_0 & 0x01) ? "on": "off");
push @event, "3:value:$db_2";
} elsif($db_3 eq 0x03) { # setpoint-switch, todo
} elsif($db_3 eq 0x04) { # basic setpoint, todo
} elsif($db_3 eq 0x05) { # control-variable, todo
} elsif($db_3 eq 0x06) { # fan-stage, todo
}
} else {