diff options
author | Jakob Odersky <jodersky@gmail.com> | 2013-07-23 22:00:18 +0200 |
---|---|---|
committer | Jakob Odersky <jodersky@gmail.com> | 2013-07-23 22:01:12 +0200 |
commit | 0e90e8868ae11284e1fe8926e2a7490195267cc7 (patch) | |
tree | 5852f126736a08af43a1041aa0fea1b0a50fa3c8 /flow-samples | |
parent | 5f61cd57119108dc15a5cef112a36649017204b0 (diff) | |
download | akka-serial-0e90e8868ae11284e1fe8926e2a7490195267cc7.tar.gz akka-serial-0e90e8868ae11284e1fe8926e2a7490195267cc7.tar.bz2 akka-serial-0e90e8868ae11284e1fe8926e2a7490195267cc7.zip |
make serial messaging more akka-io like
Diffstat (limited to 'flow-samples')
-rw-r--r-- | flow-samples/terminal/src/main/scala/com/github/jodersky/flow/samples/terminal/Terminal.scala | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/flow-samples/terminal/src/main/scala/com/github/jodersky/flow/samples/terminal/Terminal.scala b/flow-samples/terminal/src/main/scala/com/github/jodersky/flow/samples/terminal/Terminal.scala index ff22910..2997e77 100644 --- a/flow-samples/terminal/src/main/scala/com/github/jodersky/flow/samples/terminal/Terminal.scala +++ b/flow-samples/terminal/src/main/scala/com/github/jodersky/flow/samples/terminal/Terminal.scala @@ -12,6 +12,7 @@ import com.github.jodersky.flow.Parity import akka.actor.Props class Terminal(port: String, baud: Int, cs: Int, tsb: Boolean, parity: Parity.Parity) extends Actor with ActorLogging { + import Terminal._ import context._ val reader = actorOf(Props[ConsoleReader]) @@ -26,28 +27,36 @@ class Terminal(port: String, baud: Int, cs: Int, tsb: Boolean, parity: Parity.Pa } def receive = { - case OpenFailed(reason, _, _, _, _, _) => { + case CommandFailed(cmd, reason) => { log.error(s"Connection failed, stopping terminal. Reason: ${reason}") context stop self } case Opened(port, _, _, _, _) => { log.info(s"Port ${port} is now open.") - context become opened(sender) + val operator = sender + context become opened(operator) + context watch operator + operator ! Register(self) reader ! Read } } def opened(operator: ActorRef): Receive = { + case Received(data) => { log.info(s"Received data: ${formatData(data)} (${new String(data.toArray, "UTF-8")})") } + case Wrote(data) => log.info(s"Wrote data: ${formatData(data)} (${new String(data.toArray, "UTF-8")})") - case Closed(x) => { - x match { - case None => log.info("Operator closed normally, exiting terminal.") - case Some(ex) => log.error("Operator crashed, exiting terminal.") - } + case Closed => { + log.info("Operator closed normally, exiting terminal.") + context unwatch operator + context stop self + } + + case Terminated(`operator`) => { + log.error("Operator crashed, exiting terminal.") context stop self } @@ -57,11 +66,16 @@ class Terminal(port: String, baud: Int, cs: Int, tsb: Boolean, parity: Parity.Pa } case ConsoleInput(input) => { - operator ! Write(ByteString(input.getBytes), true) + val data = ByteString(input.getBytes) + operator ! Write(data, Wrote(data)) reader ! Read } } private def formatData(data: ByteString) = data.mkString("[", ",", "]") +} + +object Terminal { + case class Wrote(data: ByteString) extends Event }
\ No newline at end of file |