aboutsummaryrefslogtreecommitdiff
path: root/flow-samples/terminal/src
diff options
context:
space:
mode:
Diffstat (limited to 'flow-samples/terminal/src')
-rw-r--r--flow-samples/terminal/src/main/scala/ch/jodersky/flow/samples/terminal/ConsoleReader.scala (renamed from flow-samples/terminal/src/main/scala/com/github/jodersky/flow/samples/terminal/ConsoleReader.scala)2
-rw-r--r--flow-samples/terminal/src/main/scala/ch/jodersky/flow/samples/terminal/Main.scala (renamed from flow-samples/terminal/src/main/scala/com/github/jodersky/flow/samples/terminal/Main.scala)5
-rw-r--r--flow-samples/terminal/src/main/scala/ch/jodersky/flow/samples/terminal/Terminal.scala (renamed from flow-samples/terminal/src/main/scala/com/github/jodersky/flow/samples/terminal/Terminal.scala)4
3 files changed, 5 insertions, 6 deletions
diff --git a/flow-samples/terminal/src/main/scala/com/github/jodersky/flow/samples/terminal/ConsoleReader.scala b/flow-samples/terminal/src/main/scala/ch/jodersky/flow/samples/terminal/ConsoleReader.scala
index 68a79db..2b30663 100644
--- a/flow-samples/terminal/src/main/scala/com/github/jodersky/flow/samples/terminal/ConsoleReader.scala
+++ b/flow-samples/terminal/src/main/scala/ch/jodersky/flow/samples/terminal/ConsoleReader.scala
@@ -1,4 +1,4 @@
-package com.github.jodersky.flow
+package ch.jodersky.flow
package samples.terminal
import akka.actor.Actor
diff --git a/flow-samples/terminal/src/main/scala/com/github/jodersky/flow/samples/terminal/Main.scala b/flow-samples/terminal/src/main/scala/ch/jodersky/flow/samples/terminal/Main.scala
index 1447b78..80c0f80 100644
--- a/flow-samples/terminal/src/main/scala/com/github/jodersky/flow/samples/terminal/Main.scala
+++ b/flow-samples/terminal/src/main/scala/ch/jodersky/flow/samples/terminal/Main.scala
@@ -1,8 +1,7 @@
-package com.github.jodersky.flow
+package ch.jodersky.flow
package samples.terminal
import akka.actor.ActorSystem
-import internal.SerialConnection
import scala.io.StdIn
object Main {
@@ -23,7 +22,7 @@ object Main {
val settings = SerialSettings(baud, cs, tsb, parity)
println("Starting terminal system, enter :q to exit.")
- SerialConnection.debug(true)
+ Serial.debug(true)
val system = ActorSystem("flow")
val terminal = system.actorOf(Terminal(port, settings), name = "terminal")
system.registerOnTermination(println("Stopped terminal system."))
diff --git a/flow-samples/terminal/src/main/scala/com/github/jodersky/flow/samples/terminal/Terminal.scala b/flow-samples/terminal/src/main/scala/ch/jodersky/flow/samples/terminal/Terminal.scala
index 82f6b4f..de60620 100644
--- a/flow-samples/terminal/src/main/scala/com/github/jodersky/flow/samples/terminal/Terminal.scala
+++ b/flow-samples/terminal/src/main/scala/ch/jodersky/flow/samples/terminal/Terminal.scala
@@ -1,4 +1,4 @@
-package com.github.jodersky.flow
+package ch.jodersky.flow
package samples.terminal
import akka.actor.{ Actor, ActorLogging, ActorRef, Props, Terminated, actorRef2Scala }
@@ -15,7 +15,7 @@ class Terminal(port: String, settings: SerialSettings) extends Actor with ActorL
IO(Serial) ! Serial.Open(port, settings)
override def postStop() = {
- system.shutdown()
+ system.terminate()
}
def receive = {