diff options
| author | Jakob Odersky <jodersky@gmail.com> | 2015-03-27 17:09:23 +0100 |
|---|---|---|
| committer | Jakob Odersky <jodersky@gmail.com> | 2015-03-27 17:09:23 +0100 |
| commit | c18222560943f958cfb0e8498232f732ca4d6a96 (patch) | |
| tree | 63b490003e73c62b3d0e23a3745b07ac386baec2 /vfd-uav/src/main/scala/vfd/uav/Connection.scala | |
| parent | bd174539d8bb2921bef94cccd994a61e334a3dd7 (diff) | |
| parent | fa20b967896e3332078b6e2a4b3ca7e98a0b43f0 (diff) | |
| download | mavigator-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-uav/src/main/scala/vfd/uav/Connection.scala')
| -rw-r--r-- | vfd-uav/src/main/scala/vfd/uav/Connection.scala | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/vfd-uav/src/main/scala/vfd/uav/Connection.scala b/vfd-uav/src/main/scala/vfd/uav/Connection.scala index 38e1836..223a787 100644 --- a/vfd-uav/src/main/scala/vfd/uav/Connection.scala +++ b/vfd-uav/src/main/scala/vfd/uav/Connection.scala @@ -1,16 +1,12 @@ package vfd.uav import scala.collection.mutable.ArrayBuffer + import akka.actor.Actor import akka.actor.ActorRef import akka.actor.Terminated import akka.actor.actorRef2Scala import akka.util.ByteString -import org.mavlink.Assembler -import org.mavlink.messages.Message -import org.mavlink.Parser -import org.mavlink.Packet -import akka.actor.ActorLogging /** Protocol definition. */ object Connection { @@ -39,7 +35,7 @@ trait Connection { myself: Actor => /** Adds a client to the client list and acquires a deathwatch. */ protected def register(client: ActorRef) = { - _clients += client; + _clients += client myself.context.watch(client) } |