FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-04 11:26:55 +00:00
Code Issues Releases Wiki Activity

12_HProtocolGateway / 12_HProtocolTank: minor enhancements

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@17337 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
eisler 2018-09-13 15:15:11 +00:00
parent 392d03de82
commit 9a8416f6cc
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fhem/FHEM/12_HProtocolGateway.pm
View File

@ -114,8 +114,8 @@ sub HProtocolGateway_GetUpdate($) {
} elsif ($mode eq "Ullage") { } elsif ($mode eq "Ullage") {
$command = "\$C"; $command = "\$C";
} }
my $hID = AttrVal($tankHash->{NAME},"hID","");
my $msg = $command . $tankHash->{READINGS}{hID}{VAL} . "\r\n"; my $msg = $command . $hID . "\r\n";
DevIo_SimpleWrite($hash, $msg , 2); DevIo_SimpleWrite($hash, $msg , 2);
my ($err, $data) = HProtocolGateway_ReadAnswer($hash,$tankHash); my ($err, $data) = HProtocolGateway_ReadAnswer($hash,$tankHash);
Log3 $name, 5, "err:". $err; Log3 $name, 5, "err:". $err;
@ -202,7 +202,7 @@ sub HProtocolGateway_ParseMessage($$) {
my ($filllevel,$volume,$ullage) = (0,0,0); my ($filllevel,$volume,$ullage) = (0,0,0);
my $mode = AttrVal($tankHash->{NAME},"mode",""); my $mode = AttrVal($tankHash->{NAME},"mode","");
if ($mode eq "Filllevel") { if ($mode eq "FillLevel") {
$filllevel = $tankdata; $filllevel = $tankdata;
$volume = HProtocolGateway_Tank($hash,$tankHash,$filllevel); $volume = HProtocolGateway_Tank($hash,$tankHash,$filllevel);
} elsif ($mode eq "Volume") { } elsif ($mode eq "Volume") {

10
fhem/FHEM/12_HProtocolTank.pm
View File

@ -33,7 +33,8 @@ sub HProtocolTank_Initialize($) {
$hash->{FingerprintFn} = "HProtocolTank_Fingerprint"; $hash->{FingerprintFn} = "HProtocolTank_Fingerprint";
$hash->{AttrFn} = "HProtocolGateway_Attr"; $hash->{AttrFn} = "HProtocolGateway_Attr";
$hash->{Match} = "^[a-zA-Z0-9_]+ [a-zA-Z0-9_]+ [+-]*[0-9]+([.][0-9]+)?"; $hash->{Match} = "^[a-zA-Z0-9_]+ [a-zA-Z0-9_]+ [+-]*[0-9]+([.][0-9]+)?";
$hash->{AttrList} = "mode:Filllevel,Volume,Ullage " . $hash->{AttrList} = "hID " .
"mode:FillLevel,Volume,Ullage " .
"type " . "type " .
$readingFnAttributes; $readingFnAttributes;
} }
@ -125,7 +126,6 @@ sub HProtocolTank_Attr (@) {
<b>Define</b> <b>Define</b>
<ul> <ul>
<code>define tank01 HProtocolTank HProtocolGateway<br /> <code>define tank01 HProtocolTank HProtocolGateway<br />
setreading tank01 hID 01<br />
</code> </code>
<br /> <br />
@ -136,8 +136,6 @@ sub HProtocolTank_Attr (@) {
<a name="HProtocolTank"></a> <a name="HProtocolTank"></a>
<b>Readings</b> <b>Readings</b>
<ul> <ul>
<li>hID<br />
01 - 32 Tank Number / Tank Address (99 for testing only)</li>
<li>ullage<br /> <li>ullage<br />
0..999999 Ullage in litres</li> 0..999999 Ullage in litres</li>
<li>filllevel<br /> <li>filllevel<br />
@ -161,8 +159,10 @@ sub HProtocolTank_Attr (@) {
<a name="HProtocolTank"></a> <a name="HProtocolTank"></a>
<b>Attributes</b> <b>Attributes</b>
<ul> <ul>
<li>hID<br />
01 - 32 Tank Number / Tank Address (99 for testing only)</li>
<li>mode<br /> <li>mode<br />
Filllevel, Volume, Ullage</li> FillLevel, Volume, Ullage</li>
<li>type<br /> <li>type<br />
Strapping Table csv file / tank01.csv</li> Strapping Table csv file / tank01.csv</li>
</ul><br /> </ul><br />