Commit fd30f6ce authored by Don Gagne's avatar Don Gagne

parent 5ea49f8f
......@@ -28,8 +28,6 @@ SetupPage {
pageName: qsTr("Firmware")
showAdvanced: activeVehicle && activeVehicle.apmFirmware
signal cancelDialog
Component {
id: firmwarePageComponent
......@@ -135,15 +133,20 @@ SetupPage {
} else {
// We end up here when we detect a board plugged in after we've started upgrade
statusTextArea.append(highlightPrefix + qsTr("Found device") + highlightSuffix + ": " + controller.boardType)
if (controller.pixhawkBoard || controller.px4FlowBoard) {
if (controller.px4FlowBoard) {
mainWindow.showComponentDialog(pixhawkFirmwareSelectDialogComponent, title, mainWindow.showDialogDefaultWidth, StandardButton.Ok | StandardButton.Cancel)
}
}
}
onBootloaderFound: {
if (controller.pixhawkBoard) {
mainWindow.showComponentDialog(pixhawkFirmwareSelectDialogComponent, title, mainWindow.showDialogDefaultWidth, StandardButton.Ok | StandardButton.Cancel)
}
}
onError: {
statusTextArea.append(flashFailText)
firmwarePage.cancelDialog()
}
}
......@@ -191,6 +194,11 @@ SetupPage {
updatePX4VersionDisplay()
}
Connections {
target: controller
onError: reject()
}
function accept() {
if (_singleFirmwareMode) {
controller.flashSingleFirmwareMode(controller.selectedFirmwareBuildType)
......
......@@ -245,6 +245,8 @@ void FirmwareUpgradeController::_foundBootloader(int bootloaderVersion, int boar
if (_rgManifestFirmwareInfo.count()) {
_buildAPMFirmwareNames();
}
emit bootloaderFound();
}
......
......@@ -156,6 +156,7 @@ public:
signals:
void boardFound (void);
void bootloaderFound (void);
void noBoardFound (void);
void boardGone (void);
void flashComplete (void);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment