Browse Source

Merge pull request #7550 from DonLakeFlyer/APJFileDialog

Firmware custom flash: Add .apj file picker support
QGC4.4
Don Gagne 6 years ago committed by GitHub
parent
commit
a72cef6271
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      ChangeLog.md
  2. 2
      src/VehicleSetup/FirmwareUpgradeController.cc

3
ChangeLog.md

@ -8,6 +8,9 @@ Note: This file only contains high level features or important fixes.
* Major rewrite and bug fix pass through Structure Scan. Previous version had such bad problems that it can no longer be supported. Plans with Structure Scan will need to be recreated. New QGC will not load old Structure Scan plans. * Major rewrite and bug fix pass through Structure Scan. Previous version had such bad problems that it can no longer be supported. Plans with Structure Scan will need to be recreated. New QGC will not load old Structure Scan plans.
### 3.5.4 - Not yet released
* Add .apj file selection support to custom firmware flash
### 3.5.3 - Stable ### 3.5.3 - Stable
* Change minimum RTK Survey-In limit to 0.01 meters * Change minimum RTK Survey-In limit to 0.01 meters
* Change Windows driver detection logic * Change Windows driver detection logic

2
src/VehicleSetup/FirmwareUpgradeController.cc

@ -586,7 +586,7 @@ void FirmwareUpgradeController::_getFirmwareFile(FirmwareIdentifier firmwareId)
_firmwareFilename = QGCQFileDialog::getOpenFileName(nullptr, // Parent to main window _firmwareFilename = QGCQFileDialog::getOpenFileName(nullptr, // Parent to main window
tr("Select Firmware File"), // Dialog Caption tr("Select Firmware File"), // Dialog Caption
QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation), // Initial directory QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation), // Initial directory
tr("Firmware Files (*.px4 *.bin *.ihx)")); // File filter tr("Firmware Files (*.px4 *.apj *.bin *.ihx)")); // File filter
} else { } else {
if (prgFirmware->contains(firmwareId)) { if (prgFirmware->contains(firmwareId)) {
_firmwareFilename = prgFirmware->value(firmwareId); _firmwareFilename = prgFirmware->value(firmwareId);

Loading…
Cancel
Save