OP-975 Employ a new sequence that is optimal for magnetometer calibration. Updated all images

ground/openpilotgcs/src/plugins/config/calibration/gyrobiascalibrationmodel.cpp

@@ -66,7 +66,7 @@ void GyroBiasCalibrationModel::start()
     attitudeSettingsData.BiasCorrectGyro = AttitudeSettings::BIASCORRECTGYRO_FALSE;
     attitudeSettings->setData(attitudeSettingsData);
     attitudeSettings->updated();
-    displayVisualHelp("plane-horizontal");
+    displayVisualHelp("plane-ned");
     displayInstructions("Calibrating the gyroscopes. Keep the copter/plane steady...", true);
 
     gyro_accum_x.clear();

ground/openpilotgcs/src/plugins/config/calibration/levelcalibrationmodel.cpp

@@ -63,7 +63,7 @@ void LevelCalibrationModel::start()
 
     /* Show instructions and enable controls */
     displayInstructions("Place horizontally and click save position...", true);
-    displayVisualHelp("plane-horizontal");
+    displayVisualHelp("plane-ned");
     disableAllCalibrations();
     savePositionEnabledChanged(true);
     position = 0;
@@ -131,7 +131,7 @@ void LevelCalibrationModel::getSample(UAVObject *obj)
             rot_data_roll  = OpenPilot::CalibrationUtils::listMean(rot_accum_roll);
 
             displayInstructions("Leave horizontally, rotate 180° along yaw axis and click save position...", true);
-            displayVisualHelp("plane-horizontal-rotated");
+            displayVisualHelp("plane-swd");
 
             disableAllCalibrations();
 

ground/openpilotgcs/src/plugins/config/calibration/sixpointcalibrationmodel.cpp

@@ -150,8 +150,8 @@ void SixPointCalibrationModel::start(bool calibrateAccel, bool calibrateMag)
     mag->setMetadata(mdata);
 
     /* Show instructions and enable controls */
-    displayInstructions("Place horizontally and click save position...", true);
-    showHelp("horizontal");
+    displayInstructions("Place horizontally, nose pointing north and click save position...", true);
+    showHelp("ned");
     disableAllCalibrations();
     savePositionEnabledChanged(true);
     position = 0;
@@ -241,24 +241,24 @@ void SixPointCalibrationModel::getSample(UAVObject *obj)
 
         position = (position + 1) % 6;
         if (position == 1) {
-            displayInstructions("Place with left side down and click save position...", false);
-            showHelp("left");
+            displayInstructions("Place with nose down, right side west and click save position...", false);
+            showHelp("dwn");
         }
         if (position == 2) {
-            displayInstructions("Place upside down and click save position...", false);
-            showHelp("flip");
+            displayInstructions("Place right side down, nose west and click save position...", false);
+            showHelp("wds");
         }
         if (position == 3) {
-            displayInstructions("Place with right side down and click save position...", false);
-            showHelp("right");
+            displayInstructions("Place upside down, nose east and click save position...", false);
+            showHelp("enu");
         }
         if (position == 4) {
-            displayInstructions("Place with nose up and click save position...", false);
-            showHelp("up");
+            displayInstructions("Place with nose up, left side north and click save position...", false);
+            showHelp("use");
         }
         if (position == 5) {
-            displayInstructions("Place with nose down and click save position...", false);
-            showHelp("down");
+            displayInstructions("Place with left side down, nose south and click save position...", false);
+            showHelp("suw");
         }
         if (position == 0) {
             compute(calibratingMag, calibratingAccel);
@@ -384,7 +384,7 @@ UAVObjectManager *SixPointCalibrationModel::getObjectManager()
 void SixPointCalibrationModel::showHelp(QString image){
 
     if(calibratingAccel){
-        displayVisualHelp("revo-" + image);
+        displayVisualHelp(image);
     }else {
         displayVisualHelp("plane-" + image);
     }

ground/openpilotgcs/src/plugins/config/configgadget.qrc

@@ -30,20 +30,22 @@
         <file>images/pipx-normal.png</file>
         <file>images/revolution_top.png</file>
         <file>calibration/WizardStepIndicator.qml</file>
-        <file>images/calibration/plane-flip.png</file>
         <file>images/calibration/plane-horizontal.png</file>
-        <file>images/calibration/plane-left.png</file>
-        <file>images/calibration/plane-right.png</file>
-        <file>images/calibration/plane-up.png</file>
         <file>images/calibration/plane-horizontal-rotated.png</file>
+        <file>images/calibration/dwn.png</file>
+        <file>images/calibration/enu.png</file>
+        <file>images/calibration/plane-dwn.png</file>
+        <file>images/calibration/plane-enu.png</file>
+        <file>images/calibration/plane-ned.png</file>
+        <file>images/calibration/plane-suw.png</file>
+        <file>images/calibration/plane-use.png</file>
+        <file>images/calibration/plane-wds.png</file>
+        <file>images/calibration/ned.png</file>
+        <file>images/calibration/suw.png</file>
+        <file>images/calibration/use.png</file>
+        <file>images/calibration/wds.png</file>
         <file>images/calibration/empty.png</file>
-        <file>images/calibration/plane-down.png</file>
-        <file>images/calibration/revo-down.png</file>
-        <file>images/calibration/revo-flip.png</file>
-        <file>images/calibration/revo-horizontal-rotated.png</file>
-        <file>images/calibration/revo-horizontal.png</file>
-        <file>images/calibration/revo-left.png</file>
-        <file>images/calibration/revo-right.png</file>
-        <file>images/calibration/revo-up.png</file>
+        <file>images/calibration/plane-swd.png</file>
+        <file>images/calibration/swd.png</file>
     </qresource>
 </RCC>