aboutsummaryrefslogtreecommitdiff
path: root/flow-main/src/main/scala
diff options
context:
space:
mode:
authorJakob Odersky <jodersky@gmail.com>2013-07-11 15:33:14 +0200
committerJakob Odersky <jodersky@gmail.com>2013-07-11 15:33:14 +0200
commitb686a116e484cc8f315443e09a8e20a9ccb7abce (patch)
tree6249e59955a756d12c7c54915a45fc70f99496ca /flow-main/src/main/scala
parent9ceea97cfb9bbf692c986534860ab0bbb315911b (diff)
downloadakka-serial-b686a116e484cc8f315443e09a8e20a9ccb7abce.tar.gz
akka-serial-b686a116e484cc8f315443e09a8e20a9ccb7abce.tar.bz2
akka-serial-b686a116e484cc8f315443e09a8e20a9ccb7abce.zip
add support for different serial configurations
Diffstat (limited to 'flow-main/src/main/scala')
-rw-r--r--flow-main/src/main/scala/com/github/jodersky/flow/exceptions.scala2
-rw-r--r--flow-main/src/main/scala/com/github/jodersky/flow/internal/InternalSerial.scala6
2 files changed, 4 insertions, 4 deletions
diff --git a/flow-main/src/main/scala/com/github/jodersky/flow/exceptions.scala b/flow-main/src/main/scala/com/github/jodersky/flow/exceptions.scala
index 0422018..f91aa1b 100644
--- a/flow-main/src/main/scala/com/github/jodersky/flow/exceptions.scala
+++ b/flow-main/src/main/scala/com/github/jodersky/flow/exceptions.scala
@@ -5,6 +5,6 @@ import java.io.IOException
class NoSuchPortException(message: String) extends Exception(message)
class PortInUseException(message: String) extends Exception(message)
class AccessDeniedException(message: String) extends Exception(message)
-class IllegalBaudRateException(message: String) extends Exception(message)
+class InvalidSettingsException(message: String) extends Exception(message)
class PortInterruptedException(message: String) extends Exception(message)
class PortClosedException(message: String) extends Exception(message) \ No newline at end of file
diff --git a/flow-main/src/main/scala/com/github/jodersky/flow/internal/InternalSerial.scala b/flow-main/src/main/scala/com/github/jodersky/flow/internal/InternalSerial.scala
index 315f395..f3e08b8 100644
--- a/flow-main/src/main/scala/com/github/jodersky/flow/internal/InternalSerial.scala
+++ b/flow-main/src/main/scala/com/github/jodersky/flow/internal/InternalSerial.scala
@@ -68,7 +68,7 @@ object InternalSerial {
case E_IO => throw new IOException(port)
case E_ACCESS_DENIED => throw new AccessDeniedException(port)
case E_BUSY => throw new PortInUseException(port)
- case E_INVALID_BAUD => throw new IllegalBaudRateException("use standard baud rate")
+ case E_INVALID_SETTINGS => throw new InvalidSettingsException("the provided settings are invalid: be sure to use standard baud rate, character size and parity.")
case E_INTERRUPT => throw new PortInterruptedException(port)
case E_NO_PORT => throw new NoSuchPortException(port)
case error if error < 0 => throw new IOException(s"unknown error code: ${error}")
@@ -76,9 +76,9 @@ object InternalSerial {
}
/** Open a new connection to a serial port. */
- def open(port: String, baud: Int): InternalSerial = synchronized {
+ def open(port: String, baud: Int, characterSize: Int = 8, twoStopBits: Boolean = false, parity: Int = 0): InternalSerial = synchronized {
val pointer = new Array[Long](1)
- except(NativeSerial.open(port, baud, pointer), port)
+ except(NativeSerial.open(port, baud, characterSize, twoStopBits, parity, pointer), port)
new InternalSerial(port, pointer(0))
}