hand-implement some messages

2 files changed, 30 insertions, 26 deletions

diff --git a/vfd-backend/app/plugins/UavClientConnection.scala b/vfd-backend/app/plugins/UavClientConnection.scala
new file mode 100644
index 0000000..b479aa5
--- /dev/null
+++ b/vfd-backend/app/plugins/UavClientConnection.scala
@@ -0,0 +1,29 @@
+package plugins
+
+import akka.actor.Actor
+import akka.actor.ActorLogging
+import akka.actor.ActorRef
+import akka.actor.actorRef2Scala
+import vfd.uav.Connection
+
+/**
+ * Interfaces traffic from a websocket with a connection to a UAV.
+ */
+class UavClientConnection(websocket: ActorRef, uav: ActorRef) extends Actor with ActorLogging {
+
+  override def preStart = {
+    uav ! Connection.Register
+  }
+
+  def receive = {
+
+    case Connection.Received(bstr) =>
+      websocket ! bstr.toArray
+
+    case Connection.Closed(msg) =>
+      log.warning(msg)
+      context stop self
+
+  }
+
+}
\ No newline at end of file
diff --git a/vfd-backend/app/plugins/UavPlugin.scala b/vfd-backend/app/plugins/UavPlugin.scala
index 2e5af65..43e015c 100644
--- a/vfd-backend/app/plugins/UavPlugin.scala
+++ b/vfd-backend/app/plugins/UavPlugin.scala
@@ -1,14 +1,10 @@
 package plugins
 
-import akka.actor.Actor
-import akka.actor.ActorLogging
 import akka.actor.ActorRef
 import akka.actor.Props
-import akka.actor.actorRef2Scala
 import play.api.Application
 import play.api.Plugin
 import play.api.libs.concurrent.Akka
-import vfd.uav.Connection
 import vfd.uav.MockConnection
 import vfd.uav.SerialConnection
 
@@ -44,27 +40,6 @@ class UavPlugin(app: Application) extends Plugin {
     Akka.system(app).actorOf(props, name = "uav-connection")
   }
 
-  def register(websocket: ActorRef): Props = Props(classOf[ClientConnection], websocket, connection)
-
-}
-
-class ClientConnection(websocket: ActorRef, uav: ActorRef) extends Actor with ActorLogging {
-
-  override def preStart = {
-    uav ! Connection.Register
-  }
-
-  def receive = {
-
-    case Connection.Received(bstr) =>
-      log.info(bstr.toArray.mkString(","))
-      websocket ! bstr.toArray
-
-
-    case Connection.Closed(msg) =>
-      log.warning(msg)
-      context stop self
-
-  }
+  def register(websocket: ActorRef): Props = Props(classOf[UavClientConnection], websocket, connection)
 
 }
\ No newline at end of file