mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

10_MQTT2_DEVICE.pm: Assign the right IODev (Forum #91394)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@20322 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig
2019-10-06 19:57:47 +00:00
parent 418fc94a06
commit b6551e81d2
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fhem/FHEM/10_MQTT2_DEVICE.pm
View File

@@ -63,6 +63,8 @@ MQTT2_DEVICE_Define($$)
my $name = shift @a; my $name = shift @a;
my $type = shift @a; # always MQTT2_DEVICE my $type = shift @a; # always MQTT2_DEVICE
$hash->{CID} = shift(@a) if(@a); $hash->{CID} = shift(@a) if(@a);
my $ioname = (@a ? shift(@a) : undef);
$hash->{DEF} = ($hash->{CID} ? $hash->{CID} : "") if($hash->{DEF}); #rm ioname
return "wrong syntax for $name: define <name> MQTT2_DEVICE [clientid]" return "wrong syntax for $name: define <name> MQTT2_DEVICE [clientid]"
if(int(@a)); if(int(@a));
@@ -79,7 +81,7 @@ MQTT2_DEVICE_Define($$)
if(!$init_done && !$bridgeTimerStarted); if(!$init_done && !$bridgeTimerStarted);
$bridgeTimerStarted = 1; $bridgeTimerStarted = 1;
AssignIoPort($hash); AssignIoPort($hash, $ioname);
return undef; return undef;
} }
@@ -88,7 +90,6 @@ sub
MQTT2_DEVICE_Parse($$) MQTT2_DEVICE_Parse($$)
{ {
my ($iodev, $msg) = @_; my ($iodev, $msg) = @_;
my $ioname = $iodev->{NAME};
my %fnd; my %fnd;
sub sub
@@ -237,7 +238,7 @@ MQTT2_DEVICE_Parse($$)
if(!$cidArr || !int(@{$cidArr})) { if(!$cidArr || !int(@{$cidArr})) {
my $devName = $newCid; my $devName = $newCid;
$devName = makeDeviceName($devName); $devName = makeDeviceName($devName);
return "UNDEFINED MQTT2_$devName MQTT2_DEVICE $newCid"; return "UNDEFINED MQTT2_$devName MQTT2_DEVICE $newCid ".$iodev->{NAME};
} }
return ""; return "";
} }