update mavlink communication

7 files changed, 26 insertions, 6 deletions

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 6c705eb..b6a2094 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -5,12 +5,12 @@ object Dependencies {
 
   val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.3.6"
 
-  val flow = "com.github.jodersky" %% "flow" % "2.0.6"
-  val flowNative = "com.github.jodersky" % "flow-native" % "2.0.6"
+  val flow = "com.github.jodersky" %% "flow" % "2.0.8"
+  val flowNative = "com.github.jodersky" % "flow-native" % "2.0.8"
 
-  val bootstrap = "org.webjars" % "bootstrap" % "3.2.0"
+  val bootstrap = "org.webjars" % "bootstrap" % "3.3.1"
   val fontawesome = "org.webjars" % "font-awesome" % "4.2.0"
-  val jquery = "org.webjars" % "jquery" % "2.1.1"
+  val jquery = "org.webjars" % "jquery" % "2.1.3"
 
   val dom = "org.scala-lang.modules.scalajs" %%%! "scalajs-dom" % "0.6"
   val tag = "com.scalatags" %%%! "scalatags" % "0.4.1"
diff --git a/project/mavlink-library/src/main/scala/com/github/jodersky/mavlink/Main.scala b/project/mavlink-library/src/main/scala/com/github/jodersky/mavlink/Main.scala
index 5f77c1a..57d1fcc 100644
--- a/project/mavlink-library/src/main/scala/com/github/jodersky/mavlink/Main.scala
+++ b/project/mavlink-library/src/main/scala/com/github/jodersky/mavlink/Main.scala
@@ -17,6 +17,7 @@ object Main {
         org.mavlink.txt.Crc().body -> Path("Crc.scala"),
         org.mavlink.txt.Packet(protocol.messages).body -> Path("Packet.scala"),
         org.mavlink.txt.Parser().body -> Path("Parser.scala"),
+        org.mavlink.txt.Assembler().body -> Path("Assembler.scala"),
         org.mavlink.messages.txt.Message(protocol.messages).body -> Path.fromString("messages/messages.scala")
     )
     
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 =>