diff options
Diffstat (limited to 'mavigator-uav/src/main/scala/mavigator')
| -rw-r--r-- | mavigator-uav/src/main/scala/mavigator/uav/MavlinkUtil.scala.disabled (renamed from mavigator-uav/src/main/scala/mavigator/uav/MavlinkUtil.scala) | 0 | ||||
| -rw-r--r-- | mavigator-uav/src/main/scala/mavigator/uav/Multiplexer.scala.disabled (renamed from mavigator-uav/src/main/scala/mavigator/uav/Multiplexer.scala) | 0 | ||||
| -rw-r--r-- | mavigator-uav/src/main/scala/mavigator/uav/Uav.scala | 2 | ||||
| -rw-r--r-- | mavigator-uav/src/main/scala/mavigator/uav/mock/RandomFlightPlan.scala | 3 |
4 files changed, 3 insertions, 2 deletions
diff --git a/mavigator-uav/src/main/scala/mavigator/uav/MavlinkUtil.scala b/mavigator-uav/src/main/scala/mavigator/uav/MavlinkUtil.scala.disabled index 0fb56b0..0fb56b0 100644 --- a/mavigator-uav/src/main/scala/mavigator/uav/MavlinkUtil.scala +++ b/mavigator-uav/src/main/scala/mavigator/uav/MavlinkUtil.scala.disabled diff --git a/mavigator-uav/src/main/scala/mavigator/uav/Multiplexer.scala b/mavigator-uav/src/main/scala/mavigator/uav/Multiplexer.scala.disabled index 5e48ea1..5e48ea1 100644 --- a/mavigator-uav/src/main/scala/mavigator/uav/Multiplexer.scala +++ b/mavigator-uav/src/main/scala/mavigator/uav/Multiplexer.scala.disabled diff --git a/mavigator-uav/src/main/scala/mavigator/uav/Uav.scala b/mavigator-uav/src/main/scala/mavigator/uav/Uav.scala index 06a8f00..8f8c083 100644 --- a/mavigator-uav/src/main/scala/mavigator/uav/Uav.scala +++ b/mavigator-uav/src/main/scala/mavigator/uav/Uav.scala @@ -32,7 +32,7 @@ class Uav(system: ExtendedActorSystem) extends Extension { def connect(): Flow[ByteString, ByteString, NotUsed] = { Flow.fromSinkAndSource( Sink.ignore, - (new MockConnection(0,0,1)).data + (new MockConnection(0,0,1)).data //TODO: use source instead of hardcoded value ) } diff --git a/mavigator-uav/src/main/scala/mavigator/uav/mock/RandomFlightPlan.scala b/mavigator-uav/src/main/scala/mavigator/uav/mock/RandomFlightPlan.scala index 89e5a75..680de1e 100644 --- a/mavigator-uav/src/main/scala/mavigator/uav/mock/RandomFlightPlan.scala +++ b/mavigator-uav/src/main/scala/mavigator/uav/mock/RandomFlightPlan.scala @@ -54,9 +54,10 @@ class RandomFlightPlan { 0 ) + def attitude = Attitude( millis, - (2 * math.Pi * time / 6).toFloat, + (math.sin(2 * math.Pi * time ) * math.Pi / 6).toFloat, (math.sin(2 * math.Pi * time / 5) * math.Pi / 6).toFloat, (2 * math.Pi * time / 4).toFloat, 0, |