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

70_DENON_AVR: serial connection issues

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@23343 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
delmar 2020-12-13 16:30:22 +00:00
parent 039f0507dd
commit 991a33c2ca
2 changed files with 15 additions and 16 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: 70_DENON_AVR: serial connection issues
- feature: 77_SMAEM: attr serialNumber may contain multiple serial numbers - feature: 77_SMAEM: attr serialNumber may contain multiple serial numbers
- feature: 57_SSCal: handle multiline code in description field if automatic - feature: 57_SSCal: handle multiline code in description field if automatic
creation of at-devices is used creation of at-devices is used

20
fhem/FHEM/70_DENON_AVR.pm
View File

@ -1151,14 +1151,8 @@ DENON_AVR_Define($$)
} }
# connect using serial connection (old blocking style)
if ($hash->{DeviceName} =~ /^([0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}) (.+@.+)/)
{
my $ret = DevIo_OpenDev($hash, 0, "DENON_AVR_DoInit");
return $ret;
}
# connect using TCP connection (non-blocking style) # connect using TCP connection (non-blocking style)
else if ($hash->{DeviceName} =~ /^([0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3})/)
{ {
$hash->{IP} = $a[2]; $hash->{IP} = $a[2];
use XML::Simple qw(:strict); use XML::Simple qw(:strict);
@ -1167,14 +1161,18 @@ DENON_AVR_Define($$)
$hash->{DeviceName} = $hash->{DeviceName} . ":23" $hash->{DeviceName} = $hash->{DeviceName} . ":23"
if ( $hash->{DeviceName} !~ m/^(.+):([0-9]+)$/ ); if ( $hash->{DeviceName} !~ m/^(.+):([0-9]+)$/ );
DevIo_OpenDev( my $ret = DevIo_OpenDev($hash, 0, "DENON_AVR_DoInit",
$hash, 0,
"DENON_AVR_DoInit",
sub() { sub() {
my ( $hash, $err ) = @_; my ( $hash, $err ) = @_;
Log3 $name, 4, "DENON_AVR $name: $err." if ($err); Log3 $name, 4, "DENON_AVR $name: $err." if ($err);
});
return $ret;
} }
); # connect using serial connection (old blocking style)
else
{
DevIo_OpenDev($hash, 0, "DENON_AVR_DoInit");
} }
} }