diff options
| author | Jakob Odersky <jodersky@gmail.com> | 2014-12-26 14:57:10 +0100 |
|---|---|---|
| committer | Jakob Odersky <jodersky@gmail.com> | 2014-12-26 14:57:10 +0100 |
| commit | 12ee4250ab270cfd7c48ffa7488a2245ac914f06 (patch) | |
| tree | 67214b91071b78603f9d64638637cbed3895a788 /project/mavlink-library/src/main/twirl/org | |
| parent | 92f08b0f11950023b3491f33734b79641f793ce2 (diff) | |
| download | mavigator-12ee4250ab270cfd7c48ffa7488a2245ac914f06.tar.gz mavigator-12ee4250ab270cfd7c48ffa7488a2245ac914f06.tar.bz2 mavigator-12ee4250ab270cfd7c48ffa7488a2245ac914f06.zip | |
update mavlink communication
Diffstat (limited to 'project/mavlink-library/src/main/twirl/org')
5 files changed, 21 insertions, 2 deletions
diff --git a/project/mavlink-library/src/main/twirl/org/mavlink/Assembler.scala.txt b/project/mavlink-library/src/main/twirl/org/mavlink/Assembler.scala.txt new file mode 100644 index 0000000..8b26b69 --- /dev/null +++ b/project/mavlink-library/src/main/twirl/org/mavlink/Assembler.scala.txt @@ -0,0 +1,15 @@ +@() + +@_header() +package org.mavlink + +class Assembler(systemId: Byte, componentId: Byte) { + private var seq = 0; + + def assemble(messageId: Byte, payload: Seq[Byte]): Packet = { + val p = Packet(seq.toByte, systemId, componentId, messageId, payload) + seq += 1 + p + } + +}
\ No newline at end of file diff --git a/project/mavlink-library/src/main/twirl/org/mavlink/Packet.scala.txt b/project/mavlink-library/src/main/twirl/org/mavlink/Packet.scala.txt index 6f96b40..9a3ad7f 100644 --- a/project/mavlink-library/src/main/twirl/org/mavlink/Packet.scala.txt +++ b/project/mavlink-library/src/main/twirl/org/mavlink/Packet.scala.txt @@ -7,6 +7,7 @@ } } +@_header() package org.mavlink case class Packet( diff --git a/project/mavlink-library/src/main/twirl/org/mavlink/Parser.scala.txt b/project/mavlink-library/src/main/twirl/org/mavlink/Parser.scala.txt index f0e30dc..f37fc8c 100644 --- a/project/mavlink-library/src/main/twirl/org/mavlink/Parser.scala.txt +++ b/project/mavlink-library/src/main/twirl/org/mavlink/Parser.scala.txt @@ -1,5 +1,6 @@ @() +@_header() package org.mavlink import scala.collection.mutable.ArrayBuffer @@ -125,4 +126,6 @@ class Parser(receiver: Packet => Unit, error: Parser.ParseErrors.ParseError => U } } + def push(bytes: Traversable[Byte]): Unit = for (b <- bytes) push(b) + } diff --git a/project/mavlink-library/src/main/twirl/org/mavlink/_header.scala.txt b/project/mavlink-library/src/main/twirl/org/mavlink/_header.scala.txt index 77ad6d2..6d27c2c 100644 --- a/project/mavlink-library/src/main/twirl/org/mavlink/_header.scala.txt +++ b/project/mavlink-library/src/main/twirl/org/mavlink/_header.scala.txt @@ -1,5 +1,5 @@ @() /** - * This file has been machine generated. + * This file is machine-generated. */
\ No newline at end of file diff --git a/project/mavlink-library/src/main/twirl/org/mavlink/messages/Message.scala.txt b/project/mavlink-library/src/main/twirl/org/mavlink/messages/Message.scala.txt index 4bba2a1..f1d6334 100644 --- a/project/mavlink-library/src/main/twirl/org/mavlink/messages/Message.scala.txt +++ b/project/mavlink-library/src/main/twirl/org/mavlink/messages/Message.scala.txt @@ -40,7 +40,7 @@ sealed trait Message case class Unknown(id: Byte, payload: Seq[Byte]) extends Message object Message { - def unpack(id: Byte, payload: Seq[Byte]) = id match { + def unpack(id: Byte, payload: Seq[Byte]): Message = id match { @for(message <- messages) { case @message.id => @defining(message.orderedFields){ ordered => |