Implement serial backend

1 files changed, 17 insertions, 19 deletions

diff --git a/mavigator-uav/src/main/scala/mavigator/uav/Uav.scala b/mavigator-uav/src/main/scala/mavigator/uav/Uav.scala
index 8f8c083..1387983 100644
--- a/mavigator-uav/src/main/scala/mavigator/uav/Uav.scala
+++ b/mavigator-uav/src/main/scala/mavigator/uav/Uav.scala
@@ -2,40 +2,38 @@ package mavigator
 package uav
 
 import java.lang.IllegalArgumentException
-import mock._
+
 import akka._
 import akka.actor._
-import akka.util._
+import akka.stream.ActorMaterializer
 import akka.stream.scaladsl._
+import akka.util._
 
+import mock._
+import serial._
+
+//TODO: the whole backend system feels hacky, it probably needs a major redesign
 class Uav(system: ExtendedActorSystem) extends Extension {
 
+  private val materializer = ActorMaterializer()(system)
+
   private lazy val config = system.settings.config.getConfig("mavigator.uav")
   private lazy val tpe = config.getString("type")
-  private lazy val componentId = config.getInt("componentId").toByte
-  private lazy val heartbeat = config.getInt("heartbeat")
-  private lazy val connection = config.getConfig(tpe)
 
-  lazy val source = tpe match {
-    case "mock" =>
-      new MockConnection(
-        connection.getInt("remote_system_id").toByte,
-        componentId,
-        connection.getDouble("prescaler")
-      )
-
-    case "serial" => ???
+  private lazy val core = new Core()(system, materializer)
 
+  lazy val backend: Backend = tpe match {
+    case "mock" => MockBackend
+    case "serial" => SerialBackend
     case _ => throw new IllegalArgumentException(s"Unsupported connection type: $tpe")
   }
 
-  def connect(): Flow[ByteString, ByteString, NotUsed] = {
-    Flow.fromSinkAndSource(
-      Sink.ignore,
-      (new MockConnection(0,0,1)).data //TODO: use source instead of hardcoded value
-    )
+  def init(): Unit = {
+    backend.init(core)
   }
 
+  def connect(): Flow[ByteString, ByteString, NotUsed] = core.connect()
+
 }
 
 object Uav extends ExtensionId[Uav] with ExtensionIdProvider {