Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

ZWave moved to mainline

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@1775 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2012-07-30 09:53:38 +00:00
parent 69a46b6c7b
commit 922eb148a6
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGED
View File

@ -56,6 +56,7 @@
- feature: telnet module added, attr global port moved. allowfrom changed. - feature: telnet module added, attr global port moved. allowfrom changed.
- feature: FhemUtils/release.pm for the new update process added. (M. Fischer) - feature: FhemUtils/release.pm for the new update process added. (M. Fischer)
- bugfix: correct one-time relative at commands after reboot - bugfix: correct one-time relative at commands after reboot
- feature: ZWave added
- 2011-12-31 (5.2) - 2011-12-31 (5.2)
- bugfix: applying smallscreen attributes to firefox/opera - bugfix: applying smallscreen attributes to firefox/opera

0
contrib/00_ZWDongle.pm → FHEM/00_ZWDongle.pm
View File

0
contrib/10_ZWave.pm → FHEM/10_ZWave.pm
View File

17
FHEM/DevIo.pm
View File

@ -8,6 +8,7 @@ sub DevIo_SimpleWrite($$$);
sub DevIo_OpenDev($$$); sub DevIo_OpenDev($$$);
sub DevIo_CloseDev($); sub DevIo_CloseDev($);
sub DevIo_Disconnected($); sub DevIo_Disconnected($);
sub DevIo_SetHwHandshake($);
######################## ########################
sub sub
@ -134,7 +135,7 @@ DevIo_OpenDev($$$)
delete($readyfnlist{"$name.$dev"}); delete($readyfnlist{"$name.$dev"});
$selectlist{"$name.$dev"} = $hash; $selectlist{"$name.$dev"} = $hash;
} elsif($baudrate && lc($baudrate) eq "directio") { # Without Device::SerialPort } elsif($baudrate && lc($baudrate) eq "directio") { # w/o Device::SerialPort
if(!open($po, "+<$dev")) { if(!open($po, "+<$dev")) {
return undef if($reopen); return undef if($reopen);
@ -157,7 +158,6 @@ DevIo_OpenDev($$$)
} else { # USB/Serial device } else { # USB/Serial device
if ($^O=~/Win/) { if ($^O=~/Win/) {
eval { eval {
require Win32::SerialPort; require Win32::SerialPort;
@ -200,8 +200,9 @@ DevIo_OpenDev($$$)
$po->handshake('none'); $po->handshake('none');
# This part is for some Linux kernel versions whih has strange default # This part is for some Linux kernel versions whih has strange default
# settings. Device::SerialPort is nice: if the flag is not defined for your # settings. Device::SerialPort is nice: if the flag is not defined for
# OS then it will be ignored. # your OS then it will be ignored.
$po->stty_icanon(0); $po->stty_icanon(0);
#$po->stty_parmrk(0); # The debian standard install does not have it #$po->stty_parmrk(0); # The debian standard install does not have it
$po->stty_icrnl(0); $po->stty_icrnl(0);
@ -243,6 +244,14 @@ DevIo_OpenDev($$$)
return $ret; return $ret;
} }
sub
DevIo_SetHwHandshake($)
{
my ($hash) = @_;
$hash->{USBDev}->can_dtrdsr();
$hash->{USBDev}->can_rtscts();
}
######################## ########################
sub sub
DevIo_CloseDev($) DevIo_CloseDev($)