FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-21 20:06:18 +00:00
Code Issues Releases Wiki Activity

autocreate/usb: check for symlinks, change DevIo message

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@4876 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2014-02-10 19:59:14 +00:00
parent 1054e5443c
commit 47c369b6db
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
fhem/FHEM/98_autocreate.pm
View File

@ -408,18 +408,27 @@ CommandUsb($$)
# Check if it already used # Check if it already used
foreach my $d (keys %defs) { foreach my $d (keys %defs) {
if($defs{$d}{DeviceName} && if($defs{$d}{DeviceName} &&
$defs{$d}{DeviceName} =~ m/$dev/ &&
$defs{$d}{FD}) { $defs{$d}{FD}) {
$msg = "already used by the fhem device $d";
Log3 undef, 4, $msg; $ret .= $msg . "\n"; my $dn = $defs{$d}{DeviceName};
goto NEXTDEVICE; my $match = ($dn =~ m/$dev/);
if(!$match) {
$dn =~ s/@.*//;
$match = (readlink($dn) =~ m/$dev/) if(-l $dn);
}
if($match) {
$msg = "already used by the fhem device $d";
Log3 undef, 4, $msg; $ret .= $msg . "\n";
goto NEXTDEVICE;
}
} }
} }
# Open the device # Open the device
my $dname = $thash->{DeviceName}; my $dname = $thash->{DeviceName};
$dname =~ s,DEVICE,$dir/$dev,g; $dname =~ s,DEVICE,$dir/$dev,g;
my $hash = { NAME=>$name, DeviceName=>$dname }; my $hash = { NAME=>$name, DeviceName=>$dname, DevioText=>"Probing" };
DevIo_OpenDev($hash, 0, 0); DevIo_OpenDev($hash, 0, 0);
if(!defined($hash->{USBDev})) { if(!defined($hash->{USBDev})) {
DevIo_CloseDev($hash); # remove the ReadyFn loop DevIo_CloseDev($hash); # remove the ReadyFn loop

11
fhem/FHEM/DevIo.pm
View File

@ -104,8 +104,8 @@ DevIo_OpenDev($$$)
($dev, $baudrate) = split("@", $dev); ($dev, $baudrate) = split("@", $dev);
$hash->{PARTIAL} = ""; $hash->{PARTIAL} = "";
Log3 $name, 3, "Opening $name device $dev" Log3 $name, 3, ($hash->{DevioText} ? $hash->{DevioText} : "Opening").
if(!$reopen); " $name device $dev" if(!$reopen);
if($dev =~ m/^UNIX:(SEQPACKET|STREAM):(.*)$/) { # FBAHA if($dev =~ m/^UNIX:(SEQPACKET|STREAM):(.*)$/) { # FBAHA
my ($type, $fname) = ($1, $2); my ($type, $fname) = ($1, $2);
@ -216,7 +216,8 @@ DevIo_OpenDev($$$)
if($baudrate) { if($baudrate) {
$po->reset_error(); $po->reset_error();
Log3 $name, 3, "Setting $name baudrate to $baudrate"; Log3 $name, 3, "Setting $name baudrate to $baudrate"
if(!$hash->{DevioText});
$po->baudrate($baudrate); $po->baudrate($baudrate);
$po->databits(8); $po->databits(8);
$po->parity('none'); $po->parity('none');
@ -243,14 +244,12 @@ DevIo_OpenDev($$$)
} }
$po->write_settings; $po->write_settings;
} }
if($reopen) { if($reopen) {
Log3 $name, 1, "$dev reappeared ($name)"; Log3 $name, 1, "$dev reappeared ($name)";
} else { } else {
Log3 $name, 3, "$name device opened"; Log3 $name, 3, "$name device opened" if(!$hash->{DevioText});
} }
$hash->{STATE}="opened"; $hash->{STATE}="opened";