Browse Source

XPlane sim link: Fix ground truth reporting

QGC4.4
Lorenz Meier 11 years ago
parent
commit
99d187a41d
  1. 7
      src/comm/QGCXPlaneLink.cc
  2. 1
      src/comm/QGCXPlaneLink.h

7
src/comm/QGCXPlaneLink.cc

@ -55,6 +55,7 @@ QGCXPlaneLink::QGCXPlaneLink(UASInterface* mav, QString remoteHost, QHostAddress
simUpdateLast(QGC::groundTimeMilliseconds()), simUpdateLast(QGC::groundTimeMilliseconds()),
simUpdateFirst(0), simUpdateFirst(0),
simUpdateLastText(QGC::groundTimeMilliseconds()), simUpdateLastText(QGC::groundTimeMilliseconds()),
simUpdateLastGroundTruth(QGC::groundTimeMilliseconds()),
simUpdateHz(0), simUpdateHz(0),
_sensorHilEnabled(true) _sensorHilEnabled(true)
{ {
@ -714,13 +715,13 @@ void QGCXPlaneLink::readBytes()
} }
// Limit ground truth to 25 Hz // Limit ground truth to 25 Hz
if (QGC::groundTimeMilliseconds() - simUpdateLast > 40) { if (QGC::groundTimeMilliseconds() - simUpdateLastGroundTruth > 40) {
emit hilGroundTruthChanged(QGC::groundTimeUsecs(), roll, pitch, yaw, rollspeed, emit hilGroundTruthChanged(QGC::groundTimeUsecs(), roll, pitch, yaw, rollspeed,
pitchspeed, yawspeed, lat, lon, alt, pitchspeed, yawspeed, lat, lon, alt,
vx, vy, vz, ind_airspeed, true_airspeed, xacc, yacc, zacc); vx, vy, vz, ind_airspeed, true_airspeed, xacc, yacc, zacc);
}
simUpdateLast = QGC::groundTimeMilliseconds(); simUpdateLastGroundTruth = QGC::groundTimeMilliseconds();
}
} }
if (!oldConnectionState && xPlaneConnected) if (!oldConnectionState && xPlaneConnected)

1
src/comm/QGCXPlaneLink.h

@ -207,6 +207,7 @@ protected:
quint64 simUpdateLast; quint64 simUpdateLast;
quint64 simUpdateFirst; quint64 simUpdateFirst;
quint64 simUpdateLastText; quint64 simUpdateLastText;
quint64 simUpdateLastGroundTruth;
float simUpdateHz; float simUpdateHz;
bool _sensorHilEnabled; bool _sensorHilEnabled;

Loading…
Cancel
Save