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

FRM_IN: fix attribute 'internal-pullup' and 'activeLow' if device is not connected at startup

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@5234 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
ntruchsess 2014-03-16 12:47:53 +00:00
parent 0505f3a2d7
commit f498753fba
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fhem/FHEM/10_FRM.pm
View File

@ -567,6 +567,15 @@ sub FRM_Client_FirmataDevice($) {
return $iodev->{FirmataDevice};
}
sub FRM_Catch($) {
my $exception = shift;
if ($exception) {
$exception =~ /^(.*)( at.*FHEM.*)$/;
return $1;
}
return undef;
}
package Firmata_IO;
sub new {

22
fhem/FHEM/20_FRM_IN.pm
View File

@ -59,6 +59,7 @@ FRM_IN_Init($$)
}
$firmata->observe_digital($pin,\&FRM_IN_observer,$hash);
};
return FRM_Catch($@) if $@;
if (! (defined AttrVal($hash->{NAME},"stateFormat",undef))) {
$main::attr{$hash->{NAME}}{"stateFormat"} = "reading";
}
@ -192,17 +193,21 @@ FRM_IN_Attr($$$$) {
last;
};
$attribute eq "internal-pullup" and do {
my $firmata = FRM_Client_FirmataDevice($hash);
$firmata->digital_write($pin,$value eq "on" ? 1 : 0);
#ignore any errors here, the attribute-value will be applied next time FRM_IN_init() is called.
if ($main::init_done) {
my $firmata = FRM_Client_FirmataDevice($hash);
$firmata->digital_write($pin,$value eq "on" ? 1 : 0);
#ignore any errors here, the attribute-value will be applied next time FRM_IN_init() is called.
}
last;
};
$attribute eq "activeLow" and do {
my $oldval = AttrVal($hash->{NAME},"activeLow","no");
if ($oldval ne $value) {
$main::attr{$hash->{NAME}}{activeLow} = $value;
my $firmata = FRM_Client_FirmataDevice($hash);
FRM_IN_observer($pin,undef,$firmata->digital_read($pin),$hash);
if ($main::init_done) {
my $firmata = FRM_Client_FirmataDevice($hash);
FRM_IN_observer($pin,undef,$firmata->digital_read($pin),$hash);
}
};
last;
};
@ -225,10 +230,9 @@ FRM_IN_Attr($$$$) {
}
}
};
if ($@) {
$@ =~ /^(.*)( at.*FHEM.*)$/;
$hash->{STATE} = "error setting $attribute to $value: ".$1;
return "cannot $command attribute $attribute to $value for $name: ".$1;
if (my $error = FRM_Catch($@)) {
$hash->{STATE} = "error setting $attribute to $value: ".$error;
return "cannot $command attribute $attribute to $value for $name: ".$error;
}
}