FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-21 01:46:08 +00:00
Code Issues Releases Wiki Activity

47_OBIS: Added patch for ISKRA MT382 by alkazaa

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@25147 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
gvzdus 2021-10-29 15:14:14 +00:00
parent 239327119b
commit bd688682ab
2 changed files with 6 additions and 2 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.
- change: 47_OBIS: Added patch from alkazaa
- change: 58_RPI_1Wire: Support for multiple Busmasters, enhancements, fixes - change: 58_RPI_1Wire: Support for multiple Busmasters, enhancements, fixes
- bugfix: 88_HMCCU: Keep eventMap when resetting attributes - bugfix: 88_HMCCU: Keep eventMap when resetting attributes
- bugfix: 88_HMCCU: Fixed attribute room bug - bugfix: 88_HMCCU: Fixed attribute room bug

7
fhem/FHEM/47_OBIS.pm
View File

@ -175,9 +175,10 @@ sub OBIS_Define($$)
"VSM102" => ["/?!".chr(13).chr(10), 600, chr(6)."0".$hash->{helper}{SPEED}."0".chr(13).chr(10)], "VSM102" => ["/?!".chr(13).chr(10), 600, chr(6)."0".$hash->{helper}{SPEED}."0".chr(13).chr(10)],
"E110" => ["/?!".chr(13).chr(10), 600, chr(6)."0".$hash->{helper}{SPEED}."0".chr(13).chr(10)], "E110" => ["/?!".chr(13).chr(10), 600, chr(6)."0".$hash->{helper}{SPEED}."0".chr(13).chr(10)],
"E350USB" => ["/?!".chr(13).chr(10), 600, chr(6)."0".$hash->{helper}{SPEED}."0".chr(13).chr(10)], "E350USB" => ["/?!".chr(13).chr(10), 600, chr(6)."0".$hash->{helper}{SPEED}."0".chr(13).chr(10)],
"AS1440" => ["/2!".chr(13).chr(10), 600, chr(6)."0".$hash->{helper}{SPEED}."0".chr(13).chr(10)] "AS1440" => ["/2!".chr(13).chr(10), 600, chr(6)."0".$hash->{helper}{SPEED}."0".chr(13).chr(10)],
"MT382" => ["/?!".chr(13).chr(10), 20, chr(0).chr(0).chr(0).chr(0).chr(0).chr(0).chr(6)."0".$hash->{helper}{SPEED}."0".chr(13).chr(10)] #this line added by alkazaa
); );
if (!$devs{$type}) {return 'unknown meterType. Must be one of <nothing>, SML, Standard, VSM102, E110'}; if (!$devs{$type}) {return 'unknown meterType. Must be one of <nothing>, SML, Standard, VSM102, E110, E350USB, AS1440, MT382'};
$devs{$type}[1] = $hash->{helper}{DEVICES}[1] // $devs{$type}[1]; $devs{$type}[1] = $hash->{helper}{DEVICES}[1] // $devs{$type}[1];
$hash->{helper}{DEVICES} =$devs{$type}; $hash->{helper}{DEVICES} =$devs{$type};
$hash->{helper}{RULECACHE} = {}; $hash->{helper}{RULECACHE} = {};
@ -952,6 +953,7 @@ sub OBIS_CRC16($$) {
<ul><li>VSM102 -&gt; Voltcraft VSM102</li> <ul><li>VSM102 -&gt; Voltcraft VSM102</li>
<li>E110 -&gt; Landis&&;Gyr E110</li> <li>E110 -&gt; Landis&&;Gyr E110</li>
<li>E350USB -&gt; Landis&&;Gyr E350 USB-Version</li> <li>E350USB -&gt; Landis&&;Gyr E350 USB-Version</li>
<li>MT382 -&gt; ISKRA MT382</li>
<li>Standard -&gt; Data comes as plainText</li> <li>Standard -&gt; Data comes as plainText</li>
<li>SML -&gt; Smart Message Language</li></ul> <li>SML -&gt; Smart Message Language</li></ul>
<br> <br>
@ -1039,6 +1041,7 @@ sub OBIS_CRC16($$) {
<ul><li>VSM102 -&gt; Voltcraft VSM102</li> <ul><li>VSM102 -&gt; Voltcraft VSM102</li>
<li>E110 -&gt; Landis&&;Gyr E110</li> <li>E110 -&gt; Landis&&;Gyr E110</li>
<li>E350USB -&gt; Landis&&;Gyr E350 USB-Version</li> <li>E350USB -&gt; Landis&&;Gyr E350 USB-Version</li>
<li>MT382 -&gt; ISKRA MT382</li>
<li>Standard -&gt; Daten kommen als plainText</li> <li>Standard -&gt; Daten kommen als plainText</li>
<li>SML -&gt; Smart Message Language</li></ul> <li>SML -&gt; Smart Message Language</li></ul>
<br> <br>