diff options
Diffstat (limited to 'vfd-uav/src/main/scala/vfd/uav/SerialConnection.scala')
-rw-r--r-- | vfd-uav/src/main/scala/vfd/uav/SerialConnection.scala | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/vfd-uav/src/main/scala/vfd/uav/SerialConnection.scala b/vfd-uav/src/main/scala/vfd/uav/SerialConnection.scala index 7fe9d23..857169e 100644 --- a/vfd-uav/src/main/scala/vfd/uav/SerialConnection.scala +++ b/vfd-uav/src/main/scala/vfd/uav/SerialConnection.scala @@ -1,21 +1,24 @@ package vfd.uav import java.util.concurrent.TimeUnit.MILLISECONDS + import scala.concurrent.duration.FiniteDuration + import org.mavlink.Parser import org.mavlink.messages.Message + import com.github.jodersky.flow.Parity import com.github.jodersky.flow.Serial import com.github.jodersky.flow.SerialSettings + import akka.actor.Actor +import akka.actor.ActorLogging import akka.actor.ActorRef import akka.actor.Props import akka.actor.Terminated import akka.actor.actorRef2Scala import akka.io.IO import akka.util.ByteString -import akka.actor.ActorLogging -import org.mavlink.messages.Battery class SerialConnection(id: Byte, heartbeat: Option[FiniteDuration], port: String, settings: SerialSettings) extends Actor with ActorLogging with Connection { import context._ @@ -68,14 +71,8 @@ class SerialConnection(id: Byte, heartbeat: Option[FiniteDuration], port: String val last = new collection.mutable.Queue[Int] - val parser = new Parser(pckt => - Message.unpack(pckt.messageId, pckt.payload) match { - case b: Battery => - last enqueue b.voltages(0) - if (last.size > 20) last.dequeue - println("batt: " + last.sum / last.size) - case _ => ()//println(pckt.messageId) - } + val parser = new Parser(pckt => + println("Received message: " + Message.unpack(pckt.messageId, pckt.payload)) ) |