Merge pull request #1049 from AndreasAntener/accel-calibration-fix

Accel calibration wizard fix

qgroundcontrol.qrc

@@ -168,12 +168,12 @@
         <file>files/images/px4/airframes/plane_aert.png</file>
         <file>files/images/px4/airframes/quad_h.png</file>
         <file>files/images/px4/calibration/arrows.png</file>
-        <file>files/images/px4/calibration/accel_front.png</file>
         <file>files/images/px4/calibration/accel_back.png</file>
-        <file>files/images/px4/calibration/accel_left.png</file>
-        <file>files/images/px4/calibration/accel_up.png</file>
-        <file>files/images/px4/calibration/accel_down.png</file>
+        <file>files/images/px4/calibration/accel_front.png</file>
         <file>files/images/px4/calibration/accel_right.png</file>
+        <file>files/images/px4/calibration/accel_down.png</file>
+        <file>files/images/px4/calibration/accel_up.png</file>
+        <file>files/images/px4/calibration/accel_left.png</file>
         <file>files/images/px4/calibration/mag_calibration_figure8.png</file>
         <file>files/images/px4/calibration/mode1/radioCenter.png</file>
         <file>files/images/px4/calibration/mode1/radioHome.png</file>

src/ui/px4_configuration/QGCPX4SensorCalibration.cc

@@ -402,13 +402,13 @@ void QGCPX4SensorCalibration::handleTextMessage(int uasid, int compId, int sever
 
     ui->instructionLabel->setText(QString("%1").arg(text));
 
-    if (text.startsWith("accel measurement started: ")) {
-        QString axis = text.split("measurement started: ").last().left(2);
+    if (text.startsWith("Hold still, starting to measure ")) {
+        QString axis = text.section(" ", -2, -2);
         setInstructionImage(QString(":/files/images/px4/calibration/accel_%1.png").arg(axis));
     }
 
-    if (text.startsWith("directions left: ")) {
-        QString axis = text.split("directions left: ").last().left(2);
+    if (text.startsWith("pending: ")) {
+        QString axis = text.section(" ", 1, 1);
         setInstructionImage(QString(":/files/images/px4/calibration/accel_%1.png").arg(axis));
     }