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

47_OBIS: fixed DZG workaround

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@24196 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
gvzdus 2021-04-09 05:11:21 +00:00
parent cbb02addbc
commit 1c985f54c2
2 changed files with 4 additions and 3 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.
- bugfix: 47_OBIS: Reintegrate buggy DZG meters support
- change: 49_IPCAM: introduced attribute httpTimeout - change: 49_IPCAM: introduced attribute httpTimeout
- change: 49_IPCAM: introduced incrementalTimeout - change: 49_IPCAM: introduced incrementalTimeout
- feature: 93_DbLog: new attributes SQLiteCacheSize, SQLiteJournalMode - feature: 93_DbLog: new attributes SQLiteCacheSize, SQLiteJournalMode

6
fhem/FHEM/47_OBIS.pm
View File

@ -418,8 +418,8 @@ sub OBIS_Parse_List
# Signed (5) or Unsigned (6) Int # Signed (5) or Unsigned (6) Int
my $num = 0; my $num = 0;
my $subme = 0; my $subme = 0;
if ($tltype==0x60 && $len>3 && $result[0]=~/^1-0:16\.7\.0/ && $hash->{helper}{DZGHACK}) { if ($tltype==0x50 && $len<4 && $isobis && $cntdown==2 && $result[0]=~/^1-0:16\.7\.0/ && $hash->{helper}{DZGHACK}) {
$tltype = 0x50; $tltype = 0x60;
} }
if ($len==8) { if ($len==8) {
$num = unpack($tltype = 0x50 ? 'q>' : 'Q>', $num = unpack($tltype = 0x50 ? 'q>' : 'Q>',
@ -461,7 +461,7 @@ sub OBIS_Parse_List
} }
my $line = $result[0] . "(" . $result[5] . ($result[3] eq "" ? "" : "*".$result[3]) . ")\r\n"; my $line = $result[0] . "(" . $result[5] . ($result[3] eq "" ? "" : "*".$result[3]) . ")\r\n";
$hash->{helper}{DZGHACK} = 1 if ($line=~/^1-0:96\.50\.1\*255\(DZG\)/); $hash->{helper}{DZGHACK} = 1 if ($line=~/^1-0:96\.50\.1\*.*\(DZG/);
$_[1] .= $line; $_[1] .= $line;
return undef; return undef;