minor tweaks

fixed system id extraction from message
intellij gitignore

[jodersky@gmail.com: remove trailing comma that brakes compilation]

2 files changed, 17 insertions, 15 deletions

diff --git a/vfd-dashboard/src/main/scala/vfd/dashboard/MavlinkSocket.scala b/vfd-dashboard/src/main/scala/vfd/dashboard/MavlinkSocket.scala
index dff3598..9476794 100644
--- a/vfd-dashboard/src/main/scala/vfd/dashboard/MavlinkSocket.scala
+++ b/vfd-dashboard/src/main/scala/vfd/dashboard/MavlinkSocket.scala
@@ -29,25 +29,21 @@ class MavlinkSocket(url: String, remoteSystemId: Int) {
   }
 
   private val parser = new Parser(
-    pckt => {
-      pckt match {
-        case Packet(seq, `remoteSystemId`, compId, msgId, payload) =>
-          packet() = pckt
-          stats.packets() += 1
-        case _ =>
-          stats.wrongIds() += 1
-      }
+    {
+      case pckt@Packet(seq, `remoteSystemId`, compId, msgId, payload) =>
+        packet() = pckt
+        stats.packets() += 1
+      case _ =>
+        stats.wrongIds() += 1
     },
-    err => {
-      err match {
-        case CrcError => stats.crcErrors() += 1
-        case OverflowError => stats.overflows() += 1
-      }
+    {
+      case CrcError => stats.crcErrors() += 1
+      case OverflowError => stats.overflows() += 1
     })
 
   private val connection = new dom.WebSocket(url)
 
-  connection.binaryType = "arraybuffer";
+  connection.binaryType = "arraybuffer"
   connection.onopen = (e: dom.Event) => {
     stats.open() = true
   }
diff --git a/vfd-dashboard/src/main/scala/vfd/dashboard/ui/panels/Primary.scala b/vfd-dashboard/src/main/scala/vfd/dashboard/ui/panels/Primary.scala
index 47c9c97..b85e657 100644
--- a/vfd-dashboard/src/main/scala/vfd/dashboard/ui/panels/Primary.scala
+++ b/vfd-dashboard/src/main/scala/vfd/dashboard/ui/panels/Primary.scala
@@ -1,5 +1,6 @@
 package vfd.dashboard.ui.panels
 
+import org.mavlink.messages.{VfrHud, Attitude, GlobalPositionInt}
 import org.scalajs.dom.html
 
 import rx.core.Obs
@@ -26,7 +27,12 @@ object Primary {
 
     Obs(socket.message, skipInitial = true) {
       socket.message() match {
-        //TODO match message and update UI
+        case a: Attitude =>
+//          compass.update(a.yaw / Math.PI * 360)
+//          horizon.update(a.pitch, a.roll)
+        case vh: VfrHud =>
+//          altimeter.update(vh.alt)
+//          compass.update(vh.heading / Math.PI * 360)
         case _ => ()
       }
     }