1 files changed, 7 insertions, 7 deletions
diff --git a/flow-samples/terminal/src/main/scala/com/github/jodersky/flow/samples/terminal/Main.scala b/flow-samples/terminal/src/main/scala/com/github/jodersky/flow/samples/terminal/Main.scala
index b6f45f3..27686ce 100644
--- a/flow-samples/terminal/src/main/scala/com/github/jodersky/flow/samples/terminal/Main.scala
+++ b/flow-samples/terminal/src/main/scala/com/github/jodersky/flow/samples/terminal/Main.scala
@@ -8,14 +8,12 @@ import akka.actor.actorRef2Scala
 import akka.util.ByteString
 
 object Main {
-
-  def defaultIfEmpty(in: String, default: String): String = if (in.isEmpty) default else in
-
+ 
   def ask(label: String, default: String) = {
     print(s"${label} [${default}]: ")
     val in = Console.readLine()
     println("")
-    defaultIfEmpty(in, default)
+    if (in.isEmpty) default else in
   }
 
   def main(args: Array[String]): Unit = {
@@ -23,12 +21,14 @@ object Main {
     val baud = ask("Baud rate", "115200").toInt
     val cs = ask("Char size", "8").toInt
     val tsb = ask("Use two stop bits", "false").toBoolean
-    val parity = Parity(ask("Parity [0=None, 1=Odd, 2=Even]", "0").toInt)
+    val parity = Parity(ask("Parity (0=None, 1=Odd, 2=Even)", "0").toInt)
+
+    val settings = SerialSettings(port, baud, cs, tsb, parity)
+
     println("Starting terminal system, enter :q to exit.")
-    
     internal.InternalSerial.debug(true)
     val system = ActorSystem("flow")
+    val terminal = system.actorOf(Terminal(settings), name = "terminal")
     system.registerOnTermination(println("Stopped terminal system."))
-    val terminal = system.actorOf(Props(classOf[Terminal], port, baud, cs, tsb, parity), name = "terminal")
   }
 }
 \ No newline at end of file