Merge remote-tracking branch 'origin/rel-14.10' into next

WHATSNEW.txt

@@ -1,3 +1,16 @@
+--- RELEASE-14.10-RC8 ---
+This release candidate does add the following fixes/enhancements over the previous RC7
+
+The full list of features, improvements and bugfixes in this RC8 is accessible here:
+http://progress.openpilot.org/issues/?filter=11867
+
+** Improvement
+    * [OP-1635] - Remove Quah H frome wizard to avoid confusion with Quad X
+    * [OP-1627] - Clean up PiOS DSM post Matt fix
+    * [OP-1624] - Make Aux Mag default if selected via Wizard
+    * [OP-1625] - Satellite dsm2/dsmX channel resolution autodetection.
+
+
 --- RELEASE-14.10-RC7 --- 
 This release candidate does add the following fixes/enhancements over the previous RC6
 

ground/openpilotgcs/share/openpilotgcs/cloudconfig/multirotor/RD290MiniHexfpv-Multirotor-HexacopterX-6587232be1a.optmpl

@@ -4,7 +4,7 @@
     "controller": "Revolution",
     "esc": "KISS 2-4S 18A",
     "motor": "Multistar ELITE 2204-2300kv",
-    "name": "RD290 Mini Hex  (fpv-reconn.com)",
+    "name": "RD290 Mini Hex",
     "nick": "liftbag",
     "objects": [
         {

ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_fr.ts

@@ -10460,13 +10460,13 @@ Voulez-vous toujours continuer ?</translation>
     </message>
     <message>
         <location line="+7"/>
-        <location line="+1177"/>
+        <location line="+1176"/>
         <source>Arming Settings are now set to &apos;Always Disarmed&apos; for your safety.</source>
         <translatorcomment>Contexte : Onglet &quot;Paramètres d&apos;Armement&quot;</translatorcomment>
         <translation>Pour des raisons de sécurité les Paramètres d&apos;Armement ont été modifiés à &apos;Toujours Désarmé&apos;.</translation>
     </message>
     <message>
-        <location line="-1176"/>
+        <location line="-1175"/>
         <source>You will have to reconfigure the arming settings manually when the wizard is finished. After the last step of the wizard you will be taken to the Arming Settings screen.</source>
         <translatorcomment>redirigé vers / sur ?</translatorcomment>
         <translation>Vous devrez reconfigurer manuellement les paramètres d&apos;armement lorsque l&apos;assistant sera terminé. Après la dernière étape de l&apos;assistant, vous serez redirigé vers l&apos;écran des Paramètres d&apos;Armement.</translation>
@@ -10658,8 +10658,8 @@ Move the %1 stick.</source>
 Bougez le manche %1.</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+6"/>
-        <source>Next/Skip</source>
+        <source>Next / Skip</source>
         <translation>Suivant / Sauter</translation>
     </message>
     <message>
@@ -11246,7 +11246,7 @@ Double clic sur la légende ou le tracé pour afficher/cacher la légende.</tran
         <translation>Échoué !</translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+136"/>
         <source>Writing External Mag sensor settings</source>
         <translation>Écriture paramètres Compas Externe</translation>
     </message>
@@ -14613,7 +14613,7 @@ et même conduire au crash. A utiliser avec prudence.</translation>
         <translation>Résumé d&apos;informations sur le Véhicule.</translation>
     </message>
     <message>
-        <location filename="../../../src/plugins/setupwizard/pages/airframeinitialtuningpage.cpp" line="+119"/>
+        <location filename="../../../src/plugins/setupwizard/pages/airframeinitialtuningpage.cpp" line="+120"/>
         <source>Name of Vehicle: </source>
         <translation>Nom du Véhicule : </translation>
     </message>

ground/openpilotgcs/src/plugins/setupwizard/connectiondiagram.cpp

@@ -109,9 +109,6 @@ void ConnectionDiagram::setupGraphicsScene()
             case VehicleConfigurationSource::MULTI_ROTOR_QUAD_PLUS:
                 elementsToShow << "quad-p";
                 break;
-            case VehicleConfigurationSource::MULTI_ROTOR_QUAD_H:
-                elementsToShow << "quad-h";
-                break;
             case VehicleConfigurationSource::MULTI_ROTOR_HEXA:
                 elementsToShow << "hexa";
                 break;

ground/openpilotgcs/src/plugins/setupwizard/pages/airframeinitialtuningpage.cpp

@@ -160,11 +160,9 @@ bool AirframeInitialTuningPage::airframeIsCompatible(int vehicleType, int vehicl
 
     int wizSubType = getWizard()->getVehicleSubType();
     switch (vehicleType) {
-    case VehicleConfigurationSource::MULTI_ROTOR_QUAD_H:
     case VehicleConfigurationSource::MULTI_ROTOR_QUAD_X:
     {
-        return wizSubType == VehicleConfigurationSource::MULTI_ROTOR_QUAD_H ||
+        return wizSubType == VehicleConfigurationSource::MULTI_ROTOR_QUAD_X;
-               wizSubType == VehicleConfigurationSource::MULTI_ROTOR_QUAD_X;
     }
     default:
         return vehicleSubType == wizSubType;
@@ -211,16 +209,20 @@ void AirframeInitialTuningPage::loadValidFiles()
 
 void AirframeInitialTuningPage::setupTemplateList()
 {
-    QListWidgetItem *item = new QListWidgetItem(tr("Current Tuning"), ui->templateList);
+    QListWidgetItem *item;
-
-    item->setData(Qt::UserRole + 1, QVariant::fromValue((QJsonObject *)NULL));
     foreach(QString templ, m_templates.keys()) {
         QJsonObject *json = m_templates[templ];
 
         item = new QListWidgetItem(json->value("name").toString(), ui->templateList);
         item->setData(Qt::UserRole + 1, QVariant::fromValue(json));
     }
+    ui->templateList->sortItems(Qt::AscendingOrder);
+
+    item = new QListWidgetItem(tr("Current Tuning"));
+    item->setData(Qt::UserRole + 1, QVariant::fromValue((QJsonObject *)NULL));
+    ui->templateList->insertItem(0, item);
     ui->templateList->setCurrentRow(0);
+    //TODO Add generics to top under item Current tuning
 }
 
 QString AirframeInitialTuningPage::getTemplateKey(QJsonObject *templ)

ground/openpilotgcs/src/plugins/setupwizard/pages/multipage.cpp

@@ -77,11 +77,6 @@ void MultiPage::setupSelection(Selection *selection)
                        "quad-plus",
                        SetupWizard::MULTI_ROTOR_QUAD_PLUS);
 
-    selection->addItem(tr("Quadcopter H"),
-                       tr("Quadcopter H, Blackout miniH"),
-                       "quad-h",
-                       SetupWizard::MULTI_ROTOR_QUAD_H);
-
     selection->addItem(tr("Hexacopter"),
                        tr("A multirotor with six motors, one motor in front."),
                        "quad-hexa",

ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.cpp

@@ -131,14 +131,6 @@ void OutputCalibrationPage::setupVehicle()
         m_channelIndex << 0 << 0 << 1 << 2 << 3;
         setupActuatorMinMaxAndNeutral(0, 3, 4);
         break;
-    case SetupWizard::MULTI_ROTOR_QUAD_H:
-        loadSVGFile(MULTI_SVG_FILE);
-        m_wizardIndexes << 0 << 1 << 1 << 1 << 1;
-        m_vehicleElementIds << "quad-h" << "quad-h-frame" << "quad-h-m1" << "quad-h-m2" << "quad-h-m3" << "quad-h-m4";
-        m_vehicleHighlightElementIndexes << 0 << 1 << 2 << 3 << 4;
-        m_channelIndex << 0 << 0 << 1 << 2 << 3;
-        setupActuatorMinMaxAndNeutral(0, 3, 4);
-        break;
     case SetupWizard::MULTI_ROTOR_QUAD_PLUS:
         loadSVGFile(MULTI_SVG_FILE);
         m_wizardIndexes << 0 << 1 << 1 << 1 << 1;

ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp

@@ -277,9 +277,6 @@ QString SetupWizard::getSummaryText()
         case SetupWizard::MULTI_ROTOR_QUAD_PLUS:
             summary.append(tr("Quadcopter +"));
             break;
-        case SetupWizard::MULTI_ROTOR_QUAD_H:
-            summary.append(tr("Quadcopter H"));
-            break;
         case SetupWizard::MULTI_ROTOR_HEXA:
             summary.append(tr("Hexacopter"));
             break;

ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp

@@ -292,7 +292,6 @@ void VehicleConfigurationHelper::applyVehicleConfiguration()
             break;
         case VehicleConfigurationSource::MULTI_ROTOR_QUAD_X:
         case VehicleConfigurationSource::MULTI_ROTOR_QUAD_PLUS:
-        case VehicleConfigurationSource::MULTI_ROTOR_QUAD_H:
             setupQuadCopter();
             break;
         case VehicleConfigurationSource::MULTI_ROTOR_HEXA:
@@ -407,7 +406,6 @@ void VehicleConfigurationHelper::applyActuatorConfiguration()
             }
             break;
         case VehicleConfigurationSource::MULTI_ROTOR_QUAD_X:
-        case VehicleConfigurationSource::MULTI_ROTOR_QUAD_H:
         case VehicleConfigurationSource::MULTI_ROTOR_QUAD_PLUS:
             data.ChannelUpdateFreq[0] = escFrequence;
             data.ChannelUpdateFreq[1] = escFrequence;
@@ -657,11 +655,6 @@ void VehicleConfigurationHelper::applyMixerConfiguration(mixerChannelSettings ch
             mSettings->setMixerValuePitch(100);
             mSettings->setMixerValueYaw(50);
             break;
-        case VehicleConfigurationSource::MULTI_ROTOR_QUAD_H:
-            mSettings->setMixerValueRoll(50);
-            mSettings->setMixerValuePitch(70);
-            mSettings->setMixerValueYaw(50);
-            break;
         case VehicleConfigurationSource::MULTI_ROTOR_HEXA_COAX_Y:
             mSettings->setMixerValueRoll(100);
             mSettings->setMixerValuePitch(50);
@@ -1077,44 +1070,6 @@ void VehicleConfigurationHelper::setupQuadCopter()
 
         break;
     }
-    case VehicleConfigurationSource::MULTI_ROTOR_QUAD_H:
-    {
-        frame = SystemSettings::AIRFRAMETYPE_QUADH;
-        channels[0].type      = MIXER_TYPE_MOTOR;
-        channels[0].throttle1 = 100;
-        channels[0].throttle2 = 0;
-        channels[0].roll      = 50;
-        channels[0].pitch     = 70;
-        channels[0].yaw = -50;
-
-        channels[1].type      = MIXER_TYPE_MOTOR;
-        channels[1].throttle1 = 100;
-        channels[1].throttle2 = 0;
-        channels[1].roll      = -50;
-        channels[1].pitch     = 70;
-        channels[1].yaw = 50;
-
-        channels[2].type      = MIXER_TYPE_MOTOR;
-        channels[2].throttle1 = 100;
-        channels[2].throttle2 = 0;
-        channels[2].roll      = -50;
-        channels[2].pitch     = -70;
-        channels[2].yaw = -50;
-
-        channels[3].type      = MIXER_TYPE_MOTOR;
-        channels[3].throttle1 = 100;
-        channels[3].throttle2 = 0;
-        channels[3].roll      = 50;
-        channels[3].pitch     = -70;
-        channels[3].yaw = 50;
-
-        guiSettings.multi.VTOLMotorNW = 1;
-        guiSettings.multi.VTOLMotorNE = 2;
-        guiSettings.multi.VTOLMotorSE = 3;
-        guiSettings.multi.VTOLMotorSW = 4;
-
-        break;
-    }
     default:
         break;
     }

ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateexportdialog.cpp

@@ -112,11 +112,6 @@ QString VehicleTemplateExportDialog::setupVehicleType()
         m_subType = VehicleConfigurationSource::MULTI_ROTOR_QUAD_X;
         return tr("Multirotor - Quadrocopter X");
 
-    case SystemSettings::AIRFRAMETYPE_QUADH:
-        m_type    = VehicleConfigurationSource::VEHICLE_MULTI;
-        m_subType = VehicleConfigurationSource::MULTI_ROTOR_QUAD_H;
-        return tr("Multirotor - Quadrocopter H");
-
     case SystemSettings::AIRFRAMETYPE_QUADP:
         m_type    = VehicleConfigurationSource::VEHICLE_MULTI;
         m_subType = VehicleConfigurationSource::MULTI_ROTOR_QUAD_PLUS;

package/winx86/openpilotgcs.nsi

@@ -72,7 +72,7 @@
   VIAddVersionKey "Comments" "${INSTALLER_NAME}. ${BUILD_DESCRIPTION}"
   VIAddVersionKey "CompanyName" "The OpenPilot Team, http://www.openpilot.org"
   VIAddVersionKey "LegalTrademarks" "${PRODUCT_NAME} is a trademark of The OpenPilot Team"
-  VIAddVersionKey "LegalCopyright" "© 2010-2014 The OpenPilot Team"
+  VIAddVersionKey "LegalCopyright" "© 2010-2014 The OpenPilot Team"
   VIAddVersionKey "FileDescription" "${INSTALLER_NAME}"
 
 ;--------------------------------
@@ -93,7 +93,7 @@
 ;--------------------------------
 ; Branding
 
-  BrandingText "© 2010-2014 The OpenPilot Team, http://www.openpilot.org"
+  BrandingText "© 2010-2014 The OpenPilot Team, http://www.openpilot.org"
 
   !define MUI_ICON "${NSIS_DATA_TREE}\resources\openpilot.ico"
   !define MUI_HEADERIMAGE