Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-01 20:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

44_TEK603: added usable level in percent

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@11877 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
eisler 2016-08-02 11:10:12 +00:00
parent f101c69eba
commit 509d8b7f7f
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it. # Do not insert empty lines here, update check depends on it.
- feature: 44_TEK603: added usable level in percent
- added: 38_netatmo: exchanged for completely new module - added: 38_netatmo: exchanged for completely new module
- feature: 98_DLNARenderer: Support players which require DIDL-Lite - feature: 98_DLNARenderer: Support players which require DIDL-Lite
- bugfix: 73_km200: Bugfix for double and triple downloads - bugfix: 73_km200: Bugfix for double and triple downloads

30
fhem/FHEM/44_TEK603.pm
View File

@ -127,7 +127,7 @@ sub TEK603_undef($$) {
DevIo_CloseDev($hash); DevIo_CloseDev($hash);
$hash->{PORTSTATE} = $hash->{STATE}; $hash->{PORTSTATE} = $hash->{STATE};
return undef; return undef;
} }
@ -151,7 +151,7 @@ sub TEK603_read($) {
return '' if(!defined($buf)); return '' if(!defined($buf));
# convert to hex string # convert to hex string
$hash->{buffer} = unpack ('H*', $buf); $hash->{buffer} = unpack ('H*', $buf);
my $lenght = hex(substr($hash->{buffer},4,4))*2; my $lenght = hex(substr($hash->{buffer},4,4))*2;
#my $cmd = substr($hash->{buffer},8,2); #my $cmd = substr($hash->{buffer},8,2);
@ -169,21 +169,25 @@ sub TEK603_read($) {
return '' if($crc ne $digest); return '' if($crc ne $digest);
# payload # payload
my $temp = sprintf '%.2f', ((hex(substr($payload, 0,2)) - 40 - 32) / 1.8); my $temp = sprintf '%.2f', ((hex(substr($payload, 0,2)) - 40 - 32) / 1.8);
my $Ullage = hex(substr($payload,2,2)) * 256 + hex(substr($payload,4,2)); my $Ullage = hex(substr($payload,2,2)) * 256 + hex(substr($payload,4,2));
my $RemainingUsableLevel= hex(substr($payload,6,2)) * 256 + hex(substr($payload,8,2)); my $RemainingUsableLevel = hex(substr($payload,6,2)) * 256 + hex(substr($payload,8,2));
my $TotalUsableCapacity = hex(substr($payload,10,2)) * 256 + hex(substr($payload,12,2)); my $TotalUsableCapacity = hex(substr($payload,10,2)) * 256 + hex(substr($payload,12,2));
return '' if($temp eq "-40.00" && $Ullage eq "0"); # TankLevel=NO_DATA return '' if($temp eq "-40.00" && $Ullage eq "0"); # TankLevel=NO_DATA
# Calculations
my $RemainingUsablePercent = round($RemainingUsableLevel / $TotalUsableCapacity * 100,01);
#Log3 $name, 5, $hash->{buffer}; #Log3 $name, 5, $hash->{buffer};
Log3 $name, 5, "Time:$time Temp:$temp Ullage:$Ullage RemainingUsableLevel:$RemainingUsableLevel TotalUsableCapacity:$TotalUsableCapacity"; Log3 $name, 5, "Time:$time Temp:$temp Ullage:$Ullage RemainingUsableLevel:$RemainingUsableLevel RemainingUsablePercent:$RemainingUsablePercent TotalUsableCapacity:$TotalUsableCapacity";
readingsBeginUpdate($hash); readingsBeginUpdate($hash);
readingsBulkUpdate($hash, "Time", $time); readingsBulkUpdate($hash, "Time", $time);
readingsBulkUpdate($hash, "Temperature", $temp); readingsBulkUpdate($hash, "Temperature", $temp);
readingsBulkUpdate($hash, "Ullage", $Ullage); readingsBulkUpdate($hash, "Ullage", $Ullage);
readingsBulkUpdate($hash, "RemainingUsableLevel", $RemainingUsableLevel); readingsBulkUpdate($hash, "RemainingUsableLevel", $RemainingUsableLevel);
readingsBulkUpdate($hash, "RemainingUsablePercent", $RemainingUsablePercent);
readingsBulkUpdate($hash, "TotalUsableCapacity", $TotalUsableCapacity); readingsBulkUpdate($hash, "TotalUsableCapacity", $TotalUsableCapacity);
readingsEndUpdate($hash, 1); readingsEndUpdate($hash, 1);
} }
@ -192,10 +196,10 @@ sub TEK603_read($) {
sub TEK603_reconnect($) { sub TEK603_reconnect($) {
my ($hash) = @_; my ($hash) = @_;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
Log3 $name, 3, "Wrong Data received. We reconnect Device"; Log3 $name, 3, "Wrong Data received. We reconnect Device";
# Sometime the device sends a lot of waste and we must reconnect. # Sometime the device sends a lot of waste and we must reconnect.
DevIo_CloseDev($hash); DevIo_CloseDev($hash);
$hash->{PORTSTATE} = $hash->{STATE}; $hash->{PORTSTATE} = $hash->{STATE};
@ -212,7 +216,7 @@ sub TEK603_reconnect($) {
<a name="TEK603"></a> <a name="TEK603"></a>
<h3>TEK603</h3> <h3>TEK603</h3>
<ul> <ul>
The TEK603 is a fhem module for the Tekelek TEK603 Eco Monitor a liquid level monitor designed for residential and small commercial applications. The TEK603 is a fhem module for the Tekelek TEK603 Eco Monitor a liquid level monitor designed for residential and small commercial applications.
It works in conjunction with a TEK653 Sonic transmitter mounted on the top of the tank. It works in conjunction with a TEK653 Sonic transmitter mounted on the top of the tank.
@ -224,7 +228,7 @@ sub TEK603_reconnect($) {
sudo apt-get install libdigest-crc-perl<br /> sudo apt-get install libdigest-crc-perl<br />
</code> </code>
<br /><br /> <br /><br />
<a name="TEK603_Define"></a> <a name="TEK603_Define"></a>
<b>Define</b> <b>Define</b>
<ul> <ul>
@ -250,6 +254,8 @@ sub TEK603_reconnect($) {
Sensor Measured Ullage</li> Sensor Measured Ullage</li>
<li>RemainingUsableLevel<br /> <li>RemainingUsableLevel<br />
This is the usable level, with deductions due to the sensor offset and outlet height. (Liters)</li> This is the usable level, with deductions due to the sensor offset and outlet height. (Liters)</li>
<li>RemainingUsablePercent<br />
This is the usable level in percent (calculated from RemainingUsableLevel and TotalUsableCapacity)</li>
<li>TotalUsableCapacity<br /> <li>TotalUsableCapacity<br />
This is the usable volume, with deductions due to the sensor offset and outlet height. (Liters)</li> This is the usable volume, with deductions due to the sensor offset and outlet height. (Liters)</li>
</ul><br /> </ul><br />
@ -261,5 +267,3 @@ sub TEK603_reconnect($) {
=cut =cut