From 2e552b3af109a5a09a70314f819ab1e8488d74e4 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Fri, 15 Apr 2016 13:03:19 -0700 Subject: [PATCH] Add Vehicle::versionNotSetValue --- src/FirmwarePlugin/APM/APMFirmwarePlugin.cc | 2 +- src/Vehicle/Vehicle.cc | 12 ++++++------ src/Vehicle/Vehicle.h | 1 + 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/FirmwarePlugin/APM/APMFirmwarePlugin.cc b/src/FirmwarePlugin/APM/APMFirmwarePlugin.cc index 188e7f62d..f4a0015ce 100644 --- a/src/FirmwarePlugin/APM/APMFirmwarePlugin.cc +++ b/src/FirmwarePlugin/APM/APMFirmwarePlugin.cc @@ -313,7 +313,7 @@ bool APMFirmwarePlugin::_handleStatusText(Vehicle* vehicle, mavlink_message_t* m mavlink_statustext_t statusText; mavlink_msg_statustext_decode(message, &statusText); - if (vehicle->firmwareMajorVersion() == -1 || statusText.severity < MAV_SEVERITY_NOTICE) { + if (vehicle->firmwareMajorVersion() == Vehicle::versionNotSetValue || statusText.severity < MAV_SEVERITY_NOTICE) { messageText = _getMessageText(message); qCDebug(APMFirmwarePluginLog) << messageText; diff --git a/src/Vehicle/Vehicle.cc b/src/Vehicle/Vehicle.cc index 0994aa23a..594a80ee7 100644 --- a/src/Vehicle/Vehicle.cc +++ b/src/Vehicle/Vehicle.cc @@ -121,9 +121,9 @@ Vehicle::Vehicle(LinkInterface* link, , _messageSeq(0) , _compID(0) , _heardFrom(false) - , _firmwareMajorVersion(-1) - , _firmwareMinorVersion(-1) - , _firmwarePatchVersion(-1) + , _firmwareMajorVersion(versionNotSetValue) + , _firmwareMinorVersion(versionNotSetValue) + , _firmwarePatchVersion(versionNotSetValue) , _rollFact (0, _rollFactName, FactMetaData::valueTypeDouble) , _pitchFact (0, _pitchFactName, FactMetaData::valueTypeDouble) , _headingFact (0, _headingFactName, FactMetaData::valueTypeDouble) @@ -291,9 +291,9 @@ Vehicle::Vehicle(QObject* parent) , _messageSeq(0) , _compID(0) , _heardFrom(false) - , _firmwareMajorVersion(-1) - , _firmwareMinorVersion(-1) - , _firmwarePatchVersion(-1) + , _firmwareMajorVersion(versionNotSetValue) + , _firmwareMinorVersion(versionNotSetValue) + , _firmwarePatchVersion(versionNotSetValue) , _rollFact (0, _rollFactName, FactMetaData::valueTypeDouble) , _pitchFact (0, _pitchFactName, FactMetaData::valueTypeDouble) , _headingFact (0, _headingFactName, FactMetaData::valueTypeDouble) diff --git a/src/Vehicle/Vehicle.h b/src/Vehicle/Vehicle.h index a739c6f4e..8880214a4 100644 --- a/src/Vehicle/Vehicle.h +++ b/src/Vehicle/Vehicle.h @@ -524,6 +524,7 @@ public: int firmwareMinorVersion(void) const { return _firmwareMinorVersion; } int firmwarePatchVersion(void) const { return _firmwarePatchVersion; } void setFirmwareVersion(int majorVersion, int minorVersion, int patchVersion); + static const int versionNotSetValue = -1; public slots: void setLatitude(double latitude); -- 2.22.0