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

Merge branch 'dev'

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@4080 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
ntruchsess
2013-10-20 20:10:49 +00:00
parent 9784f6d1a1
commit 73af9420e0
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
fhem/FHEM/10_FRM.pm
View File

@@ -372,6 +372,16 @@ FRM_Init_Pin_Client($$$) {
my $u = "wrong syntax: define <name> FRM_XXX pin";
return $u unless defined $args and int(@$args) > 0;
my $pin = @$args[0];
foreach my $d ( sort keys %main::defs ) {
if ( defined( $main::defs{$d} )
&& defined( $main::defs{$d}{IODev} )
&& defined( $main::defs{$d}{PIN} )
&& $main::defs{$d}{IODev} == $hash->{IODev}
&& $main::defs{$d}{PIN} == $pin ) {
die "Device $main::defs{$d}{NAME} allready defined for pin $pin";
}
}
$hash->{PIN} = $pin;
eval {
FRM_Client_FirmataDevice($hash)->pin_mode($pin,$mode);
@@ -393,9 +403,10 @@ FRM_Client_Define($$)
$hash->{STATE}="defined";
AssignIoPort($hash);
FRM_Init_Client($hash,[@a[2..scalar(@a)-1]]);
return undef;
eval {
FRM_Init_Client($hash,[@a[2..scalar(@a)-1]]);
};
return $@;
}
sub