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

Typos...

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@246 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2008-09-22 08:43:52 +00:00
parent b940835606
commit 0e68516170
1 changed files with 36 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
fhem/FHEM/00_FHZ.pm
View File

@ -189,10 +189,41 @@ FHZ_SetState($$$$)
##################################### #####################################
sub sub
DoInit($) DoInit($$$)
{ {
my $name = shift; my ($name,$type,$po) = @_;
my @init; my @init;
$po->reset_error();
$po->baudrate(9600);
$po->databits(8);
$po->parity('none');
$po->stopbits(1);
$po->handshake('none');
if($type && $type eq "strangetty") {
# 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
# OS then it will be ignored.
$po->stty_icanon(0);
#$po->stty_parmrk(0); # The debian standard install does not have it
$po->stty_icrnl(0);
$po->stty_echoe(0);
$po->stty_echok(0);
$po->stty_echoctl(0);
# Needed for some strange distros
$po->stty_echo(0);
$po->stty_icanon(0);
$po->stty_isig(0);
$po->stty_opost(0);
$po->stty_icrnl(0);
}
$po->write_settings;
push(@init, "get $name init2"); push(@init, "get $name init2");
push(@init, "get $name serial"); push(@init, "get $name serial");
push(@init, "set $name initHMS"); push(@init, "set $name initHMS");
@ -225,7 +256,7 @@ FHZ_Define($$)
my $name = $a[0]; my $name = $a[0];
my $dev = $a[2]; my $dev = $a[2];
my $spec = $a[3]; $hash->{ttytype} = $a[3] if($a[3]);
$attr{$name}{savefirst} = 1; $attr{$name}{savefirst} = 1;
$attr{$name}{fhtsoftbuffer} = 0; $attr{$name}{fhtsoftbuffer} = 0;
@ -247,36 +278,6 @@ FHZ_Define($$)
return "Can't open $dev: $!\n" if(!$po); return "Can't open $dev: $!\n" if(!$po);
Log 3, "FHZ opened FHZ device $dev"; Log 3, "FHZ opened FHZ device $dev";
$po->reset_error();
$po->baudrate(9600);
$po->databits(8);
$po->parity('none');
$po->stopbits(1);
$po->handshake('none');
if($spec && $spec eq "strangetty") {
# 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
# OS then it will be ignored.
$po->stty_icanon(0);
#$po->stty_parmrk(0); # The debian standard install does not have it
$po->stty_icrnl(0);
$po->stty_echoe(0);
$po->stty_echok(0);
$po->stty_echoctl(0);
# Needed for some strange distros
$po->stty_echo(0);
$po->stty_icanon(0);
$po->stty_isig(0);
$po->stty_opost(0);
$po->stty_icrnl(0);
}
$po->write_settings;
$hash->{PortObj} = $po; $hash->{PortObj} = $po;
if( $^O !~ /Win/ ) { if( $^O !~ /Win/ ) {
$hash->{FD} = $po->FILENO; $hash->{FD} = $po->FILENO;
@ -284,12 +285,10 @@ FHZ_Define($$)
} else { } else {
$readyfnlist{"$name.$dev"} = $hash; $readyfnlist{"$name.$dev"} = $hash;
} }
$hash->{DeviceName} = $dev; $hash->{DeviceName} = $dev;
$hash->{PARTIAL} = ""; $hash->{PARTIAL} = "";
DoInit($name); DoInit($name, $hash->{ttytype}, $po);
return undef; return undef;
} }
@ -558,7 +557,7 @@ FHZ_Read($)
if($hash->{PortObj}) { if($hash->{PortObj}) {
Log 1, "USB device $devname reappeared"; Log 1, "USB device $devname reappeared";
$hash->{FD} = $hash->{PortObj}->FILENO if !($^O eq 'MSWin32'); $hash->{FD} = $hash->{PortObj}->FILENO if !($^O eq 'MSWin32');
DoInit($name); DoInit($name, $hash->{ttytype}, $hash->{PortObj});
return; return;
} }
} }