Merged in f5soh/librepilot/LP-514_Dshot_Wizard (pull request #490)

LP-514 Dshot Wizard support and other Esc types

Approved-by: Lalanne Laurent <f5soh@free.fr>
Approved-by: Philippe Renon <philippe_renon@yahoo.fr>

Author: f5soh

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

@@ -179,7 +179,9 @@ void ConnectionDiagram::setupGraphicsScene()
         case VehicleConfigurationSource::CONTROLLER_CC:
         case VehicleConfigurationSource::CONTROLLER_CC3D:
             prefix = "cc-";
-            if (m_configSource->getEscType() == VehicleConfigurationSource::ESC_ONESHOT ||
+            if (m_configSource->getEscType() == VehicleConfigurationSource::ESC_ONESHOT125 ||
+                m_configSource->getEscType() == VehicleConfigurationSource::ESC_ONESHOT42 ||
+                m_configSource->getEscType() == VehicleConfigurationSource::ESC_MULTISHOT ||
                 m_configSource->getEscType() == VehicleConfigurationSource::ESC_SYNCHED) {
                 suffix = "-oneshot";
             }

ground/gcs/src/plugins/setupwizard/pages/esccalibrationpage.cpp

@@ -93,8 +93,10 @@ void EscCalibrationPage::resetAllSecurityCheckboxes()
 
 int EscCalibrationPage::getHighOutputRate()
 {
-    if (getWizard()->getEscType() == SetupWizard::ESC_ONESHOT) {
-        return HIGH_ONESHOT125_OUTPUT_PULSE_LENGTH_MICROSECONDS;
+    if (getWizard()->getEscType() == SetupWizard::ESC_ONESHOT125 ||
+        getWizard()->getEscType() == SetupWizard::ESC_ONESHOT42 ||
+        getWizard()->getEscType() == SetupWizard::ESC_MULTISHOT) {
+        return HIGH_ONESHOT_MULTISHOT_OUTPUT_PULSE_LENGTH_MICROSECONDS;
     } else {
         return HIGH_PWM_OUTPUT_PULSE_LENGTH_MICROSECONDS;
     }

ground/gcs/src/plugins/setupwizard/pages/esccalibrationpage.h

@@ -59,7 +59,7 @@ private slots:
     // Min value should match min value defined in vehicleconfigurationsource.h
     static const int LOW_PWM_OUTPUT_PULSE_LENGTH_MICROSECONDS  = 1000;
     static const int HIGH_PWM_OUTPUT_PULSE_LENGTH_MICROSECONDS = 1900;
-    static const int HIGH_ONESHOT125_OUTPUT_PULSE_LENGTH_MICROSECONDS = 2000;
+    static const int HIGH_ONESHOT_MULTISHOT_OUTPUT_PULSE_LENGTH_MICROSECONDS = 2000;
     Ui::EscCalibrationPage *ui;
     bool m_isCalibrating;
     OutputCalibrationUtil m_outputUtil;

ground/gcs/src/plugins/setupwizard/pages/escpage.cpp

@@ -47,25 +47,49 @@ void EscPage::initializePage()
 {
     bool enabled = isSynchOrOneShotAvailable();
 
-    ui->oneshotESCButton->setEnabled(enabled);
-    if (ui->oneshotESCButton->isChecked() && !enabled) {
-        ui->oneshotESCButton->setChecked(false);
+    ui->oneshot125ESCButton->setEnabled(enabled);
+    ui->oneshot42ESCButton->setEnabled(enabled);
+    ui->multishotESCButton->setEnabled(enabled);
+
+    if ((ui->oneshot125ESCButton->isChecked() ||
+         ui->oneshot42ESCButton->isChecked() ||
+         ui->multishotESCButton->isChecked()) && !enabled) {
+        ui->oneshot125ESCButton->setChecked(false);
+        ui->oneshot42ESCButton->setChecked(false);
+        ui->multishotESCButton->setChecked(false);
         ui->rapidESCButton->setChecked(true);
     }
+
+    enabled = isFastDShotAvailable();
+    ui->dshot1200ESCButton->setEnabled(enabled);
+    if (ui->dshot1200ESCButton->isChecked() && !enabled) {
+        ui->dshot1200ESCButton->setChecked(false);
+        ui->dshot600ESCButton->setChecked(true);
+    }
 }
 
 bool EscPage::validatePage()
 {
-    if (ui->oneshotESCButton->isChecked()) {
-        getWizard()->setEscType(SetupWizard::ESC_ONESHOT);
+    if (ui->dshot1200ESCButton->isChecked()) {
+        getWizard()->setEscType(SetupWizard::ESC_DSHOT1200);
+    } else if (ui->dshot600ESCButton->isChecked()) {
+        getWizard()->setEscType(SetupWizard::ESC_DSHOT600);
+    } else if (ui->dshot150ESCButton->isChecked()) {
+        getWizard()->setEscType(SetupWizard::ESC_DSHOT150);
+    } else if (ui->multishotESCButton->isChecked()) {
+        getWizard()->setEscType(SetupWizard::ESC_MULTISHOT);
+    } else if (ui->oneshot42ESCButton->isChecked()) {
+        getWizard()->setEscType(SetupWizard::ESC_ONESHOT42);
+    } else if (ui->oneshot125ESCButton->isChecked()) {
+        getWizard()->setEscType(SetupWizard::ESC_ONESHOT125);
     } else if (ui->rapidESCButton->isChecked()) {
         if (isSynchOrOneShotAvailable()) {
             getWizard()->setEscType(SetupWizard::ESC_SYNCHED);
         } else {
             getWizard()->setEscType(SetupWizard::ESC_RAPID);
         }
     } else if (ui->defaultESCButton->isChecked()) {
-        getWizard()->setEscType(SetupWizard::ESC_STANDARD);
+        getWizard()->setEscType(SetupWizard::ESC_STANDARD300);
     }
 
     return true;
@@ -107,3 +131,22 @@ bool EscPage::isSynchOrOneShotAvailable()
 
     return available;
 }
+
+bool EscPage::isFastDShotAvailable()
+{
+    bool available = true;
+
+    switch (getWizard()->getControllerType()) {
+    case SetupWizard::CONTROLLER_CC3D:
+    case SetupWizard::CONTROLLER_SPRACINGF3:
+    case SetupWizard::CONTROLLER_SPRACINGF3EVO:
+    case SetupWizard::CONTROLLER_PIKOBLX:
+    case SetupWizard::CONTROLLER_TINYFISH:
+        available = false;
+        break;
+    default:
+        break;
+    }
+
+    return available;
+}

ground/gcs/src/plugins/setupwizard/pages/escpage.h

@@ -46,6 +46,7 @@ class EscPage : public AbstractWizardPage {
 private:
     Ui::EscPage *ui;
     bool isSynchOrOneShotAvailable();
+    bool isFastDShotAvailable();
 };
 
 #endif // ESCPAGE_H