update samples to new api

2 files changed, 10 insertions, 13 deletions

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 41551d3..732793b 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
@@ -28,7 +28,7 @@ object Main {
     println("Starting terminal system, enter :q to exit.")
     SerialConnection.debug(true)
     val system = ActorSystem("flow")
-    val terminal = system.actorOf(Terminal(settings), name = "terminal")
+    val terminal = system.actorOf(Terminal(port, settings), name = "terminal")
     system.registerOnTermination(println("Stopped terminal system."))
   }
 }
\ No newline at end of file
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 ab9c51f..3052133 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
@@ -12,16 +12,14 @@ import com.github.jodersky.flow.Parity
 import akka.actor.Props
 import com.github.jodersky.flow.SerialSettings
 
-class Terminal(settings: SerialSettings) extends Actor with ActorLogging {
+class Terminal(port: String, settings: SerialSettings) extends Actor with ActorLogging {
   import Terminal._
   import context._
 
   val reader = actorOf(Props[ConsoleReader])
-
-  override def preStart() = {
-    log.info(s"Requesting manager to open port: ${settings.port}, baud: ${settings.baud}")
-    IO(Serial) ! Serial.Open(settings)
-  }
+  
+  log.info(s"Requesting manager to open port: ${port}, baud: ${settings.baud}")
+  IO(Serial) ! Serial.Open(port, settings)
   
   override def postStop() = {
     system.shutdown()
@@ -32,12 +30,11 @@ class Terminal(settings: SerialSettings) extends Actor with ActorLogging {
       log.error(s"Connection failed, stopping terminal. Reason: ${reason}")
       context stop self
     }
-    case Opened(s) => {
-      log.info(s"Port ${s.port} is now open.")
+    case Opened(port) => {
+      log.info(s"Port ${port} is now open.")
       val operator = sender
       context become opened(operator)
-      context watch operator 
-      operator ! Register(self)
+      context watch operator
       reader ! ConsoleReader.Read
     }
   }
@@ -68,7 +65,7 @@ class Terminal(settings: SerialSettings) extends Actor with ActorLogging {
 
     case ConsoleReader.ConsoleInput(input) => {
       val data = ByteString(input.getBytes)
-      operator ! Write(data, Wrote(data))
+      operator ! Write(data, length => Wrote(data.take(length)))
       reader ! ConsoleReader.Read
     }
   }
@@ -80,7 +77,7 @@ class Terminal(settings: SerialSettings) extends Actor with ActorLogging {
 object Terminal {
   case class Wrote(data: ByteString) extends Event
   
-  def apply(settings: SerialSettings) = Props(classOf[Terminal], settings)
+  def apply(port: String, settings: SerialSettings) = Props(classOf[Terminal], port, settings)
   
   private def formatData(data: ByteString) = data.mkString("[", ",", "]") + " " + (new String(data.toArray, "UTF-8"))