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 /project | |
| 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 'project')
| -rw-r--r-- | project/Build.scala | 3 | ||||
| -rw-r--r-- | project/plugins.sbt | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/project/Build.scala b/project/Build.scala index 9dd17c5..e469ce7 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -22,7 +22,7 @@ object ApplicationBuild extends Build { val common = Seq( scalaVersion := "2.11.6", scalacOptions ++= Seq("-feature", "-deprecation"), - mavlinkDialect := (baseDirectory in ThisBuild).value / "mavlink" / "concise.xml" + mavlinkDialect := (baseDirectory in ThisBuild).value / "mavlink" / "common.xml" ) //root super-project @@ -33,6 +33,7 @@ object ApplicationBuild extends Build { dashboard, index ) + settings(common: _*) settings( //goto main project on load onLoad in Global := (Command.process("project vfd-main", _: State)) compose (onLoad in Global).value diff --git a/project/plugins.sbt b/project/plugins.sbt index d057ec2..d47ecca 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -6,4 +6,4 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.2") addSbtPlugin("com.vmunier" % "sbt-play-scalajs" % "0.2.3") -addSbtPlugin("com.github.jodersky" % "sbt-mavlink" % "0.5.0")
\ No newline at end of file +addSbtPlugin("com.github.jodersky" % "sbt-mavlink" % "0.5.0") |