Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Flow custom flash #8927

Merged
merged 1 commit into from Jul 25, 2020
Merged

Fix Flow custom flash #8927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 7 additions & 18 deletions src/VehicleSetup/FirmwareUpgrade.qml
View file
Open in desktop
Expand Up @@ -123,35 +123,25 @@ SetupPage {
statusTextArea.append(qgcUnplugText2)

var availableDevices = controller.availableBoardsName()
if(availableDevices.length > 1) {
if (availableDevices.length > 1) {
statusTextArea.append(highlightPrefix + qsTr("Multiple devices detected! Remove all detected devices to perform the firmware upgrade."))
statusTextArea.append(qsTr("Detected [%1]: ").arg(availableDevices.length) + availableDevices.join(", "))
}
if(QGroundControl.multiVehicleManager.activeVehicle) {
if (QGroundControl.multiVehicleManager.activeVehicle) {
QGroundControl.multiVehicleManager.activeVehicle.autoDisconnect = true
}
} 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.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)
}
onBootloaderFound: mainWindow.showComponentDialog(firmwareSelectDialogComponent, title, mainWindow.showDialogDefaultWidth, StandardButton.Ok | StandardButton.Cancel)
onError: statusTextArea.append(flashFailText)
}

Component {
id: pixhawkFirmwareSelectDialogComponent
id: firmwareSelectDialogComponent

QGCViewDialog {
id: pixhawkFirmwareSelectDialog
Expand Down Expand Up @@ -463,7 +453,6 @@ SetupPage {
visible: showFirmwareTypeSelection
textRole: "text"
model: _singleFirmwareMode ? singleFirmwareModeTypeList : (px4Flow ? px4FlowTypeList : firmwareBuildTypeList)
currentIndex: controller.selectedFirmwareBuildType

onActivated: {
controller.selectedFirmwareBuildType = model.get(index).firmwareType
Expand All @@ -480,7 +469,7 @@ SetupPage {
qsTr("It is only intended for DEVELOPERS. ") +
qsTr("Run bench tests without props first. ") +
qsTr("Do NOT fly this without additional safety precautions. ") +
qsTr("Follow the mailing list actively when using it.")
qsTr("Follow the forums actively when using it.")
} else {
firmwareWarningMessageVisible = false
}
Expand All @@ -497,7 +486,7 @@ SetupPage {
} // Column
} // QGCFLickable
} // QGCViewDialog
} // Component - pixhawkFirmwareSelectDialogComponent
} // Component - firmwareSelectDialogComponent

Component {
id: firmwareWarningDialog
Expand Down
7 changes: 5 additions & 2 deletions src/VehicleSetup/FirmwareUpgradeController.cc
View file
Open in desktop
Expand Up @@ -62,7 +62,7 @@ FirmwareUpgradeController::FirmwareUpgradeController(void)
, _downloadManager (nullptr)
, _downloadNetworkReply (nullptr)
, _statusLog (nullptr)
, _selectedFirmwareBuildType (StableFirmware)
, _selectedFirmwareBuildType (StableFirmware)
, _image (nullptr)
, _apmBoardDescriptionReplaceText ("<APMBoardDescription>")
, _apmChibiOSSetting (qgcApp()->toolbox()->settingsManager()->firmwareUpgradeSettings()->apmChibiOS())
Expand Down Expand Up @@ -738,14 +738,17 @@ void FirmwareUpgradeController::setSelectedFirmwareBuildType(FirmwareBuildType_t
void FirmwareUpgradeController::_buildAPMFirmwareNames(void)
{
#if !defined(NO_ARDUPILOT_DIALECT)

bool chibios = _apmChibiOSSetting->rawValue().toInt() == 0;
FirmwareVehicleType_t vehicleType = static_cast<FirmwareVehicleType_t>(_apmVehicleTypeSetting->rawValue().toInt());
QString boardDescription = _boardInfo.description();
quint16 boardVID = _boardInfo.vendorIdentifier();
quint16 boardPID = _boardInfo.productIdentifier();
uint32_t rawBoardId = _bootloaderBoardID == Bootloader::boardIDPX4FMUV3 ? Bootloader::boardIDPX4FMUV2 : _bootloaderBoardID;

if (_boardType == QGCSerialPortInfo::BoardTypePX4Flow) {
return;
}

qCDebug(FirmwareUpgradeLog) << QStringLiteral("_buildAPMFirmwareNames description(%1) vid(%2/0x%3) pid(%4/0x%5)").arg(boardDescription).arg(boardVID).arg(boardVID, 1, 16).arg(boardPID).arg(boardPID, 1, 16);

_apmFirmwareNames.clear();
Expand Down