Browse Source

Merge pull request #8377 from DonLakeFlyer/StableFWCheck

Vehicle only performs stable fw version check one time
QGC4.4
Don Gagne 5 years ago committed by GitHub
parent
commit
08a7006a8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      src/FirmwarePlugin/FirmwarePlugin.cc
  2. 3
      src/Vehicle/Vehicle.cc
  3. 1
      src/Vehicle/Vehicle.h

8
src/FirmwarePlugin/FirmwarePlugin.cc

@ -824,6 +824,14 @@ void FirmwarePlugin::checkIfIsLatestStable(Vehicle* vehicle) @@ -824,6 +824,14 @@ void FirmwarePlugin::checkIfIsLatestStable(Vehicle* vehicle)
_versionFileDownloadFinished(remoteFile, localFile, vehicle);
sender()->deleteLater();
});
connect(
downloader,
&QGCFileDownload::error,
this,
[=](QString errorMsg) {
qCDebug(FirmwarePluginLog) << "Failed to download the latest fw version file. Error: " << errorMsg;
downloader->deleteLater();
});
downloader->download(versionFile);
}

3
src/Vehicle/Vehicle.cc

@ -1343,7 +1343,8 @@ void Vehicle::_handleAutopilotVersion(LinkInterface *link, mavlink_message_t& me @@ -1343,7 +1343,8 @@ void Vehicle::_handleAutopilotVersion(LinkInterface *link, mavlink_message_t& me
nullStr[8] = 0;
_gitHash = nullStr;
}
if (_toolbox->corePlugin()->options()->checkFirmwareVersion()) {
if (_toolbox->corePlugin()->options()->checkFirmwareVersion() && !_checkLatestStableFWDone) {
_checkLatestStableFWDone = true;
_firmwarePlugin->checkIfIsLatestStable(this);
}
emit gitHashChanged(_gitHash);

1
src/Vehicle/Vehicle.h

@ -1504,6 +1504,7 @@ private: @@ -1504,6 +1504,7 @@ private:
bool _isROIEnabled = false;
Joystick* _activeJoystick = nullptr;
bool _checkLatestStableFWDone = false;
int _firmwareMajorVersion;
int _firmwareMinorVersion;
int _firmwarePatchVersion;

Loading…
Cancel
Save