From 68da0d20a2b61f809d993347b3c88ae13343bb80 Mon Sep 17 00:00:00 2001 From: samguns Date: Tue, 26 May 2015 23:09:25 +0800 Subject: [PATCH] REVONANO A workaround for freeze in setup wizard --- .../openpilotgcs/src/plugins/setupwizard/setupwizard.cpp | 5 ++++- .../src/plugins/uploader/uploadergadgetwidget.cpp | 8 ++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp b/ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp index 4568c679f..517c65f3e 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp +++ b/ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp @@ -96,10 +96,13 @@ int SetupWizard::nextId() const { switch (getControllerType()) { case CONTROLLER_REVO: - case CONTROLLER_NANO: case CONTROLLER_DISCOVERYF4: return PAGE_INPUT; + case CONTROLLER_NANO: + reboot(); + return PAGE_INPUT; + case CONTROLLER_OPLINK: default: return PAGE_NOTYETIMPLEMENTED; diff --git a/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp b/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp index ba8eebf9c..e218704b1 100644 --- a/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp +++ b/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp @@ -1008,6 +1008,14 @@ void UploaderGadgetWidget::startAutoUpdate() void UploaderGadgetWidget::startAutoUpdateErase() { startAutoUpdate(true); + + ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance(); + UAVObjectUtilManager *utilMngr = pm->getObject(); + int id = utilMngr->getBoardModel(); + + if (id == 0x905) { + systemReset(); + } } void UploaderGadgetWidget::startAutoUpdate(bool erase)