|
|
@ -680,6 +680,8 @@ void Vehicle::_handleGpsRawInt(mavlink_message_t& message) |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
_gpsFactGroup.lat()->setRawValue(gpsRawInt.lat * 1e-7); |
|
|
|
|
|
|
|
_gpsFactGroup.lon()->setRawValue(gpsRawInt.lon * 1e-7); |
|
|
|
_gpsFactGroup.count()->setRawValue(gpsRawInt.satellites_visible == 255 ? 0 : gpsRawInt.satellites_visible); |
|
|
|
_gpsFactGroup.count()->setRawValue(gpsRawInt.satellites_visible == 255 ? 0 : gpsRawInt.satellites_visible); |
|
|
|
_gpsFactGroup.hdop()->setRawValue(gpsRawInt.eph == UINT16_MAX ? std::numeric_limits<double>::quiet_NaN() : gpsRawInt.eph / 100.0); |
|
|
|
_gpsFactGroup.hdop()->setRawValue(gpsRawInt.eph == UINT16_MAX ? std::numeric_limits<double>::quiet_NaN() : gpsRawInt.eph / 100.0); |
|
|
|
_gpsFactGroup.vdop()->setRawValue(gpsRawInt.epv == UINT16_MAX ? std::numeric_limits<double>::quiet_NaN() : gpsRawInt.epv / 100.0); |
|
|
|
_gpsFactGroup.vdop()->setRawValue(gpsRawInt.epv == UINT16_MAX ? std::numeric_limits<double>::quiet_NaN() : gpsRawInt.epv / 100.0); |
|
|
@ -2458,6 +2460,8 @@ void Vehicle::triggerCamera(void) |
|
|
|
1.0); // test shot flag
|
|
|
|
1.0); // test shot flag
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const char* VehicleGPSFactGroup::_latFactName = "lat"; |
|
|
|
|
|
|
|
const char* VehicleGPSFactGroup::_lonFactName = "lon"; |
|
|
|
const char* VehicleGPSFactGroup::_hdopFactName = "hdop"; |
|
|
|
const char* VehicleGPSFactGroup::_hdopFactName = "hdop"; |
|
|
|
const char* VehicleGPSFactGroup::_vdopFactName = "vdop"; |
|
|
|
const char* VehicleGPSFactGroup::_vdopFactName = "vdop"; |
|
|
|
const char* VehicleGPSFactGroup::_courseOverGroundFactName = "courseOverGround"; |
|
|
|
const char* VehicleGPSFactGroup::_courseOverGroundFactName = "courseOverGround"; |
|
|
@ -2466,18 +2470,24 @@ const char* VehicleGPSFactGroup::_lockFactName = "lock"; |
|
|
|
|
|
|
|
|
|
|
|
VehicleGPSFactGroup::VehicleGPSFactGroup(QObject* parent) |
|
|
|
VehicleGPSFactGroup::VehicleGPSFactGroup(QObject* parent) |
|
|
|
: FactGroup(1000, ":/json/Vehicle/GPSFact.json", parent) |
|
|
|
: FactGroup(1000, ":/json/Vehicle/GPSFact.json", parent) |
|
|
|
|
|
|
|
, _latFact (0, _latFactName, FactMetaData::valueTypeDouble) |
|
|
|
|
|
|
|
, _lonFact (0, _lonFactName, FactMetaData::valueTypeDouble) |
|
|
|
, _hdopFact (0, _hdopFactName, FactMetaData::valueTypeDouble) |
|
|
|
, _hdopFact (0, _hdopFactName, FactMetaData::valueTypeDouble) |
|
|
|
, _vdopFact (0, _vdopFactName, FactMetaData::valueTypeDouble) |
|
|
|
, _vdopFact (0, _vdopFactName, FactMetaData::valueTypeDouble) |
|
|
|
, _courseOverGroundFact (0, _courseOverGroundFactName, FactMetaData::valueTypeDouble) |
|
|
|
, _courseOverGroundFact (0, _courseOverGroundFactName, FactMetaData::valueTypeDouble) |
|
|
|
, _countFact (0, _countFactName, FactMetaData::valueTypeInt32) |
|
|
|
, _countFact (0, _countFactName, FactMetaData::valueTypeInt32) |
|
|
|
, _lockFact (0, _lockFactName, FactMetaData::valueTypeInt32) |
|
|
|
, _lockFact (0, _lockFactName, FactMetaData::valueTypeInt32) |
|
|
|
{ |
|
|
|
{ |
|
|
|
|
|
|
|
_addFact(&_latFact, _latFactName); |
|
|
|
|
|
|
|
_addFact(&_lonFact, _lonFactName); |
|
|
|
_addFact(&_hdopFact, _hdopFactName); |
|
|
|
_addFact(&_hdopFact, _hdopFactName); |
|
|
|
_addFact(&_vdopFact, _vdopFactName); |
|
|
|
_addFact(&_vdopFact, _vdopFactName); |
|
|
|
_addFact(&_courseOverGroundFact, _courseOverGroundFactName); |
|
|
|
_addFact(&_courseOverGroundFact, _courseOverGroundFactName); |
|
|
|
_addFact(&_lockFact, _lockFactName); |
|
|
|
_addFact(&_lockFact, _lockFactName); |
|
|
|
_addFact(&_countFact, _countFactName); |
|
|
|
_addFact(&_countFact, _countFactName); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
_latFact.setRawValue(std::numeric_limits<float>::quiet_NaN()); |
|
|
|
|
|
|
|
_lonFact.setRawValue(std::numeric_limits<float>::quiet_NaN()); |
|
|
|
_hdopFact.setRawValue(std::numeric_limits<float>::quiet_NaN()); |
|
|
|
_hdopFact.setRawValue(std::numeric_limits<float>::quiet_NaN()); |
|
|
|
_vdopFact.setRawValue(std::numeric_limits<float>::quiet_NaN()); |
|
|
|
_vdopFact.setRawValue(std::numeric_limits<float>::quiet_NaN()); |
|
|
|
_courseOverGroundFact.setRawValue(std::numeric_limits<float>::quiet_NaN()); |
|
|
|
_courseOverGroundFact.setRawValue(std::numeric_limits<float>::quiet_NaN()); |
|
|
|