diff options
Diffstat (limited to 'mavigator-uav/src/main/scala/mavigator/uav/Core.scala')
-rw-r--r-- | mavigator-uav/src/main/scala/mavigator/uav/Core.scala | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/mavigator-uav/src/main/scala/mavigator/uav/Core.scala b/mavigator-uav/src/main/scala/mavigator/uav/Core.scala index 02a8779..884a8e3 100644 --- a/mavigator-uav/src/main/scala/mavigator/uav/Core.scala +++ b/mavigator-uav/src/main/scala/mavigator/uav/Core.scala @@ -35,14 +35,7 @@ class Core(implicit val system: ActorSystem, val materializer: Materializer) { )((toClient, fromClient) => (toClient, fromClient)) private lazy val runnable: RunnableGraph[Publisher[ByteString]] = { - val timer = Source.tick(2.seconds, 2.seconds, ()) - val generator: Source[ByteString, _] = timer.flatMapConcat{ _ => - Util.barrelRoll via Util.assembler - } - - val merged: Flow[ByteString, ByteString, _] = Util.merge(generator, backend) - - merged.joinMat(clients){case (_, (toClient, _)) => + backend.joinMat(clients){case (_, (toClient, _)) => toClient } @@ -96,16 +89,6 @@ object Util { ByteString(bytes) } - def barrelRoll(): Source[Message, _] = { - val angle: Source[Float, _] = - Source.tick(10.millis, 10.millis, 0.1f).scan(0.0f)(_+_).takeWhile(_ < 2 * math.Pi) - val attitude = angle.map{ a => - Attitude(0,a,0,0,0,0,0) - } - - Source.single(Stability(0)) concat attitude concat Source.single(Stability(1)) - } - } |