Merge pull request #4086 from bkueng/fix_px4_version_comparison

px4firmwareplugin: fix minimum required version comparison

Merge pull request #4086 from bkueng/fix_px4_version_comparison
px4firmwareplugin: fix minimum required version comparison
03b02749 · Don Gagne · GitHub · d24e93d6 · 4165c09f · 03b02749
Commit 03b02749 authored Sep 30, 2016 by Don Gagne Committed by GitHub Sep 30, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

PX4FirmwarePlugin.cc src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc +9 -1

No files found.
--- a/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc
+++ b/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc
@@ -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;
        }