From 821573144ab3ba0a426432b7f8f3fe9ce1127eeb Mon Sep 17 00:00:00 2001
From: m_thread <fredrik@arvidssons.org>
Date: Tue, 17 Feb 2015 01:08:23 +0100
Subject: [PATCH] OP-1685 Adding new artwork for oneshot esc. Adding more
 configuration logic.

---
 .../src/plugins/setupwizard/pages/escpage.cpp    |  14 ++++++++++++--
 .../src/plugins/setupwizard/pages/escpage.h      |   2 ++
 .../src/plugins/setupwizard/pages/escpage.ui     |  13 ++++++++-----
 .../src/plugins/setupwizard/pages/savepage.cpp   |   3 +++
 .../setupwizard/resources/bttn-oneshot-dwn.png   | Bin 0 -> 5593 bytes
 .../setupwizard/resources/bttn-oneshot-up.png    | Bin 0 -> 6487 bytes
 .../src/plugins/setupwizard/setupwizard.cpp      |   3 +++
 .../src/plugins/setupwizard/setupwizard.h        |   2 +-
 .../setupwizard/vehicleconfigurationhelper.cpp   |   8 ++++++--
 .../setupwizard/vehicleconfigurationsource.h     |   2 +-
 .../src/plugins/setupwizard/wizardResources.qrc  |   2 ++
 11 files changed, 38 insertions(+), 11 deletions(-)
 create mode 100644 ground/openpilotgcs/src/plugins/setupwizard/resources/bttn-oneshot-dwn.png
 create mode 100644 ground/openpilotgcs/src/plugins/setupwizard/resources/bttn-oneshot-up.png

diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/escpage.cpp b/ground/openpilotgcs/src/plugins/setupwizard/pages/escpage.cpp
index 043c51317..6ef5ce507 100644
--- a/ground/openpilotgcs/src/plugins/setupwizard/pages/escpage.cpp
+++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/escpage.cpp
@@ -44,8 +44,8 @@ EscPage::~EscPage()
 
 bool EscPage::validatePage()
 {
-    if (ui->synchedESCButton->isChecked()) {
-        getWizard()->setEscType(SetupWizard::ESC_SYNCHED);
+    if (ui->oneshotESCButton->isChecked()) {
+        getWizard()->setEscType(SetupWizard::ESC_ONESHOT);
     }else if (ui->rapidESCButton->isChecked()) {
         getWizard()->setEscType(SetupWizard::ESC_RAPID);
     } else if (ui->defaultESCButton->isChecked()){
@@ -54,3 +54,13 @@ bool EscPage::validatePage()
 
     return true;
 }
+
+
+void EscPage::initializePage()
+{
+    ui->oneshotESCButton->setEnabled(getWizard()->getInputType() != SetupWizard::INPUT_PWM);
+    if (ui->oneshotESCButton->isChecked() && getWizard()->getInputType() == SetupWizard::INPUT_PWM) {
+        ui->oneshotESCButton->setChecked(false);
+        ui->rapidESCButton->setChecked(true);
+    }
+}
diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/escpage.h b/ground/openpilotgcs/src/plugins/setupwizard/pages/escpage.h
index 001122e46..017c3f27d 100644
--- a/ground/openpilotgcs/src/plugins/setupwizard/pages/escpage.h
+++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/escpage.h
@@ -41,9 +41,11 @@ public:
     explicit EscPage(SetupWizard *wizard, QWidget *parent = 0);
     ~EscPage();
     bool validatePage();
+    void initializePage();
 
 private:
     Ui::EscPage *ui;
+
 };
 
 #endif // ESCPAGE_H
diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/escpage.ui b/ground/openpilotgcs/src/plugins/setupwizard/pages/escpage.ui
index 3827e48ed..a70763715 100644
--- a/ground/openpilotgcs/src/plugins/setupwizard/pages/escpage.ui
+++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/escpage.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>600</width>
+    <width>641</width>
     <height>400</height>
    </rect>
   </property>
@@ -140,7 +140,10 @@ p, li { white-space: pre-wrap; }
       </widget>
      </item>
      <item>
-      <widget class="QToolButton" name="synchedESCButton">
+      <widget class="QToolButton" name="oneshotESCButton">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
        <property name="font">
         <font>
          <pointsize>10</pointsize>
@@ -153,12 +156,12 @@ p, li { white-space: pre-wrap; }
         <string notr="true">QToolButton { border: none }</string>
        </property>
        <property name="text">
-        <string>Synched ESC</string>
+        <string>OneShot ESC</string>
        </property>
        <property name="icon">
         <iconset resource="../wizardResources.qrc">
-         <normaloff>:/setupwizard/resources/bttn-rapid-up.png</normaloff>
-         <normalon>:/setupwizard/resources/bttn-rapid-dwn.png</normalon>:/setupwizard/resources/bttn-rapid-up.png</iconset>
+         <normaloff>:/setupwizard/resources/bttn-oneshot-up.png</normaloff>
+         <normalon>:/setupwizard/resources/bttn-oneshot-dwn.png</normalon>:/setupwizard/resources/bttn-oneshot-up.png</iconset>
        </property>
        <property name="iconSize">
         <size>
diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/savepage.cpp b/ground/openpilotgcs/src/plugins/setupwizard/pages/savepage.cpp
index 22084b277..ba712c9fb 100644
--- a/ground/openpilotgcs/src/plugins/setupwizard/pages/savepage.cpp
+++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/savepage.cpp
@@ -74,6 +74,9 @@ void SavePage::writeToController()
 
     disconnect(&helper, SIGNAL(saveProgress(int, int, QString)), this, SLOT(saveProgress(int, int, QString)));
     ui->saveProgressLabel->setText(QString("<font color='%1'>%2</font>").arg(m_successfulWrite ? "green" : "red", ui->saveProgressLabel->text()));
+    if (m_successfulWrite) {
+        getWizard()->reboot();
+    }
     enableButtons(true);
 
     emit completeChanged();
diff --git a/ground/openpilotgcs/src/plugins/setupwizard/resources/bttn-oneshot-dwn.png b/ground/openpilotgcs/src/plugins/setupwizard/resources/bttn-oneshot-dwn.png
new file mode 100644
index 0000000000000000000000000000000000000000..658b568a974246c8476dd1c4cc7e208d9aa18e8f
GIT binary patch
literal 5593
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

literal 0
HcmV?d00001

diff --git a/ground/openpilotgcs/src/plugins/setupwizard/resources/bttn-oneshot-up.png b/ground/openpilotgcs/src/plugins/setupwizard/resources/bttn-oneshot-up.png
new file mode 100644
index 0000000000000000000000000000000000000000..00363c05160f279d7e122a204a4f512a3bf0097c
GIT binary patch
literal 6487
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
E2M5By@c;k-

literal 0
HcmV?d00001

diff --git a/ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp b/ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp
index 4fdfd2850..2deacf968 100644
--- a/ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp
+++ b/ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp
@@ -385,6 +385,9 @@ QString SetupWizard::getSummaryText()
     case ESC_RAPID:
         summary.append(tr("Rapid ESC (%1 Hz)").arg(VehicleConfigurationHelper::RAPID_ESC_FREQUENCY));
         break;
+    case ESC_ONESHOT:
+        summary.append(tr("Oneshot ESC"));
+        break;
     default:
         summary.append(tr("Unknown"));
     }
diff --git a/ground/openpilotgcs/src/plugins/setupwizard/setupwizard.h b/ground/openpilotgcs/src/plugins/setupwizard/setupwizard.h
index 10a34a5f3..0e8226457 100644
--- a/ground/openpilotgcs/src/plugins/setupwizard/setupwizard.h
+++ b/ground/openpilotgcs/src/plugins/setupwizard/setupwizard.h
@@ -179,6 +179,7 @@ public:
         }
         return m_connectionManager;
     }
+    void reboot() const;
 
 private slots:
     void customBackClicked();
@@ -192,7 +193,6 @@ private:
     void createPages();
     bool saveHardwareSettings() const;
     bool canAutoUpdate() const;
-    void reboot() const;
 
     CONTROLLER_TYPE m_controllerType;
     VEHICLE_TYPE m_vehicleType;
diff --git a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp
index 01b9ff261..c7f2c5c34 100644
--- a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp
+++ b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp
@@ -373,9 +373,13 @@ void VehicleConfigurationHelper::applyActuatorConfiguration()
         break;
     case VehicleConfigurationSource::ESC_RAPID:
         escFrequence = RAPID_ESC_FREQUENCY;
-        bankMode = ActuatorSettings::BANKMODE_ONESHOT;
+        if (m_configSource->getInputType() != VehicleConfigurationSource::INPUT_PWM) {
+            bankMode = ActuatorSettings::BANKMODE_ONESHOT;
+        } else {
+            bankMode = ActuatorSettings::BANKMODE_PWM;
+        }
         break;
-    case VehicleConfigurationSource::ESC_SYNCHED:
+    case VehicleConfigurationSource::ESC_ONESHOT:
         escFrequence = RAPID_ESC_FREQUENCY;
         bankMode = ActuatorSettings::BANKMODE_ONESHOT125;
         break;
diff --git a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationsource.h b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationsource.h
index 285fec2da..521172b1f 100644
--- a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationsource.h
+++ b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationsource.h
@@ -63,7 +63,7 @@ public:
                             MULTI_ROTOR_OCTO_X, MULTI_ROTOR_OCTO_V, MULTI_ROTOR_OCTO_COAX_X, MULTI_ROTOR_OCTO_COAX_PLUS,
                             FIXED_WING_DUAL_AILERON, FIXED_WING_AILERON, FIXED_WING_ELEVON, FIXED_WING_VTAIL, HELI_CCPM,
                             GROUNDVEHICLE_MOTORCYCLE, GROUNDVEHICLE_CAR, GROUNDVEHICLE_DIFFERENTIAL };
-    enum ESC_TYPE { ESC_SYNCHED, ESC_RAPID, ESC_STANDARD, ESC_UNKNOWN };
+    enum ESC_TYPE { ESC_ONESHOT, ESC_RAPID, ESC_STANDARD, ESC_UNKNOWN };
     enum SERVO_TYPE { SERVO_ANALOG, SERVO_DIGITAL, SERVO_UNKNOWN };
     enum INPUT_TYPE { INPUT_PWM, INPUT_PPM, INPUT_SBUS, INPUT_DSM, INPUT_UNKNOWN };
     enum AIRSPEED_TYPE { AIRSPEED_ESTIMATE, AIRSPEED_EAGLETREE, AIRSPEED_MS4525, AIRSPEED_DISABLED };
diff --git a/ground/openpilotgcs/src/plugins/setupwizard/wizardResources.qrc b/ground/openpilotgcs/src/plugins/setupwizard/wizardResources.qrc
index d81784825..c10a71c70 100644
--- a/ground/openpilotgcs/src/plugins/setupwizard/wizardResources.qrc
+++ b/ground/openpilotgcs/src/plugins/setupwizard/wizardResources.qrc
@@ -52,5 +52,7 @@
         <file>resources/bttn-upgrade-up.png</file>
         <file>resources/not-connected.png</file>
         <file>resources/connected.png</file>
+        <file>resources/bttn-oneshot-dwn.png</file>
+        <file>resources/bttn-oneshot-up.png</file>
     </qresource>
 </RCC>