From e227b7497d7ee8a21d83ada203148ae927443ebf Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 14 Sep 2015 22:41:41 +0200 Subject: [PATCH 1/2] LP-70 Added restrictions to CC/CC3D/Nano when configuring OneShot125 --- .../src/plugins/setupwizard/pages/escpage.cpp | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/ground/gcs/src/plugins/setupwizard/pages/escpage.cpp b/ground/gcs/src/plugins/setupwizard/pages/escpage.cpp index 8b84ec861..20be547ab 100644 --- a/ground/gcs/src/plugins/setupwizard/pages/escpage.cpp +++ b/ground/gcs/src/plugins/setupwizard/pages/escpage.cpp @@ -79,7 +79,25 @@ bool EscPage::isSynchOrOneShotAvailable() case SetupWizard::CONTROLLER_NANO: case SetupWizard::CONTROLLER_CC: case SetupWizard::CONTROLLER_CC3D: - available = getWizard()->getInputType() != SetupWizard::INPUT_PWM; + switch (getWizard()->getVehicleType()) { + case SetupWizard::VEHICLE_MULTI: + switch (getWizard()->getVehicleSubType()) { + case SetupWizard::MULTI_ROTOR_TRI_Y: + case SetupWizard::MULTI_ROTOR_QUAD_X: + case SetupWizard::MULTI_ROTOR_QUAD_H: + case SetupWizard::MULTI_ROTOR_QUAD_PLUS: + available = getWizard()->getInputType() != SetupWizard::INPUT_PWM; + break; + default: + available = false; + break; + } + break; + default: + break; + } + case SetupWizard::CONTROLLER_REVO: + available = true; break; default: break; From e8399c9c57d177bd3c0a7e467ac2a6d54024e7ff Mon Sep 17 00:00:00 2001 From: Fredrik Arvidsson Date: Mon, 14 Sep 2015 23:28:11 +0200 Subject: [PATCH 2/2] LP-70 Fixed bug. --- ground/gcs/src/plugins/setupwizard/pages/escpage.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/ground/gcs/src/plugins/setupwizard/pages/escpage.cpp b/ground/gcs/src/plugins/setupwizard/pages/escpage.cpp index 20be547ab..fe1e85654 100644 --- a/ground/gcs/src/plugins/setupwizard/pages/escpage.cpp +++ b/ground/gcs/src/plugins/setupwizard/pages/escpage.cpp @@ -96,6 +96,7 @@ bool EscPage::isSynchOrOneShotAvailable() default: break; } + break; case SetupWizard::CONTROLLER_REVO: available = true; break;