aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Odersky <jodersky@gmail.com>2015-01-20 17:18:44 +0100
committerJakob Odersky <jodersky@gmail.com>2015-01-20 17:18:44 +0100
commitdb266a316a2d5a22cd11503094e10b327a8e1cd6 (patch)
tree0a347d8b277521509fd0adab4abf5ea21e6b0664
parent0355bb69a4942082d598b5c08fd4b071e931ee87 (diff)
downloadmavigator-db266a316a2d5a22cd11503094e10b327a8e1cd6.tar.gz
mavigator-db266a316a2d5a22cd11503094e10b327a8e1cd6.tar.bz2
mavigator-db266a316a2d5a22cd11503094e10b327a8e1cd6.zip
update README and clean build
-rw-r--r--README.md15
-rw-r--r--mavlink/concise.xml (renamed from conf/concise.xml)0
-rw-r--r--project/Build.scala2
3 files changed, 15 insertions, 2 deletions
diff --git a/README.md b/README.md
index 4316d2f..cb5f397 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,19 @@
# Virtual Flight Deck for UAVs
-This project is in its making...
+Web interface simulating a cockpit of an unmanned aerial vehicle, built with Akka and Play.
+
+This project is made of several subprojects:
+ - `vfd-backend` contains the play application that runs the actual interface
+ - `vfd-frontend` dynamic interface built with scalajs that is served by `vfd-backend`
+ - `vfd-uav` library for communicating with UAVs
+
+# Run
+First, switch to project `vfd-backend` and then `run`
+
+ project vfd-backend
+ run
+
+Calling `vfd-backend/run` directly will not work.
# License
Copyright (C) Jakob Odersky
diff --git a/conf/concise.xml b/mavlink/concise.xml
index 4d8d174..4d8d174 100644
--- a/conf/concise.xml
+++ b/mavlink/concise.xml
diff --git a/project/Build.scala b/project/Build.scala
index 6568438..b2a1b4b 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -16,7 +16,7 @@ object ApplicationBuild extends Build {
val common = Seq(
scalaVersion := "2.11.4",
scalacOptions ++= Seq("-feature", "-deprecation"),
- mavlinkDialect := (baseDirectory in ThisBuild).value / "conf" / "concise.xml"
+ mavlinkDialect := (baseDirectory in ThisBuild).value / "mavlink" / "concise.xml"
)
lazy val root = Project("root", file(".")).aggregate(