rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-12 02:54:15 +01:00
Code Issues Releases Activity

REVONANO A workaround for freeze in setup wizard

Browse Source
This commit is contained in:
samguns 2015-05-26 23:09:25 +08:00
parent 03cef4ee89
commit 68da0d20a2
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp
View File

@ -96,10 +96,13 @@ int SetupWizard::nextId() const
{ {
switch (getControllerType()) { switch (getControllerType()) {
case CONTROLLER_REVO: case CONTROLLER_REVO:
case CONTROLLER_NANO:
case CONTROLLER_DISCOVERYF4: case CONTROLLER_DISCOVERYF4:
return PAGE_INPUT; return PAGE_INPUT;
case CONTROLLER_NANO:
reboot();
return PAGE_INPUT;
case CONTROLLER_OPLINK: case CONTROLLER_OPLINK:
default: default:
return PAGE_NOTYETIMPLEMENTED; return PAGE_NOTYETIMPLEMENTED;

8
ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
View File

@ -1008,6 +1008,14 @@ void UploaderGadgetWidget::startAutoUpdate()
void UploaderGadgetWidget::startAutoUpdateErase() void UploaderGadgetWidget::startAutoUpdateErase()
{ {
startAutoUpdate(true); startAutoUpdate(true);
ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
UAVObjectUtilManager *utilMngr = pm->getObject<UAVObjectUtilManager>();
int id = utilMngr->getBoardModel();
if (id == 0x905) {
systemReset();
}
} }
void UploaderGadgetWidget::startAutoUpdate(bool erase) void UploaderGadgetWidget::startAutoUpdate(bool erase)