mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-02-05 21:52:10 +01:00
Improve behaviour of Uploader gadget whenever the board does not manage to get into bootloader mode.
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@3075 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
parent
662a3e5cc8
commit
332cafa8b8
@ -148,6 +148,8 @@ void UploaderGadgetWidget::goToBootloader(UAVObject* callerObj, bool success)
|
|||||||
// otherwise we won't find it when we stop the board.
|
// otherwise we won't find it when we stop the board.
|
||||||
// The board is running, send the 1st IAP Reset order:
|
// The board is running, send the 1st IAP Reset order:
|
||||||
fwIAP->getField("Command")->setValue("1122");
|
fwIAP->getField("Command")->setValue("1122");
|
||||||
|
fwIAP->getField("BoardRevision")->setDouble(0);
|
||||||
|
fwIAP->getField("BoardType")->setDouble(0);
|
||||||
connect(fwIAP,SIGNAL(transactionCompleted(UAVObject*,bool)),this,SLOT(goToBootloader(UAVObject*, bool)));
|
connect(fwIAP,SIGNAL(transactionCompleted(UAVObject*,bool)),this,SLOT(goToBootloader(UAVObject*, bool)));
|
||||||
currentStep = IAP_STATE_STEP_1;
|
currentStep = IAP_STATE_STEP_1;
|
||||||
clearLog();
|
clearLog();
|
||||||
@ -226,6 +228,8 @@ void UploaderGadgetWidget::goToBootloader(UAVObject* callerObj, bool success)
|
|||||||
delete dfu;
|
delete dfu;
|
||||||
dfu = NULL;
|
dfu = NULL;
|
||||||
cm->resumePolling();
|
cm->resumePolling();
|
||||||
|
currentStep = IAP_STATE_READY;
|
||||||
|
m_config->boardStatus->setText("Bootloader?");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
dfu->AbortOperation();
|
dfu->AbortOperation();
|
||||||
@ -235,6 +239,8 @@ void UploaderGadgetWidget::goToBootloader(UAVObject* callerObj, bool success)
|
|||||||
delete dfu;
|
delete dfu;
|
||||||
dfu = NULL;
|
dfu = NULL;
|
||||||
cm->resumePolling();
|
cm->resumePolling();
|
||||||
|
currentStep = IAP_STATE_READY;
|
||||||
|
m_config->boardStatus->setText("Bootloader?");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
//dfu.StatusRequest();
|
//dfu.StatusRequest();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user