aboutsummaryrefslogtreecommitdiff
path: root/vfd-dashboard/src/main/scala
diff options
context:
space:
mode:
authorJakob Odersky <jodersky@gmail.com>2015-03-27 17:09:23 +0100
committerJakob Odersky <jodersky@gmail.com>2015-03-27 17:09:23 +0100
commitc18222560943f958cfb0e8498232f732ca4d6a96 (patch)
tree63b490003e73c62b3d0e23a3745b07ac386baec2 /vfd-dashboard/src/main/scala
parentbd174539d8bb2921bef94cccd994a61e334a3dd7 (diff)
parentfa20b967896e3332078b6e2a4b3ca7e98a0b43f0 (diff)
downloadmavigator-c18222560943f958cfb0e8498232f732ca4d6a96.tar.gz
mavigator-c18222560943f958cfb0e8498232f732ca4d6a96.tar.bz2
mavigator-c18222560943f958cfb0e8498232f732ca4d6a96.zip
Merge branch 'wip/mavlink-common'
Conflicts: vfd-dashboard/src/main/scala/vfd/dashboard/ui/panels/Communication.scala vfd-dashboard/src/main/scala/vfd/dashboard/ui/panels/Primary.scala
Diffstat (limited to 'vfd-dashboard/src/main/scala')
-rw-r--r--vfd-dashboard/src/main/scala/vfd/dashboard/MavlinkSocket.scala24
1 files changed, 10 insertions, 14 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
}