Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

12_HProtocolGateway: move sensorSystem attribute to HProtocolTank

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@18526 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
eisler 2019-02-08 10:08:12 +00:00
parent 09535ed3ed
commit 5776f70f8d
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
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.
- change: 12_HProtocolGateway: move sensorSystem attribute to HProtocolTank
- feature: 98_Verkehrsinfo.pm: add attribut timeout - feature: 98_Verkehrsinfo.pm: add attribut timeout
- feature: 12_HProtocolGateway: added 843 protocol for PMS-IB P20 - feature: 12_HProtocolGateway: added 843 protocol for PMS-IB P20
- feature: 12_HProtocolTank: added Product to calculate 15 degrees volume - feature: 12_HProtocolTank: added Product to calculate 15 degrees volume

10
FHEM/12_HProtocolGateway.pm
View File

@ -50,8 +50,7 @@ sub HProtocolGateway_Initialize($) {
"databitsLength:5,6,7,8 " . "databitsLength:5,6,7,8 " .
"stopBit:0,1 " . "stopBit:0,1 " .
"pollIntervalMins " . "pollIntervalMins " .
"path " . "path";
"sensorSystem:Hectronic,Unitronics,PMS-IB";
} }
sub HProtocolGateway_Define($$) { sub HProtocolGateway_Define($$) {
@ -116,7 +115,7 @@ sub HProtocolGateway_GetUpdate($) {
$command = "\$C"; $command = "\$C";
} }
my $sensorSystem = AttrVal($name, 'sensorSystem', ""); my $sensorSystem = AttrVal($tankHash->{NAME}, 'sensorSystem', "");
if ( $sensorSystem eq "PMS-IB") { if ( $sensorSystem eq "PMS-IB") {
$command = "H"; $command = "H";
} }
@ -188,7 +187,7 @@ sub HProtocolGateway_ParseMessage($$) {
my ($hash, $data, $tankHash) = @_; my ($hash, $data, $tankHash) = @_;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my $sensorSystem = AttrVal($name, 'sensorSystem', ""); my $sensorSystem = AttrVal($tankHash->{NAME}, 'sensorSystem', "");
my ($tanknumber,$error,$temperature,$tankdata,$water,$checksum,$version,$probe_offset); my ($tanknumber,$error,$temperature,$tankdata,$water,$checksum,$version,$probe_offset);
@ -432,7 +431,6 @@ sub HProtocolGateway_Tank($$$) {
<b>Define</b> <b>Define</b>
<ul> <ul>
<code>define &lt;name&gt; HProtocolGateway /dev/tty???<br /> <code>define &lt;name&gt; HProtocolGateway /dev/tty???<br />
attr &lt;name&gt; sensorSystem Hectronic<br />
attr &lt;name&gt; pollIntervalMins 2<br /> attr &lt;name&gt; pollIntervalMins 2<br />
attr &lt;name&gt; path /opt/fhem/<br /> attr &lt;name&gt; path /opt/fhem/<br />
attr &lt;name&gt; baudrate 1200<br /> attr &lt;name&gt; baudrate 1200<br />
@ -465,8 +463,6 @@ sub HProtocolGateway_Tank($$$) {
<a name="HProtocolGateway"></a> <a name="HProtocolGateway"></a>
<b>Attributes</b> <b>Attributes</b>
<ul> <ul>
<li>sensorSystem<br />
Sensor System / Hectronic, Unitronics, PMS-IB</li>
<li>pollIntervalMins<br /> <li>pollIntervalMins<br />
poll Interval in Mins</li> poll Interval in Mins</li>
<li>path<br /> <li>path<br />

4
FHEM/12_HProtocolTank.pm
View File

@ -37,6 +37,7 @@ sub HProtocolTank_Initialize($) {
"mode:FillLevel,Volume,Ullage " . "mode:FillLevel,Volume,Ullage " .
"type " . "type " .
"product:Diesel,FuelOil,Petrol " . "product:Diesel,FuelOil,Petrol " .
"sensorSystem:Hectronic,Unitronics,PMS-IB " .
$readingFnAttributes; $readingFnAttributes;
} }
@ -129,6 +130,7 @@ sub HProtocolTank_Attr (@) {
<code>define &lt;name&gt; HProtocolTank HProtocolGateway<br /> <code>define &lt;name&gt; HProtocolTank HProtocolGateway<br />
attr &lt;name&gt; hID 01<br /> attr &lt;name&gt; hID 01<br />
attr &lt;name&gt; sensorSystem Hectronic<br />
attr &lt;name&gt; product FuelOil<br /> attr &lt;name&gt; product FuelOil<br />
</code> </code>
<br /> <br />
@ -165,6 +167,8 @@ sub HProtocolTank_Attr (@) {
<ul> <ul>
<li>hID<br /> <li>hID<br />
01 - 32 Tank Number / Tank Address (99 for testing only)</li> 01 - 32 Tank Number / Tank Address (99 for testing only)</li>
<li>sensorSystem<br />
Sensor System / Hectronic, Unitronics, PMS-IB</li>
<li>mode<br /> <li>mode<br />
Mode / FillLevel, Volume, Ullage</li> Mode / FillLevel, Volume, Ullage</li>
<li>type<br /> <li>type<br />