From 9346e7da6b95d6a5e43f7a8f4691e8c43dc95bb6 Mon Sep 17 00:00:00 2001 From: Jakob Odersky Date: Fri, 20 Mar 2015 15:39:14 +0100 Subject: move mavlink plugin to separate project --- vfd-dashboard/src/main/scala/vfd/dashboard/MavlinkSocket.scala | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'vfd-dashboard/src/main/scala') diff --git a/vfd-dashboard/src/main/scala/vfd/dashboard/MavlinkSocket.scala b/vfd-dashboard/src/main/scala/vfd/dashboard/MavlinkSocket.scala index 162ca64..dff3598 100644 --- a/vfd-dashboard/src/main/scala/vfd/dashboard/MavlinkSocket.scala +++ b/vfd-dashboard/src/main/scala/vfd/dashboard/MavlinkSocket.scala @@ -5,6 +5,7 @@ import scala.scalajs.js.Any.fromFunction1 import org.mavlink.Packet import org.mavlink.Parser +import org.mavlink.Parser.Errors._ import org.mavlink.messages.Message import org.scalajs.dom @@ -14,7 +15,7 @@ import rx.ops.RxOps class MavlinkSocket(url: String, remoteSystemId: Int) { - lazy val packet: Var[Packet] = Var(Packet.Empty) + lazy val packet: Var[Packet] = Var(Packet.empty) lazy val message: Rx[Message] = packet.map{p => Message.unpack(p.messageId, p.payload) } @@ -39,8 +40,8 @@ class MavlinkSocket(url: String, remoteSystemId: Int) { }, err => { err match { - case Parser.ParseErrors.CrcError => stats.crcErrors() += 1 - case Parser.ParseErrors.OverflowError => stats.overflows() += 1 + case CrcError => stats.crcErrors() += 1 + case OverflowError => stats.overflows() += 1 } }) -- cgit v1.2.3