Browse Source

Merge pull request #4086 from bkueng/fix_px4_version_comparison

px4firmwareplugin: fix minimum required version comparison
QGC4.4
Don Gagne 9 years ago committed by GitHub
parent
commit
03b0274980
  1. 10
      src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc

10
src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc

@ -459,7 +459,15 @@ void PX4FirmwarePlugin::_handleAutopilotVersion(Vehicle* vehicle, mavlink_messag @@ -459,7 +459,15 @@ void PX4FirmwarePlugin::_handleAutopilotVersion(Vehicle* vehicle, mavlink_messag
minorVersion = (version.flight_sw_version >> (8*2)) & 0xFF;
patchVersion = (version.flight_sw_version >> (8*1)) & 0xFF;
notifyUser = majorVersion < supportedMajorVersion || minorVersion < supportedMinorVersion || patchVersion < supportedPatchVersion;
if (majorVersion < supportedMajorVersion) {
notifyUser = true;
} else if (majorVersion == supportedMajorVersion) {
if (minorVersion < supportedMinorVersion) {
notifyUser = true;
} else if (minorVersion == supportedMinorVersion) {
notifyUser = patchVersion < supportedPatchVersion;
}
}
} else {
notifyUser = true;
}

Loading…
Cancel
Save