diff options
| author | Jakob Odersky <jodersky@gmail.com> | 2015-03-23 23:38:37 +0100 |
|---|---|---|
| committer | Jakob Odersky <jodersky@gmail.com> | 2015-03-25 12:35:31 +0100 |
| commit | aeb4c6a32326ef6bd7f6bf77cd4bb00d2fabac6d (patch) | |
| tree | 5d1b75b1921f8bb3a87615da27f2aa98ad621a8a /vfd-dashboard | |
| parent | 2881fb6ba97cbd496eebb4d785b2ba6e59fa303c (diff) | |
| download | mavigator-aeb4c6a32326ef6bd7f6bf77cd4bb00d2fabac6d.tar.gz mavigator-aeb4c6a32326ef6bd7f6bf77cd4bb00d2fabac6d.tar.bz2 mavigator-aeb4c6a32326ef6bd7f6bf77cd4bb00d2fabac6d.zip | |
use common mavlink dialect; temporary disabling of instruments
Diffstat (limited to 'vfd-dashboard')
| -rw-r--r-- | vfd-dashboard/src/main/scala/vfd/dashboard/ui/panels/Communication.scala | 20 | ||||
| -rw-r--r-- | vfd-dashboard/src/main/scala/vfd/dashboard/ui/panels/Primary.scala | 5 |
2 files changed, 2 insertions, 23 deletions
diff --git a/vfd-dashboard/src/main/scala/vfd/dashboard/ui/panels/Communication.scala b/vfd-dashboard/src/main/scala/vfd/dashboard/ui/panels/Communication.scala index 220a7b8..2b79478 100644 --- a/vfd-dashboard/src/main/scala/vfd/dashboard/ui/panels/Communication.scala +++ b/vfd-dashboard/src/main/scala/vfd/dashboard/ui/panels/Communication.scala @@ -1,8 +1,5 @@ package vfd.dashboard.ui.panels -import org.mavlink.messages.Heartbeat -import org.mavlink.messages.Motor -import org.mavlink.messages.Power import org.scalajs.dom.html import rx.core.Obs @@ -46,22 +43,7 @@ object Communication { Obs(socket.message, skipInitial = true) { socket.message() match { - case Motor(m0, m1, m2, m3) => - motor0.update(m0) - motor1.update(m1) - motor2.update(m2) - motor3.update(m3) - powerDistribution.update(m0, m1, m2, m3) - - case Power(mV) => - batteryLevel.update(100 * (mV - 9600) / 12600) - case Heartbeat(_) => { - hb.style.visibility = "hidden" - hb.style.visibility = "visible" - //hb.classList.remove("heartbeat") - //hb.offsetHeight - //hb.classList.add("heartbeat") - } + //TODO match message and update UI case _ => } } 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 6f66208..47c9c97 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,6 +1,5 @@ package vfd.dashboard.ui.panels -import org.mavlink.messages.Attitude import org.scalajs.dom.html import rx.core.Obs @@ -27,9 +26,7 @@ object Primary { Obs(socket.message, skipInitial = true) { socket.message() match { - case Attitude(roll, pitch, yaw) => - horizon.update(pitch, roll) - compass.update(yaw) + //TODO match message and update UI case _ => () } } |