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

98_autocreate.pm: implement oneway USB devices / ElsnerWS (Forum #100054)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@19364 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2019-05-10 17:35:38 +00:00
parent 7f2be82b30
commit fab86029fe
2 changed files with 41 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
fhem/FHEM/98_autocreate.pm
View File

@ -527,16 +527,26 @@ my @usbtable = (
response => "^ArduCounter V.*", # response is two lines
define => "ArduCounter_PARAM ArduCounter DEVICE\@38400", },
# FRM causes too much lockups, removed until understood why (Forum #100054)
# { NAME => "FRM",
# matchList => ["cu.usbserial(.*)", "cu.usbmodem(.*)",
# "ttyUSB(.*)", "ttyACM(.*)", "ttyAMA(.*)"],
# DeviceName=> "DEVICE\@57600",
# init => pack("H*", "F9"), # Reset
# timeout => 5.0, # StandardFirmata blink takes time
# request => pack("H*", "F079F7"), # Query firmware version and filename START_SYSEX (0xF0), queryFirmware (0x79), END_SYSEX (0xF7)
# response => "^\xF0\x79(.*)\xF7", # Response Sysex xF0 x78 (2 Byte version) (n Byte filename) Endsysex xF7
# define => "FRM_PARAM FRM DEVICE\@57600", },
{ NAME => "ElsnerWS",
matchList => ["cu.usbserial(.*)", "cu.usbmodem(.*)",
"ttyUSB(.*)", "ttyACM(.*)", "ttyAMA(.*)"],
DeviceName=> "DEVICE\@19200",
timeout => 1.1,
maxLen => 32,
response => "[GW][+-][0-9]{2}\.[0-9]{7}[JN][0-9]{5}".
"\.[0-9][JN].*[0-9]{4}\x03",
define => "ElsnerWS_PARAM ElsnerWS comtype=rs485 ".
"devicename=DEVICE\@19200", },
{ NAME => "FRM",
matchList => ["cu.usbserial(.*)", "cu.usbmodem(.*)",
"ttyUSB(.*)", "ttyACM(.*)", "ttyAMA(.*)"],
DeviceName=> "DEVICE\@57600",
init => pack("H*", "F9"), # Reset
timeout => 5.0, # StandardFirmata blink takes time
request => pack("H*", "F079F7"), # Query firmware version and filename START_SYSEX (0xF0), queryFirmware (0x79), END_SYSEX (0xF7)
response => "^\xF0\x79(.*)\xF7", # Response Sysex xF0 x78 (2 Byte version) (n Byte filename) Endsysex xF7
define => "FRM_PARAM FRM DEVICE\@57600", },
);
@ -629,10 +639,21 @@ CommandUsb($$)
}
# Clear the USB buffer
DevIo_SimpleWrite($hash, $thash->{flush}, 0) if($thash->{flush});
DevIo_TimeoutRead($hash, 0.1);
DevIo_SimpleWrite($hash, $thash->{request}, 0);
my $answer = DevIo_TimeoutRead($hash, 0.1);
if($thash->{flush}) {
DevIo_SimpleWrite($hash, $thash->{flush}, 0);
DevIo_TimeoutRead($hash, 0.1);
}
my $answer="";
if($thash->{request}) {
DevIo_SimpleWrite($hash, $thash->{request}, 0);
$answer = DevIo_TimeoutRead($hash, 0.1);
} elsif($thash->{timeout} && $thash->{maxLen}) {
$answer = DevIo_TimeoutRead($hash,
$thash->{timeout}, $thash->{maxLen});
}
if(AttrVal("global", "verbose", 0) >= 5) {
my $aTxt = $answer;
$aTxt =~ s/([^ -~])/"(".ord($1).")"/ge;

9
fhem/FHEM/DevIo.pm
View File

@ -10,7 +10,7 @@ sub DevIo_SetHwHandshake($);
sub DevIo_SimpleRead($);
sub DevIo_SimpleReadWithTimeout($$);
sub DevIo_SimpleWrite($$$;$);
sub DevIo_TimeoutRead($$);
sub DevIo_TimeoutRead($$;$);
sub
DevIo_setStates($$)
@ -100,11 +100,13 @@ DevIo_SimpleReadWithTimeout($$)
# NOTE1: FHEM WILL be blocked for $timeout seconds, DO NOT USE IT!
# NOTE2: This works on Windows only for TCP connections
sub
DevIo_TimeoutRead($$)
DevIo_TimeoutRead($$;$)
{
my ($hash, $timeout) = @_;
my ($hash, $timeout, $maxlen) = @_;
my $answer = "";
$timeout = 1 if(!$timeout);
$maxlen = 1024 if(!$maxlen); # Avoid endless loop
for(;;) {
my $rin = "";
vec($rin, $hash->{FD}, 1) = 1;
@ -113,6 +115,7 @@ DevIo_TimeoutRead($$)
my $r = DevIo_DoSimpleRead($hash);
last if(!defined($r) || ($r == "" && $hash->{TCPDev}));
$answer .= $r;
last if(length($anser) >= $maxlen);
}
return $answer;
}