From c5a6f9ceab3a99b1f5dda7f00d01bdc7e4c52ea5 Mon Sep 17 00:00:00 2001
From: Jakob Odersky <jodersky@gmail.com>
Date: Sun, 21 Dec 2014 11:19:11 +0100
Subject: update mock connection

---
 vfd-backend/conf/application.conf                   |  2 +-
 vfd-uav/src/main/scala/vfd/uav/MockConnection.scala | 17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/vfd-backend/conf/application.conf b/vfd-backend/conf/application.conf
index cecd0f9..e069b23 100644
--- a/vfd-backend/conf/application.conf
+++ b/vfd-backend/conf/application.conf
@@ -69,7 +69,7 @@ uav.system_id=1
 
 # Type of connection to use
 # 'mock' for a sample connection 
-uav.connection.type=mock
+uav.connection.type=serial
 
 # Mavlink component id used by this connection (not the web frontend),
 # in case it needs to inject messages
diff --git a/vfd-uav/src/main/scala/vfd/uav/MockConnection.scala b/vfd-uav/src/main/scala/vfd/uav/MockConnection.scala
index 1217291..238ccdd 100644
--- a/vfd-uav/src/main/scala/vfd/uav/MockConnection.scala
+++ b/vfd-uav/src/main/scala/vfd/uav/MockConnection.scala
@@ -15,7 +15,7 @@ class MockConnection extends Actor with ActorLogging with Connection {
   import Connection._
   import context._
 
-  val messageInterval = FiniteDuration(250, MILLISECONDS)
+  val messageInterval = FiniteDuration(100, MILLISECONDS)
 
   override def preStart() = {
     context.system.scheduler.schedule(messageInterval, messageInterval) {
@@ -42,14 +42,14 @@ object MockPackets {
       Packet(5, 42, 1, id, payload).toSeq.toArray
     }
   }
-  
+
   def messages = Heartbeat(0) ::
     Motor(Random.nextInt(101).toByte, Random.nextInt(101).toByte, Random.nextInt(101).toByte, Random.nextInt(101).toByte) ::
     Attitude((Random.nextInt(160) - 80).toShort, (Random.nextInt(160) - 80).toShort.toShort, Random.nextInt(360).toShort) ::
     Power(Random.nextInt(12000).toShort) :: Nil
-  
+
   def valid: Array[Byte] = messages.flatMap(_.bytes).toArray
-  
+
   val invalidCrc = Array(254, 1, 123, 13, 13).map(_.toByte)
   val invalidOverflow = {
     val data = Array.fill[Byte](Packet.MaxPayloadLength + 10)(42)
@@ -58,15 +58,14 @@ object MockPackets {
     data(1) = -1
     data
   }
-  
+
   def randomInvalid = Random.nextInt(2) match {
     case 0 => invalidCrc
     case 1 => invalidOverflow
   }
 
-  def random: Array[Byte] = if (Random.nextInt(5) == 0) {
-    randomInvalid
-  } else {
-    valid
+  def random: Array[Byte] = Random.nextInt(messages.length + 1) match {
+    case 0 => randomInvalid
+    case i => messages(i - 1).bytes
   }
 }
\ No newline at end of file
-- 
cgit v1.2.3