FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-01 01:09:47 +00:00
Code Issues Releases Wiki Activity

10_EnOcean: profil autoMeterReading.01 (EEP A5-12-01) changed, new attribute alwaysUpdateReadings

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@24359 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
klaus.schauer 2021-04-29 16:46:21 +00:00
parent 49a95bd07b
commit 4119043c39
1 changed files with 46 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
fhem/FHEM/10_EnOcean.pm
View File

@ -780,9 +780,9 @@ sub EnOcean_Initialize($) {
$hash->{GetFn} = "EnOcean_Get";
$hash->{NotifyFn} = "EnOcean_Notify";
$hash->{AttrFn} = "EnOcean_Attr";
$hash->{AttrList} = "IODev do_not_notify:1,0 ignore:0,1 dummy:0,1 " .
"showtime:1,0 " .
"actualTemp angleMax:slider,-180,20,180 alarmAction " .
$hash->{AttrList} = "IODev do_not_notify:select,0,1 ignore:0,1 dummy:0,1 " .
"showtime:select,0,1 " .
"actualTemp angleMax:slider,-180,20,180 alarmAction alwaysUpdateReadings:select,0,1 " .
"angleMin:slider,-180,20,180 " .
"angleTime setCmdTrigger:man,refDev blockUnknownMSC:no,yes blockMotion:no,yes " .
"blockTemp:no,yes blockDisplay:no,yes blockDateTime:no,yes " .
@ -10324,15 +10324,13 @@ sub EnOcean_Parse($$) {
# 2 = x/100, 3 = x/1000
my $dataType = ($db[0] & 4) >> 2;
my $divisor = $db[0] & 3;
my $meterReading;
my $meterReading = $db[3] << 16 | $db[2] << 8 | $db[1];
if ($divisor == 3) {
$meterReading = sprintf "%.3f", ($db[3] << 16 | $db[2] << 8 | $db[1]) / 1000;
$meterReading = sprintf "%.3f", $meterReading / 1000;
} elsif ($divisor == 2) {
$meterReading = sprintf "%.2f", ($db[3] << 16 | $db[2] << 8 | $db[1]) / 100;
$meterReading = sprintf "%.2f", $meterReading / 100;
} elsif ($divisor == 1) {
$meterReading = sprintf "%.1f", ($db[3] << 16 | $db[2] << 8 | $db[1]) / 10;
} else {
$meterReading = $db[3] << 16 | $db[2] << 8 | $db[1];
$meterReading = sprintf "%.1f", $meterReading / 10;
}
my $channel = $db[0] >> 4;
@ -10366,7 +10364,7 @@ sub EnOcean_Parse($$) {
$serialNumber = sprintf "%4s%01x%01x%01x%01x", $serialNumber,
$db[2] >> 4, $db[2] & 0x0F, $db[3] >> 4, $db[3] & 0x0F;
}
push @event, "3:serialNumber:$serialNumber";
push @event, "1:serialNumber:$serialNumber";
} elsif ($dataType == 1) {
# momentary power
push @event, "3:power:$meterReading";
@ -10376,7 +10374,7 @@ sub EnOcean_Parse($$) {
} else {
# power consumption
push @event, "3:energy$channel:$meterReading";
push @event, "3:currentTariff:$channel";
push @event, "1:currentTariff:$channel";
}
} elsif ($st eq "autoMeterReading.02" || $st eq "autoMeterReading.03") {
# Automated meter reading (AMR), Gas, Water (EEP A5-12-02, A5-12-03)
@ -10387,7 +10385,7 @@ sub EnOcean_Parse($$) {
} else {
# cumulative counter
push @event, "3:consumption$channel:$meterReading";
push @event, "3:currentTariff:$channel";
push @event, "1:currentTariff:$channel";
}
}
@ -13697,7 +13695,7 @@ sub EnOcean_Parse($$) {
for(my $i = 0; $i < int(@event); $i++) {
# Flag & 1: reading, Flag & 2: always update
my ($flag, $vn, $vv) = split(':', $event[$i], 3);
if ($flag + 0 & 2) {
if ($flag + 0 & 2 || $attr{$name}{alwaysUpdateReadings}) {
readingsBulkUpdate($hash, $vn, $vv);
} else {
readingsBulkUpdateIfChanged($hash, $vn, $vv);
@ -13804,6 +13802,13 @@ sub EnOcean_Attr(@) {
$err = "attribute-value [$attrName] = $attrVal wrong";
}
} elsif ($attrName eq "alwaysUpdateReadings") {
if (!defined $attrVal){
} elsif ($attrVal !~ m/^[0-1]$/) {
$err = "attribute-value [$attrName] = $attrVal wrong";
}
} elsif ($attrName =~ m/^block.*/) {
if (!defined $attrVal){
@ -15182,7 +15187,7 @@ sub EnOcean_constLightCtrl($) {
$hash->{helper}{constLightCtrl}[7] = 2;
}
InternalTimer(gettimeofday() + $hash->{helper}{constLightCtrl}[6], 'EnOcean_constLightCtrl', $hash->{helper}{constLightCtrl}, 0);
Log3 $hash->{NAME}, 3, "EnOcean $hash->{NAME} constLightCtrl: 4 B: $brightness D: $dimTemp >> $dimCalc CMD: $hash->{helper}{constLightCtrl}[2] " . "CTRL: " . ($hash->{helper}{constLightCtrl}[6] // 'undef') . " RESPONSE: " . ($hash->{helper}{constLightCtrl}[7] // 'undef');
#Log3 $hash->{NAME}, 3, "EnOcean $hash->{NAME} constLightCtrl: 4 B: $brightness D: $dimTemp >> $dimCalc CMD: $hash->{helper}{constLightCtrl}[2] " . "CTRL: " . ($hash->{helper}{constLightCtrl}[6] // 'undef') . " RESPONSE: " . ($hash->{helper}{constLightCtrl}[7] // 'undef');
return $logLevel;
}
@ -20491,6 +20496,9 @@ sub EnOcean_Delete($$) {
Action that is executed before the actuator is entering the "alarm" mode.<br>
Notice subType blindsCrtl.00, blindsCrtl.01: The attribute can only be set while the actuator is online.
</li>
<li><a name="EnOcean_alwaysUpdateReadings">alwaysUpdateReadings</a> 0|1, [alwaysUpdateReadings] = 0 is default.<br>
The readings of the device are always updated if alwaysUpdateReadings is set.
</li>
<li><a name="angleMax">angleMax</a> &alpha;s/&#176, [&alpha;s] = -180 ... 180, 90 is default.<br>
Slat angle end position maximum.<br>
angleMax is supported for shutter.
@ -21269,6 +21277,18 @@ sub EnOcean_Delete($$) {
</li>
<br><br>
<li>Bistable Switch (EEP F6-02-01 ... F6-02-04)<br>
[EnOcean PTM 202 Module]<br>
<ul>
<li>B0</li>
<li>BI</li>
<li>channelB: B0|BI</li>
<li>state: B0|BI</li>
</ul><br>
Single rocker operation only (Button B0 or BI) and energy bow pressed only, no release telegram.
</li>
<br><br>
<li>Pushbutton Switch (EEP F6-02-01 ... F6-03-02)<br>
[EnOcean PTM 210, PTM 215 Module]<br>
<ul>
@ -22151,8 +22171,8 @@ sub EnOcean_Delete($$) {
<br><br>
<li>Automated meter reading (AMR), Electricity (EEP A5-12-01)<br>
[Eltako FSS12, DSZ14DRS, DSZ14WDRS, Thermokon SR-MI-HS, untested]<br>
[Eltako FWZ12-16A tested]<br>
[Eltako DSZ14WDRS, FSS12, Thermokon SR-MI-HS, untested]<br>
[Eltako DSZ14DRS, FWZ12-16A tested]<br>
<ul>
<li>P/W</li>
<li>power: P/W</li>