lechu/go-serial
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated API on windows implementation

Browse Source
This commit is contained in:
Cristian Maglie
2014-12-30 14:17:59 +01:00
parent ddce273c49
commit 4eaa3b67d0
1 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
serial_windows.go
View File

@@ -203,16 +203,24 @@ const (
TWOSTOPBITS = 2 TWOSTOPBITS = 2
) )
func (port windowsSerialPort) SetSpeed(baudrate int) error { func (port windowsSerialPort) SetMode(mode *Mode) error {
params := DCB{} params := DCB{}
if err := GetCommState(port.Handle, &params); err != nil { if err := GetCommState(port.Handle, &params); err != nil {
port.Close() port.Close()
return &SerialPortError{code: ERROR_INVALID_SERIAL_PORT} return &SerialPortError{code: ERROR_INVALID_SERIAL_PORT}
} }
params.BaudRate = uint32(baudrate) if mode.Baudrate == 0 {
params.ByteSize = 8 params.BaudRate = 9600 // Default to 9600
params.StopBits = ONESTOPBIT } else {
params.Parity = NOPARITY params.BaudRate = uint32(mode.BaudRate)
}
if mode.DataBits == 0 {
params.ByteSize = 8 // Default to 8 bits
} else {
params.ByteSize = mode.DataBits
}
params.StopBits = mode.StopBits
params.Parity = mode.Parity
if err := SetCommState(port.Handle, &params); err != nil { if err := SetCommState(port.Handle, &params); err != nil {
port.Close() port.Close()
return &SerialPortError{code: ERROR_INVALID_SERIAL_PORT} return &SerialPortError{code: ERROR_INVALID_SERIAL_PORT}
@@ -220,7 +228,7 @@ func (port windowsSerialPort) SetSpeed(baudrate int) error {
return nil return nil
} }
func OpenPort(portName string, useTIOCEXCL bool) (SerialPort, error) { func OpenPort(portName string, mode Mode) (SerialPort, error) {
portName = "\\\\.\\" + portName portName = "\\\\.\\" + portName
path, err := syscall.UTF16PtrFromString(portName) path, err := syscall.UTF16PtrFromString(portName)
if err != nil { if err != nil {
@@ -247,6 +255,12 @@ func OpenPort(portName string, useTIOCEXCL bool) (SerialPort, error) {
Handle: handle, Handle: handle,
} }
// Set port parameters
if err := port.SetMode(mode); err != nil {
port.Close()
return nil, &SerialPortError{code: ERROR_INVALID_SERIAL_PORT}
}
params := &DCB{} params := &DCB{}
err = GetCommState(port.Handle, params) err = GetCommState(port.Handle, params)
if err != nil { if err != nil {
@@ -272,6 +286,7 @@ func OpenPort(portName string, useTIOCEXCL bool) (SerialPort, error) {
return nil, &SerialPortError{code: ERROR_INVALID_SERIAL_PORT} return nil, &SerialPortError{code: ERROR_INVALID_SERIAL_PORT}
} }
// Set timeouts to 1 second
timeouts := &COMMTIMEOUTS{ timeouts := &COMMTIMEOUTS{
ReadIntervalTimeout: 0xFFFFFFFF, ReadIntervalTimeout: 0xFFFFFFFF,
ReadTotalTimeoutMultiplier: 0xFFFFFFFF, ReadTotalTimeoutMultiplier: 0xFFFFFFFF,