Commit 2509d695 authored by Don Gagne's avatar Don Gagne

parent c35c0fe3
......@@ -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);
......
......@@ -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;
......
......@@ -114,5 +114,11 @@
"name": "hobbs",
"shortDescription": "Hobbs Meter",
"type": "string"
},
{
"name": "throttlePct",
"shortDescription": "Throttle %",
"type": "uint16",
"units": "%"
}
]
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment