FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-28 21:14:52 +00:00
Code Issues Releases Wiki Activity

10_EnOcean: Remote Management: some readings corrected; EEP changed: lightSensor.01 (EEP A5-06-01): Distinction between different model variants of the Eltako sensor FAH60 and similar introduced.

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@20911 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
klaus.schauer 2020-01-08 05:06:01 +00:00
parent 855735f7e7
commit ece03e3587
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fhem/FHEM/10_EnOcean.pm
View File

@ -474,6 +474,7 @@ my %EnO_extendedRemoteFunctionCode = (
my %EnO_models = ( my %EnO_models = (
"Eltako_FAE14" => {attr => {manufID => "00D"}}, "Eltako_FAE14" => {attr => {manufID => "00D"}},
"Eltako_FAH60" => {attr => {manufID => "00D"}},
"Eltako_FHK14" => {attr => {manufID => "00D"}}, "Eltako_FHK14" => {attr => {manufID => "00D"}},
"Eltako_FHK61" => {attr => {manufID => "00D"}}, "Eltako_FHK61" => {attr => {manufID => "00D"}},
"Eltako_FSA12" => {attr => {manufID => "00D"}}, "Eltako_FSA12" => {attr => {manufID => "00D"}},
@ -9570,7 +9571,7 @@ sub EnOcean_Parse($$)
push @event, "3:state:T: $temp H: $humi B: $battery"; push @event, "3:state:T: $temp H: $humi B: $battery";
push @event, "3:humidity:$humi"; push @event, "3:humidity:$humi";
push @event, "3:temperature:$temp"; push @event, "3:temperature:$temp";
CommandDeleteReading(undef, "$name alarm"); readingsDelete($hash, "alarm");
if (AttrVal($name, "signOfLife", 'off') eq 'on') { if (AttrVal($name, "signOfLife", 'off') eq 'on') {
RemoveInternalTimer($hash->{helper}{timer}{alarm}) if(exists $hash->{helper}{timer}{alarm}); RemoveInternalTimer($hash->{helper}{timer}{alarm}) if(exists $hash->{helper}{timer}{alarm});
@{$hash->{helper}{timer}{alarm}} = ($hash, 'alarm', 'dead_sensor', 1, 5); @{$hash->{helper}{timer}{alarm}} = ($hash, 'alarm', 'dead_sensor', 1, 5);
@ -9615,14 +9616,18 @@ sub EnOcean_Parse($$)
my $lux; my $lux;
my $voltage = "unknown"; my $voltage = "unknown";
if ($manufID eq "00D") { if ($manufID eq "00D") {
if($db[2] == 0) { if ($db[2] == 0) {
$lux = sprintf "%d", $db[3] * 100 / 255; if ($model eq 'Eltako_FAH60') {
$lux = $db[3];
} else {
$lux = sprintf "%d", $db[3] * 100 / 255;
}
} else { } else {
$lux = sprintf "%d", $db[2] * 116.48 + 300; $lux = sprintf "%d", $db[2] * 116.48 + 300;
} }
} else { } else {
$voltage = sprintf "%0.1f", $db[3] * 0.02; $voltage = sprintf "%0.1f", $db[3] * 0.02;
if($db[0] & 1) { if ($db[0] & 1) {
$lux = sprintf "%d", $db[2] * 116.48 + 300; $lux = sprintf "%d", $db[2] * 116.48 + 300;
} else { } else {
$lux = sprintf "%d", $db[1] * 232.94 + 600; $lux = sprintf "%d", $db[1] * 232.94 + 600;
@ -12955,7 +12960,7 @@ sub EnOcean_Parse($$)
$data = $2; $data = $2;
while (length($data) > 0) { while (length($data) > 0) {
$data =~ m/^(..)(........)(..)(..)(..)(..)(.*)$/; $data =~ m/^(..)(........)(..)(..)(..)(..)(.*)$/;
push @event, "3:remoteLinkTableDesc" . $direction . "$1:S2:S3-S4-$5:$6"; push @event, "3:remoteLinkTableDesc" . $direction . "$1:$2:$3-$4-$5:$6";
$data = $7; $data = $7;
} }
$remoteLastStatusReturnCode = '00'; $remoteLastStatusReturnCode = '00';
@ -13070,7 +13075,7 @@ sub EnOcean_Parse($$)
$valueLen = hex($2) * 2; $valueLen = hex($2) * 2;
$data = $3; $data = $3;
$data =~ m/^(.{$valueLen})(.*)$/; $data =~ m/^(.{$valueLen})(.*)$/;
push @event, "3:remoteDevCfg$idx:S1"; push @event, "3:remoteDevCfg$idx:$1";
$data = $2; $data = $2;
} }
$remoteLastStatusReturnCode = '00'; $remoteLastStatusReturnCode = '00';
@ -13093,7 +13098,7 @@ sub EnOcean_Parse($$)
$valueLen = hex($2) * 2; $valueLen = hex($2) * 2;
$data = $3; $data = $3;
$data =~ m/^(.{$valueLen})(.*)$/; $data =~ m/^(.{$valueLen})(.*)$/;
push @event, "3:remoteLinkCfg$direction$linkTableIdx:$idx:S1"; push @event, "3:remoteLinkCfg$direction$linkTableIdx:$idx:$1";
$data = $2; $data = $2;
} }
$remoteLastStatusReturnCode = '00'; $remoteLastStatusReturnCode = '00';
@ -20604,6 +20609,7 @@ EnOcean_Delete($$)
<li>state: E/lx</li> <li>state: E/lx</li>
</ul><br> </ul><br>
Eltako devices only support Brightness.<br> Eltako devices only support Brightness.<br>
Please set the attribute model to Eltako_FAH60 if the sensor is from the production year 2015 or later.<br>
The attr subType must be lightSensor.01 and attr manufID must be 00D The attr subType must be lightSensor.01 and attr manufID must be 00D
for Eltako Devices. This is done if the device was created by for Eltako Devices. This is done if the device was created by
autocreate. autocreate.