Merge pixhawk.ethz.ch:qgroundcontrol

data/kinect_lionel.cal

+[rgb]
+principal_point\x=313.67245
+principal_point\y=264.06175
+focal_length\x=527.44654
+focal_length\y=527.40652
+distortion\k1=0.20780
+distortion\k2=-0.34320
+distortion\k3=0.00139
+distortion\k4=0.00061
+distortion\k5=0.00000
+
+[depth]
+principal_point\x=313.23400
+principal_point\y=246.13447
+focal_length\x=587.62150
+focal_length\y=587.51184
+distortion\k1=0.01063
+distortion\k2=-0.04479
+distortion\k3=-0.00073
+distortion\k4=0.00081
+distortion\k5=0.00000
+
+[transform]
+R11=0.99994
+R12=0.00098102
+R13=0.010900
+R21=-0.00097894
+R22=1.0
+R23=-0.00019534
+R33=-0.010900
+R32=0.00018466
+R33=0.99994
+Tx=-0.02581986
+Ty=-0.0130948
+Tz=-0.0047681

data/kinect_petri.cal

+[rgb]
+principal_point\x=327.67398
+principal_point\y=248.59122
+focal_length\x=532.24310
+focal_length\y=531.99693
+distortion\k1=0.21059
+distortion\k2=-0.37793
+distortion\k3=-0.00167
+distortion\k4=0.00449
+distortion\k5=0.00000
+
+[depth]
+principal_point\x=305.68000
+principal_point\y=249.39797
+focal_length\x=587.79275
+focal_length\y=586.22199
+distortion\k1=-0.00565
+distortion\k2=0.01022
+distortion\k3=-0.00135
+distortion\k4=0.00066
+distortion\k5=0.00000
+
+[transform]
+R11=1.0000
+R12=0.0048
+R13=-0.0083
+R21=-0.0047
+R22=1.0000
+R23=0.0040
+R33=0.0083
+R32=-0.0039
+R33=1.0000
+Tx=-0.2832691
+Ty=-0.0514760
+Tz=0.0655281

src/Waypoint.cc

@@ -283,9 +283,9 @@ void Waypoint::setParam5(double param5)
 
 void Waypoint::setParam6(double param6)
 {
-    if (this->z != param6)
+    if (this->y != param6)
     {
-        this->z = param6;
+        this->y = param6;
         emit changed(this);
     }
 }

src/uas/UASWaypointManager.cc

@@ -119,8 +119,14 @@ void UASWaypointManager::handleWaypointCount(quint8 systemId, quint8 compId, qui
         }
         else
         {
+            protocol_timer.stop();
             emit updateStatusString("done.");
             qDebug() << "No waypoints on UAS " << systemId;
+            current_state = WP_IDLE;
+            current_count = 0;
+            current_wp_id = 0;
+            current_partner_systemid = 0;
+            current_partner_compid = 0;
         }
     }
     else
@@ -732,8 +738,13 @@ void UASWaypointManager::writeWaypoints()
 
                 if (cur_s->getCurrent() && noCurrent)
                     noCurrent = false;
+                if (i == (current_count - 1) && noCurrent == true) //not a single waypoint was set as "current"
+                    cur_d->current = true; // set the last waypoint as current. Or should it better be the first waypoint ?
             }
 
+
+
+
             //send the waypoint count to UAS (this starts the send transaction)
             sendWaypointCount();
         }

waypoints.txt

+QGC WPL 100
+0	0	25	0.15	0	0.15	0	1	8.54949	47.3783	552.026	0	1
+1	1	25	0.2	0	0.2	0	0	-0.15	0.2	-0.15	0.331613	1
+2	0	25	0.1	0	0.1	0	0	2	-2	-2	-0.366519	1