Merge branch 'new-uart' into dev

src/comm/MAVLinkSimulationLink.cc

@@ -934,7 +934,7 @@ bool MAVLinkSimulationLink::connect()
     emit connected(true);
 
     start(LowPriority);
-    MAVLinkSimulationMAV* mav1 = new MAVLinkSimulationMAV(this, 1, 47.376, 8.548);
+    MAVLinkSimulationMAV* mav1 = new MAVLinkSimulationMAV(this, 1, 37.480391, -122.282883);
     Q_UNUSED(mav1);
 //    MAVLinkSimulationMAV* mav2 = new MAVLinkSimulationMAV(this, 2, 47.375, 8.548, 1);
 //    Q_UNUSED(mav2);

src/comm/MAVLinkSimulationMAV.cc

@@ -23,13 +23,20 @@ MAVLinkSimulationMAV::MAVLinkSimulationMAV(MAVLinkSimulationLink *parent, int sy
     yaw(0.0),
     globalNavigation(true),
     firstWP(false),
-    previousSPX(8.548056),
-    previousSPY(47.376389),
-    previousSPZ(550),
-    previousSPYaw(0.0),
-    nextSPX(8.548056),
-    nextSPY(47.376389),
-    nextSPZ(550),
+//    previousSPX(8.548056),
+//    previousSPY(47.376389),
+//    previousSPZ(550),
+//    previousSPYaw(0.0),
+//    nextSPX(8.548056),
+//    nextSPY(47.376389),
+//    nextSPZ(550),
+        previousSPX(37.480391),
+        previousSPY(122.282883),
+        previousSPZ(550),
+        previousSPYaw(0.0),
+        nextSPX(37.480391),
+        nextSPY(122.282883),
+        nextSPZ(550),
     nextSPYaw(0.0),
     sys_mode(MAV_MODE_READY),
     sys_state(MAV_STATE_STANDBY),