From 9a8416f6cc986314c69b9f48d38ba4a559b64795 Mon Sep 17 00:00:00 2001
From: eisler <eisler@users.noreply.github.com>
Date: Thu, 13 Sep 2018 15:15:11 +0000
Subject: [PATCH] 12_HProtocolGateway / 12_HProtocolTank: minor enhancements

git-svn-id: https://svn.fhem.de/fhem/trunk@17337 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/12_HProtocolGateway.pm |  6 +++---
 fhem/FHEM/12_HProtocolTank.pm    | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/fhem/FHEM/12_HProtocolGateway.pm b/fhem/FHEM/12_HProtocolGateway.pm
index 2ddaeea88..00ede98f4 100644
--- a/fhem/FHEM/12_HProtocolGateway.pm
+++ b/fhem/FHEM/12_HProtocolGateway.pm
@@ -114,8 +114,8 @@ sub HProtocolGateway_GetUpdate($) {
     } elsif ($mode eq "Ullage") {
       $command = "\$C";
     }
-
-    my $msg = $command . $tankHash->{READINGS}{hID}{VAL} . "\r\n";
+    my $hID = AttrVal($tankHash->{NAME},"hID","");
+    my $msg = $command . $hID . "\r\n";
     DevIo_SimpleWrite($hash, $msg , 2);
     my ($err, $data) = HProtocolGateway_ReadAnswer($hash,$tankHash);
     Log3 $name, 5, "err:". $err;
@@ -202,7 +202,7 @@ sub HProtocolGateway_ParseMessage($$) {
     my ($filllevel,$volume,$ullage) = (0,0,0); 
     my $mode = AttrVal($tankHash->{NAME},"mode","");
 
-    if ($mode eq "Filllevel") {
+    if ($mode eq "FillLevel") {
       $filllevel = $tankdata;
       $volume = HProtocolGateway_Tank($hash,$tankHash,$filllevel);
     } elsif ($mode eq "Volume") {
diff --git a/fhem/FHEM/12_HProtocolTank.pm b/fhem/FHEM/12_HProtocolTank.pm
index b3aa6962c..a0a8f29e4 100644
--- a/fhem/FHEM/12_HProtocolTank.pm
+++ b/fhem/FHEM/12_HProtocolTank.pm
@@ -33,7 +33,8 @@ sub HProtocolTank_Initialize($) {
   $hash->{FingerprintFn}  = "HProtocolTank_Fingerprint";
   $hash->{AttrFn}         = "HProtocolGateway_Attr";
   $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 " .
                             $readingFnAttributes;
 }
@@ -125,7 +126,6 @@ sub HProtocolTank_Attr (@) {
   <b>Define</b>
   <ul>
     <code>define tank01 HProtocolTank HProtocolGateway<br />
-          setreading tank01 hID 01<br />
     </code>
     <br />
 
@@ -136,8 +136,6 @@ sub HProtocolTank_Attr (@) {
   <a name="HProtocolTank"></a>
   <b>Readings</b>
   <ul>
-    <li>hID<br />
-    01 - 32 Tank Number / Tank Address (99 for testing only)</li>
     <li>ullage<br />
     0..999999 Ullage in litres</li>
     <li>filllevel<br />
@@ -161,8 +159,10 @@ sub HProtocolTank_Attr (@) {
   <a name="HProtocolTank"></a>
   <b>Attributes</b>
   <ul>
+    <li>hID<br />
+    01 - 32 Tank Number / Tank Address (99 for testing only)</li>
     <li>mode<br />
-    Filllevel, Volume, Ullage</li>
+    FillLevel, Volume, Ullage</li>
     <li>type<br />
     Strapping Table csv file / tank01.csv</li>
   </ul><br />