diff --git a/src/Vehicle/Vehicle.cc b/src/Vehicle/Vehicle.cc index 791650d862670e3418c1d8aa1414160c8318585b..0c5d2b84a9c8f2ba3b8257d31aec235cb31e5948 100644 --- a/src/Vehicle/Vehicle.cc +++ b/src/Vehicle/Vehicle.cc @@ -75,6 +75,7 @@ const char* Vehicle::_distanceToHomeFactName = "distanceToHome"; const char* Vehicle::_headingToHomeFactName = "headingToHome"; const char* Vehicle::_distanceToGCSFactName = "distanceToGCS"; const char* Vehicle::_hobbsFactName = "hobbs"; +const char* Vehicle::_throttlePctFactName = "throttlePct"; const char* Vehicle::_gpsFactGroupName = "gps"; const char* Vehicle::_battery1FactGroupName = "battery"; @@ -204,6 +205,7 @@ Vehicle::Vehicle(LinkInterface* link, , _headingToHomeFact (0, _headingToHomeFactName, FactMetaData::valueTypeDouble) , _distanceToGCSFact (0, _distanceToGCSFactName, FactMetaData::valueTypeDouble) , _hobbsFact (0, _hobbsFactName, FactMetaData::valueTypeString) + , _throttlePctFact (0, _throttlePctFactName, FactMetaData::valueTypeUint16) , _gpsFactGroup(this) , _battery1FactGroup(this) , _battery2FactGroup(this) @@ -407,6 +409,7 @@ Vehicle::Vehicle(MAV_AUTOPILOT firmwareType, , _headingToHomeFact (0, _headingToHomeFactName, FactMetaData::valueTypeDouble) , _distanceToGCSFact (0, _distanceToGCSFactName, FactMetaData::valueTypeDouble) , _hobbsFact (0, _hobbsFactName, FactMetaData::valueTypeString) + , _throttlePctFact (0, _throttlePctFactName, FactMetaData::valueTypeUint16) , _gpsFactGroup(this) , _battery1FactGroup(this) , _battery2FactGroup(this) @@ -480,6 +483,7 @@ void Vehicle::_commonInit(void) _addFact(&_distanceToHomeFact, _distanceToHomeFactName); _addFact(&_headingToHomeFact, _headingToHomeFactName); _addFact(&_distanceToGCSFact, _distanceToGCSFactName); + _addFact(&_throttlePctFact, _throttlePctFactName); _hobbsFact.setRawValue(QVariant(QString("0000:00:00"))); _addFact(&_hobbsFact, _hobbsFactName); diff --git a/src/Vehicle/Vehicle.h b/src/Vehicle/Vehicle.h index bc194260f31377b0efca82821c91e1b9e982e47f..eb00e19faad6d1db473dae3854335d1e163ac2b3 100644 --- a/src/Vehicle/Vehicle.h +++ b/src/Vehicle/Vehicle.h @@ -667,6 +667,7 @@ public: Q_PROPERTY(Fact* headingToHome READ headingToHome CONSTANT) Q_PROPERTY(Fact* distanceToGCS READ distanceToGCS CONSTANT) Q_PROPERTY(Fact* hobbs READ hobbs CONSTANT) + Q_PROPERTY(Fact* throttlePct READ throttlePct CONSTANT) Q_PROPERTY(FactGroup* gps READ gpsFactGroup CONSTANT) Q_PROPERTY(FactGroup* battery READ battery1FactGroup CONSTANT) @@ -963,6 +964,7 @@ public: Fact* headingToHome (void) { return &_headingToHomeFact; } Fact* distanceToGCS (void) { return &_distanceToGCSFact; } Fact* hobbs (void) { return &_hobbsFact; } + Fact* throttlePct (void) { return &_throttlePctFact; } FactGroup* gpsFactGroup (void) { return &_gpsFactGroup; } FactGroup* battery1FactGroup (void) { return &_battery1FactGroup; } @@ -1502,6 +1504,7 @@ private: Fact _headingToHomeFact; Fact _distanceToGCSFact; Fact _hobbsFact; + Fact _throttlePctFact; VehicleGPSFactGroup _gpsFactGroup; VehicleBatteryFactGroup _battery1FactGroup; @@ -1531,6 +1534,7 @@ private: static const char* _headingToHomeFactName; static const char* _distanceToGCSFactName; static const char* _hobbsFactName; + static const char* _throttlePctFactName; static const char* _gpsFactGroupName; static const char* _battery1FactGroupName; diff --git a/src/Vehicle/VehicleFact.json b/src/Vehicle/VehicleFact.json index 07233e5e30e43fe51c0bcb46b2037afbeadfde81..ce0b5d391e9f57a6b6b25602a12aced568df0b5c 100644 --- a/src/Vehicle/VehicleFact.json +++ b/src/Vehicle/VehicleFact.json @@ -114,5 +114,11 @@ "name": "hobbs", "shortDescription": "Hobbs Meter", "type": "string" +}, +{ + "name": "throttlePct", + "shortDescription": "Throttle %", + "type": "uint16", + "units": "%" } ]