From b6f27be4eda4ec0e50aaca8eb3a117db60b4067e Mon Sep 17 00:00:00 2001 From: Jakob Odersky Date: Thu, 27 Mar 2014 20:19:28 +0100 Subject: re-implement native side (TODO: direct buffers) --- .../main/scala/com/github/jodersky/flow/samples/terminal/Main.scala | 6 +++--- .../scala/com/github/jodersky/flow/samples/terminal/Terminal.scala | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'flow-samples/flow-samples-terminal') diff --git a/flow-samples/flow-samples-terminal/src/main/scala/com/github/jodersky/flow/samples/terminal/Main.scala b/flow-samples/flow-samples-terminal/src/main/scala/com/github/jodersky/flow/samples/terminal/Main.scala index 27686ce..41551d3 100644 --- a/flow-samples/flow-samples-terminal/src/main/scala/com/github/jodersky/flow/samples/terminal/Main.scala +++ b/flow-samples/flow-samples-terminal/src/main/scala/com/github/jodersky/flow/samples/terminal/Main.scala @@ -5,7 +5,7 @@ import com.github.jodersky.flow._ import akka.actor.ActorSystem import akka.actor.Props import akka.actor.actorRef2Scala -import akka.util.ByteString +import com.github.jodersky.flow.internal.SerialConnection object Main { @@ -23,10 +23,10 @@ object Main { val tsb = ask("Use two stop bits", "false").toBoolean val parity = Parity(ask("Parity (0=None, 1=Odd, 2=Even)", "0").toInt) - val settings = SerialSettings(port, baud, cs, tsb, parity) + val settings = SerialSettings(baud, cs, tsb, parity) println("Starting terminal system, enter :q to exit.") - internal.InternalSerial.debug(true) + SerialConnection.debug(true) val system = ActorSystem("flow") val terminal = system.actorOf(Terminal(settings), name = "terminal") system.registerOnTermination(println("Stopped terminal system.")) diff --git a/flow-samples/flow-samples-terminal/src/main/scala/com/github/jodersky/flow/samples/terminal/Terminal.scala b/flow-samples/flow-samples-terminal/src/main/scala/com/github/jodersky/flow/samples/terminal/Terminal.scala index 3c1eee6..ab9c51f 100644 --- a/flow-samples/flow-samples-terminal/src/main/scala/com/github/jodersky/flow/samples/terminal/Terminal.scala +++ b/flow-samples/flow-samples-terminal/src/main/scala/com/github/jodersky/flow/samples/terminal/Terminal.scala @@ -32,7 +32,7 @@ class Terminal(settings: SerialSettings) extends Actor with ActorLogging { log.error(s"Connection failed, stopping terminal. Reason: ${reason}") context stop self } - case Opened(s, _) => { + case Opened(s) => { log.info(s"Port ${s.port} is now open.") val operator = sender context become opened(operator) -- cgit v1.2.3