aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Odersky <jakob@odersky.com>2016-04-18 03:45:03 -0700
committerJakob Odersky <jakob@odersky.com>2016-04-18 03:45:03 -0700
commit75caebc1783e6ef70f67da07c56b9d7cbb9e1733 (patch)
treece10d55c28f65de14290919afa899f99aeef3da4
parent552fde56cd19e766e2bd627ed8eea66dc4f15a8d (diff)
downloadmavigator-75caebc1783e6ef70f67da07c56b9d7cbb9e1733.tar.gz
mavigator-75caebc1783e6ef70f67da07c56b9d7cbb9e1733.tar.bz2
mavigator-75caebc1783e6ef70f67da07c56b9d7cbb9e1733.zip
Use mock connection as default
-rw-r--r--.gitignore3
-rw-r--r--mavigator-uav/src/main/resources/reference.conf2
2 files changed, 4 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 5133a17..3c4fa77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,9 @@ project/plugins/project/
.classpath
.cache
+# akka application configuration (use reference.conf instead)
+application.conf
+
# ensime
.ensime
.ensime_cache/
diff --git a/mavigator-uav/src/main/resources/reference.conf b/mavigator-uav/src/main/resources/reference.conf
index 5e66de3..282df90 100644
--- a/mavigator-uav/src/main/resources/reference.conf
+++ b/mavigator-uav/src/main/resources/reference.conf
@@ -3,7 +3,7 @@ mavigator.uav {
# The type of connection to use
# 'mock' or 'serial'
- type = serial
+ type = mock
# Settings related to serial connections
serial {