From bd688682ab9af5bb1a9c39414f7ac821eac4b472 Mon Sep 17 00:00:00 2001 From: gvzdus <> Date: Fri, 29 Oct 2021 15:14:14 +0000 Subject: [PATCH] 47_OBIS: Added patch for ISKRA MT382 by alkazaa git-svn-id: https://svn.fhem.de/fhem/trunk@25147 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 1 + fhem/FHEM/47_OBIS.pm | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/fhem/CHANGED b/fhem/CHANGED index 938b83d37..95c52d494 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,6 @@ # 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. + - change: 47_OBIS: Added patch from alkazaa - change: 58_RPI_1Wire: Support for multiple Busmasters, enhancements, fixes - bugfix: 88_HMCCU: Keep eventMap when resetting attributes - bugfix: 88_HMCCU: Fixed attribute room bug diff --git a/fhem/FHEM/47_OBIS.pm b/fhem/FHEM/47_OBIS.pm index cca9e49ec..0332c76c2 100644 --- a/fhem/FHEM/47_OBIS.pm +++ b/fhem/FHEM/47_OBIS.pm @@ -175,9 +175,10 @@ sub OBIS_Define($$) "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)], "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 , SML, Standard, VSM102, E110'}; + if (!$devs{$type}) {return 'unknown meterType. Must be one of , SML, Standard, VSM102, E110, E350USB, AS1440, MT382'}; $devs{$type}[1] = $hash->{helper}{DEVICES}[1] // $devs{$type}[1]; $hash->{helper}{DEVICES} =$devs{$type}; $hash->{helper}{RULECACHE} = {}; @@ -952,6 +953,7 @@ sub OBIS_CRC16($$) {
@@ -1039,6 +1041,7 @@ sub OBIS_CRC16($$) {