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 Issues Packages Projects Releases Wiki Activity

fhem.pl: fix some IODev assignment (Forum #69591)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@13796 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2017-03-25 14:22:15 +00:00
parent ed4f335727
commit 9600cd637a
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fhem.pl
View File

@ -567,7 +567,12 @@ $lastDefChange = 1;
foreach my $d (keys %defs) { foreach my $d (keys %defs) {
if($defs{$d}{IODevMissing}) { if($defs{$d}{IODevMissing}) {
if($defs{$d}{IODevName} && $defs{$defs{$d}{IODevName}}) {
$defs{$d}{IODev} = $defs{$defs{$d}{IODevName}};
delete $defs{$d}{IODevName};
} else {
Log 3, "No I/O device found for $defs{$d}{NAME}"; Log 3, "No I/O device found for $defs{$d}{NAME}";
}
delete $defs{$d}{IODevMissing}; delete $defs{$d}{IODevMissing};
} }
} }
@ -2638,11 +2643,6 @@ CommandAttr($$)
$hash->{'.userReadings'}= \@userReadings; $hash->{'.userReadings'}= \@userReadings;
} }
if($attrName eq "IODev" && (!$a[2] || !defined($defs{$a[2]}))) {
push @rets,"$sdev: unknown IODev $a[2] specified";
next;
}
if($attrName eq "eventMap") { if($attrName eq "eventMap") {
delete $hash->{".eventMapHash"}; delete $hash->{".eventMapHash"};
delete $hash->{".eventMapCmd"}; delete $hash->{".eventMapCmd"};
@ -2673,6 +2673,16 @@ CommandAttr($$)
$attr{$sdev}{$attrName} = $val; $attr{$sdev}{$attrName} = $val;
if($attrName eq "IODev") { if($attrName eq "IODev") {
if(!$a[2] || !defined($defs{$a[2]})) {
if($init_done) {
push @rets,"$sdev: unknown IODev $a[2] specified";
} else {
$hash->{IODevMissing} = 1;
$hash->{IODevName} = $a[2];
}
next;
}
my $ioname = $a[2]; my $ioname = $a[2];
$hash->{IODev} = $defs{$ioname}; $hash->{IODev} = $defs{$ioname};
delete($defs{$ioname}{".clientArray"}); # Force a recompute delete($defs{$ioname}{".clientArray"}); # Force a recompute