FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-04 17:36:39 +00:00
Code Issues Releases Wiki Activity

47_OBIS: Fixed some error-messages at startup

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@11485 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
icinger 2016-05-20 18:55:57 +00:00
parent 4dfe84df4e
commit d35fbe7662
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
fhem/FHEM/47_OBIS.pm
View File

@ -72,7 +72,7 @@ sub OBIS_Initialize($)
$hash->{ReadyFn} = "OBIS_Ready"; $hash->{ReadyFn} = "OBIS_Ready";
$hash->{DefFn} = "OBIS_Define"; $hash->{DefFn} = "OBIS_Define";
$hash->{ParseFn} = "OBIS_Parse"; $hash->{ParseFn} = "OBIS_Parse";
# $hash->{SetFn} = "OBIS_Set"; #$hash->{SetFn} = "OBIS_Set";
$hash->{UndefFn} = "OBIS_Undef"; $hash->{UndefFn} = "OBIS_Undef";
$hash->{AttrFn} = "OBIS_Attr"; $hash->{AttrFn} = "OBIS_Attr";
@ -116,7 +116,7 @@ sub OBIS_Define($$)
my $baudrate; my $baudrate;
my $devi; my $devi;
($devi, $baudrate) = split("@", $dev); ($devi, $baudrate) = split("@", $dev);
$hash->{helper}{SPEED}="0";
if (defined($baudrate)) { ## added for ser2net connection if (defined($baudrate)) { ## added for ser2net connection
if($baudrate =~ m/(\d+)(,([78])(,([NEO])(,([012]))?)?)?/) { if($baudrate =~ m/(\d+)(,([78])(,([NEO])(,([012]))?)?)?/) {
$baudrate = $1 if(defined($1)); $baudrate = $1 if(defined($1));
@ -162,7 +162,9 @@ sub GetUpdate($)
$hash->{helper}{EoM}=-1; $hash->{helper}{EoM}=-1;
if ($hash->{helper}{DEVICES}[1] eq "") {return undef;} if ($hash->{helper}{DEVICES}[1] eq "") {return undef;}
DevIo_SimpleWrite($hash,$hash->{helper}{DEVICES}[0],undef) ; if( $init_done ) {
DevIo_SimpleWrite($hash,$hash->{helper}{DEVICES}[0],undef) ;
}
my $t=OBIS_adjustAlign($hash,AttrVal($name,"alignTime",undef),$hash->{helper}{DEVICES}[1]); my $t=OBIS_adjustAlign($hash,AttrVal($name,"alignTime",undef),$hash->{helper}{DEVICES}[1]);
Log3 ($hash,5,"OBIS ($name) - Internal timer set to ".FmtDateTime($t)) if ($hash->{helper}{DEVICES}[1]>0); Log3 ($hash,5,"OBIS ($name) - Internal timer set to ".FmtDateTime($t)) if ($hash->{helper}{DEVICES}[1]>0);
InternalTimer($t, "GetUpdate", $hash, 1) if ($hash->{helper}{DEVICES}[1]>0); InternalTimer($t, "GetUpdate", $hash, 1) if ($hash->{helper}{DEVICES}[1]>0);
@ -185,11 +187,12 @@ sub OBIS_Undef($$)
sub OBIS_Read($) sub OBIS_Read($)
{ {
my ($hash) = @_; my ($hash) = @_;
if( !$init_done ) { return(undef)}; if( $init_done ) {
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my $buf = DevIo_SimpleRead($hash); my $buf = DevIo_SimpleRead($hash);
OBIS_Parse($hash,$buf) if ($hash->{helper}{EoM}!=1); OBIS_Parse($hash,$buf) if ($hash->{helper}{EoM}!=1);
}
return(undef); return(undef);
} }
@ -330,10 +333,13 @@ sub OBIS_Parse($$)
my $rmsg=""; my $rmsg="";
$rmsg = substr($buffer, 0, index($buffer,chr(13).chr(10))); $rmsg = substr($buffer, 0, index($buffer,chr(13).chr(10)));
Log3 $hash,5,"OBIS ($name) - Msg-Parse: $rmsg"; Log3 $hash,5,"OBIS ($name) - Msg-Parse: $rmsg";
my $channel=" ";
if($rmsg=~/\/.*|^((?:\d{1,3}-\d{1,3}:)?\d{1,3}.\d{1,3}.\d{1,3})(?:\*\d{1,3})?(?:\(.*?\))?\(.*?\)|!/) { # old regex: \/.*|\d-\d{1,3}:\d{1,3}.\d{1,3}.\d{1,3}\*\d{1,3}\(.*?\)|! if($rmsg=~/\/.*|^((?:\d{1,3}-\d{1,3}:)?\d{1,3}.\d{1,3}.\d{1,3})(?:\*\d{1,3})?(?:\(.*?\))?\(.*?\)|!/) { # old regex: \/.*|\d-\d{1,3}:\d{1,3}.\d{1,3}.\d{1,3}\*\d{1,3}\(.*?\)|!
my $channel=$1; if (length $1) {
$channel=~s/:/\./; $channel=$1;
$channel=~s/-/\./; $channel=~s/:/\./;
$channel=~s/-/\./;
}
if ($hash->{MeterType} eq "Unknown") {$hash->{MeterType}="Standard"} if ($hash->{MeterType} eq "Unknown") {$hash->{MeterType}="Standard"}
if($rmsg=~/^([23456789]+)-.*/) { if($rmsg=~/^([23456789]+)-.*/) {
Log3 $hash,3,"OBIS ($name) - Unknown OBIS-Device, please report: $rmsg".chr(13).chr(10)."Please report to User icinger at forum.fhem.de"; Log3 $hash,3,"OBIS ($name) - Unknown OBIS-Device, please report: $rmsg".chr(13).chr(10)."Please report to User icinger at forum.fhem.de";
@ -344,12 +350,12 @@ sub OBIS_Parse($$)
$hash->{helper}{EoM}+=1 if ($hash->{helper}{DEVICES}[1]>0); $hash->{helper}{EoM}+=1 if ($hash->{helper}{DEVICES}[1]>0);
} }
#Version #Version
if ($rmsg=~ /.*\/(.*)/) { elsif ($rmsg=~ /.*\/(.*)/) {
DevIo_SimpleWrite($hash,$hash->{helper}{DEVICES}[2],undef) if (!$hash->{helper}{DEVICES}[2] eq ""); DevIo_SimpleWrite($hash,$hash->{helper}{DEVICES}[2],undef) if (!$hash->{helper}{DEVICES}[2] eq "");
if (ReadingsVal($name,"Version","") ne $1) {readingsBulkUpdate($hash, "Version" ,$1); } if (ReadingsVal($name,"Version","") ne $1) {readingsBulkUpdate($hash, "Version" ,$1); }
$hash->{helper}{EoM}=0; $hash->{helper}{EoM}=0;
} }
if ($hash->{helper}{EoM}!=1) { elsif ($hash->{helper}{EoM}!=1) {
my @patterns=values %OBIS_codes; my @patterns=values %OBIS_codes;
if (!$rmsg~~@patterns) { if (!$rmsg~~@patterns) {
Log3 $hash,3,"OBIS ($name) - Unknown Message: $rmsg".chr(13).chr(10)."Please report to User icinger at forum.fhem.de" Log3 $hash,3,"OBIS ($name) - Unknown Message: $rmsg".chr(13).chr(10)."Please report to User icinger at forum.fhem.de"
@ -701,8 +707,6 @@ sub OBIS_decodeTL($){
Reduces CPU-load. Reduces CPU-load.
<code>unitReadings</code><br> <code>unitReadings</code><br>
Adds the units to the readings like w, wH, A etc. Adds the units to the readings like w, wH, A etc.
<code>ignoreUnknown</code><br>
Ignores unknown OBIS-Data
</li> </li>
<br> <br>
@ -770,9 +774,8 @@ sub OBIS_decodeTL($){
kann das zu einer spürbaren Senkung der Prozessorleistung führen. kann das zu einer spürbaren Senkung der Prozessorleistung führen.
<code>unitReadings</code><br> <code>unitReadings</code><br>
Hängt bei den Readings auch die Einheiten an, zB w, wH, A usw. Hängt bei den Readings auch die Einheiten an, zB w, wH, A usw.
<code>ignoreUnknown</code><br>
Ignoriert unbekannte OBIS-Datensätze
</li> </li>
<br>
</ul> </ul>
=end html_DE =end html_DE