FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 18:59:33 +00:00
Code Issues Releases Wiki Activity

fix for 'undefined method FRM_Client_Define in OWX...'

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@2652 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
ntruchsess 2013-02-06 06:22:18 +00:00
parent 7390a89831
commit 2d75c086d4
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fhem/FHEM/00_OWX.pm
View File

@ -192,7 +192,8 @@ sub OWX_Define ($$) {
$hash->{INTERFACE} = "serial";
$hash->{HWDEVICE} = $owx_hwdevice;
#-- check if we are connecting to Arduino (via FRM):
} elsif ($dev =~ /\d{1,2}/) {
} elsif ($dev =~ /^\d{1,2}$/) {
require "10_FRM.pm";
$hash->{INTERFACE} = "firmata";
FRM_Client_Define($hash,$def);
} else {
@ -586,7 +587,7 @@ sub OWX_Detect ($) {
$ress .= "Firmata detected in $iodev->{NAME}";
} else {
$ret=0;
$ress .= defined $iodev ? "not associated to any FRM device" : "$iodev->{NAME} is not connected to Firmata";
$ress .= defined $iodev ? "$iodev->{NAME} is not connected to Firmata" : "not associated to any FRM device";
}
#-- here we treat the COC/CUNO
} else {

2
fhem/FHEM/10_FRM.pm
View File

@ -320,7 +320,7 @@ package Firmata_IO {
sub data_write {
my ( $self, $buf ) = @_;
main::Log 5, ">".join(",",map{sprintf"%02x",ord$_}split//,$buf);
main::DevIo_SimpleWrite($self->{hash},$buf);
main::DevIo_SimpleWrite($self->{hash},$buf,undef);
}
sub data_read {