rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00
Code Issues Releases Activity

Uploader gadget: on Reset, go through a board detection too, since it seems to be necessary to get a proper reboot of the ARHS too. Makes reboot over telemetry link work too.

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2345 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
edouard 2011-01-07 20:54:34 +00:00 committed by edouard
parent c4b6b16181
commit 05de5492d9
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ground/src/plugins/uploader/uploadergadgetwidget.cpp
View File

@ -210,13 +210,6 @@ void UploaderGadgetWidget::goToBootloader(UAVObject* callerObj, bool success)
ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance(); ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
disconnect(fwIAP, SIGNAL(transactionCompleted(UAVObject*,bool)),this,SLOT(goToBootloader(UAVObject*, bool))); disconnect(fwIAP, SIGNAL(transactionCompleted(UAVObject*,bool)),this,SLOT(goToBootloader(UAVObject*, bool)));
if (resetOnly) {
resetOnly=false;
delay::msleep(3500);
systemBoot();
break;
}
currentStep = IAP_STATE_BOOTLOADER; currentStep = IAP_STATE_BOOTLOADER;
// Tell the mainboard to get into bootloader state: // Tell the mainboard to get into bootloader state:
@ -258,6 +251,13 @@ void UploaderGadgetWidget::goToBootloader(UAVObject* callerObj, bool success)
*/ */
m_config->telemetryLink->setEnabled(false); m_config->telemetryLink->setEnabled(false);
m_config->rescueButton->setEnabled(false); m_config->rescueButton->setEnabled(false);
if (resetOnly) {
resetOnly=false;
delay::msleep(3500);
systemBoot();
break;
}
} }
break; break;
case IAP_STATE_BOOTLOADER: case IAP_STATE_BOOTLOADER: