Browse Source

fix code style

QGC4.4
Bart Slinger 9 years ago
parent
commit
0f035389f9
  1. 208
      src/comm/QGCXPlaneLink.cc
  2. 29
      src/comm/QGCXPlaneLink.h
  3. 375
      src/uas/UAS.cc
  4. 158
      src/uas/UAS.h
  5. 11
      src/ui/QGCHilXPlaneConfiguration.cc

208
src/comm/QGCXPlaneLink.cc

@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
#include "QGCMessageBox.h"
#include "HomePositionManager.h"
QGCXPlaneLink::QGCXPlaneLink(Vehicle* vehicle, QString remoteHost, QHostAddress localHost, quint16 localPort) :
QGCXPlaneLink::QGCXPlaneLink(Vehicle *vehicle, QString remoteHost, QHostAddress localHost, quint16 localPort) :
_vehicle(vehicle),
remoteHost(QHostAddress("127.0.0.1")),
remotePort(49000),
@ -73,7 +73,8 @@ QGCXPlaneLink::~QGCXPlaneLink() @@ -73,7 +73,8 @@ QGCXPlaneLink::~QGCXPlaneLink()
// Tell the thread to exit
_should_exit = true;
if (socket) {
if (socket)
{
socket->close();
socket->deleteLater();
socket = NULL;
@ -106,21 +107,25 @@ void QGCXPlaneLink::storeSettings() @@ -106,21 +107,25 @@ void QGCXPlaneLink::storeSettings()
settings.endGroup();
}
void QGCXPlaneLink::setVersion(const QString& version)
void QGCXPlaneLink::setVersion(const QString &version)
{
unsigned int oldVersion = xPlaneVersion;
if (version.contains("9"))
{
xPlaneVersion = 9;
}
else if (version.contains("10"))
{
xPlaneVersion = 10;
}
else if (version.contains("11"))
{
xPlaneVersion = 11;
}
else if (version.contains("12"))
{
xPlaneVersion = 12;
@ -136,19 +141,23 @@ void QGCXPlaneLink::setVersion(unsigned int version) @@ -136,19 +141,23 @@ void QGCXPlaneLink::setVersion(unsigned int version)
{
bool changed = (xPlaneVersion != version);
xPlaneVersion = version;
if (changed) emit versionChanged(QString("X-Plane %1").arg(xPlaneVersion));
}
void QGCXPlaneLink::enableHilActuatorControls(bool enable)
{
if (enable != _useHilActuatorControls) {
if (enable != _useHilActuatorControls)
{
_useHilActuatorControls = enable;
}
/* Only use override for new message and specific airframes */
MAV_TYPE type = _vehicle->vehicleType();
float value = 0.0f;
if (type == MAV_TYPE_VTOL_RESERVED2) {
if (type == MAV_TYPE_VTOL_RESERVED2)
{
value = (enable ? 1.0f : 0.0f);
}
@ -163,12 +172,14 @@ void QGCXPlaneLink::enableHilActuatorControls(bool enable) @@ -163,12 +172,14 @@ void QGCXPlaneLink::enableHilActuatorControls(bool enable)
**/
void QGCXPlaneLink::run()
{
if (!_vehicle) {
if (!_vehicle)
{
emit statusMessage("No MAV present");
return;
}
if (connectState) {
if (connectState)
{
emit statusMessage("Already connected");
return;
}
@ -176,7 +187,9 @@ void QGCXPlaneLink::run() @@ -176,7 +187,9 @@ void QGCXPlaneLink::run()
socket = new QUdpSocket(this);
socket->moveToThread(this);
connectState = socket->bind(localHost, localPort, QAbstractSocket::ReuseAddressHint);
if (!connectState) {
if (!connectState)
{
emit statusMessage("Binding socket failed!");
@ -237,14 +250,15 @@ void QGCXPlaneLink::run() @@ -237,14 +250,15 @@ void QGCXPlaneLink::run()
strncpy(ip.str_port_them, localPortStr.toLatin1(), qMin((int)sizeof(ip.str_port_them), 6));
ip.use_ip = 1;
writeBytesSafe((const char*)&ip, sizeof(ip));
writeBytesSafe((const char *)&ip, sizeof(ip));
/* Call function which makes sure individual control override is enabled/disabled */
enableHilActuatorControls(_useHilActuatorControls);
_should_exit = false;
while(!_should_exit) {
while (!_should_exit)
{
QCoreApplication::processEvents();
QGC::SLEEP::msleep(5);
}
@ -278,7 +292,8 @@ void QGCXPlaneLink::processError(QProcess::ProcessError err) @@ -278,7 +292,8 @@ void QGCXPlaneLink::processError(QProcess::ProcessError err)
{
QString msg;
switch(err) {
switch (err)
{
case QProcess::FailedToStart:
msg = tr("X-Plane Failed to start. Please check if the path and command is correct");
break;
@ -314,7 +329,7 @@ QString QGCXPlaneLink::getRemoteHost() @@ -314,7 +329,7 @@ QString QGCXPlaneLink::getRemoteHost()
/**
* @param newHost Hostname in standard formatting, e.g. localhost:14551 or 192.168.1.1:14551
*/
void QGCXPlaneLink::setRemoteHost(const QString& newHost)
void QGCXPlaneLink::setRemoteHost(const QString &newHost)
{
if (newHost.length() == 0)
return;
@ -322,11 +337,13 @@ void QGCXPlaneLink::setRemoteHost(const QString& newHost) @@ -322,11 +337,13 @@ void QGCXPlaneLink::setRemoteHost(const QString& newHost)
if (newHost.contains(":"))
{
QHostInfo info = QHostInfo::fromName(newHost.split(":").first());
if (info.error() == QHostInfo::NoError)
{
// Add newHost
QList<QHostAddress> newHostAddresses = info.addresses();
QHostAddress address;
for (int i = 0; i < newHostAddresses.size(); i++)
{
// Exclude loopback IPv4 and all IPv6 addresses
@ -335,18 +352,22 @@ void QGCXPlaneLink::setRemoteHost(const QString& newHost) @@ -335,18 +352,22 @@ void QGCXPlaneLink::setRemoteHost(const QString& newHost)
address = newHostAddresses.at(i);
}
}
remoteHost = address;
// Set localPort according to user input
remotePort = newHost.split(":").last().toInt();
}
}
else
{
QHostInfo info = QHostInfo::fromName(newHost);
if (info.error() == QHostInfo::NoError)
{
// Add newHost
remoteHost = info.addresses().first();
if (remotePort == 0) remotePort = 49000;
}
}
@ -363,17 +384,20 @@ void QGCXPlaneLink::setRemoteHost(const QString& newHost) @@ -363,17 +384,20 @@ void QGCXPlaneLink::setRemoteHost(const QString& newHost)
void QGCXPlaneLink::updateControls(quint64 time, float rollAilerons, float pitchElevator, float yawRudder, float throttle, quint8 systemMode, quint8 navMode)
{
/* Only use HIL_CONTROL when the checkbox is unchecked */
if (_useHilActuatorControls) {
if (_useHilActuatorControls)
{
//qDebug() << "received HIL_CONTROL but not using it";
return;
}
#pragma pack(push, 1)
struct payload {
#pragma pack(push, 1)
struct payload
{
char b[5];
int index;
float f[8];
} p;
#pragma pack(pop)
#pragma pack(pop)
p.b[0] = 'D';
p.b[1] = 'A';
@ -399,8 +423,9 @@ void QGCXPlaneLink::updateControls(quint64 time, float rollAilerons, float pitch @@ -399,8 +423,9 @@ void QGCXPlaneLink::updateControls(quint64 time, float rollAilerons, float pitch
// Direct throttle control
p.index = 25;
writeBytesSafe((const char*)&p, sizeof(p));
writeBytesSafe((const char *)&p, sizeof(p));
}
else
{
// direct pass-through, normal fixed-wing.
@ -412,11 +437,11 @@ void QGCXPlaneLink::updateControls(quint64 time, float rollAilerons, float pitch @@ -412,11 +437,11 @@ void QGCXPlaneLink::updateControls(quint64 time, float rollAilerons, float pitch
// Send to group 12
p.index = 12;
writeBytesSafe((const char*)&p, sizeof(p));
writeBytesSafe((const char *)&p, sizeof(p));
// Send to group 8, which equals manual controls
p.index = 8;
writeBytesSafe((const char*)&p, sizeof(p));
writeBytesSafe((const char *)&p, sizeof(p));
// Send throttle to all four motors
p.index = 25;
@ -425,13 +450,14 @@ void QGCXPlaneLink::updateControls(quint64 time, float rollAilerons, float pitch @@ -425,13 +450,14 @@ void QGCXPlaneLink::updateControls(quint64 time, float rollAilerons, float pitch
p.f[1] = throttle;
p.f[2] = throttle;
p.f[3] = throttle;
writeBytesSafe((const char*)&p, sizeof(p));
writeBytesSafe((const char *)&p, sizeof(p));
}
}
void QGCXPlaneLink::updateActuatorControls(quint64 time, quint64 flags, float ctl_0, float ctl_1, float ctl_2, float ctl_3, float ctl_4, float ctl_5, float ctl_6, float ctl_7, float ctl_8, float ctl_9, float ctl_10, float ctl_11, float ctl_12, float ctl_13, float ctl_14, float ctl_15, quint8 mode)
{
if (!_useHilActuatorControls) {
if (!_useHilActuatorControls)
{
//qDebug() << "received HIL_ACTUATOR_CONTROLS but not using it";
return;
}
@ -444,13 +470,14 @@ void QGCXPlaneLink::updateActuatorControls(quint64 time, quint64 flags, float ct @@ -444,13 +470,14 @@ void QGCXPlaneLink::updateActuatorControls(quint64 time, quint64 flags, float ct
Q_UNUSED(ctl_14);
Q_UNUSED(ctl_15);
#pragma pack(push, 1)
struct payload {
#pragma pack(push, 1)
struct payload
{
char b[5];
int index;
float f[8];
} p;
#pragma pack(pop)
#pragma pack(pop)
p.b[0] = 'D';
p.b[1] = 'A';
@ -461,7 +488,8 @@ void QGCXPlaneLink::updateActuatorControls(quint64 time, quint64 flags, float ct @@ -461,7 +488,8 @@ void QGCXPlaneLink::updateActuatorControls(quint64 time, quint64 flags, float ct
/* Initialize with zeroes */
memset(p.f, 0, sizeof(p.f));
switch (_vehicle->vehicleType()) {
switch (_vehicle->vehicleType())
{
case MAV_TYPE_QUADROTOR:
case MAV_TYPE_HEXAROTOR:
case MAV_TYPE_OCTOROTOR:
@ -477,9 +505,10 @@ void QGCXPlaneLink::updateActuatorControls(quint64 time, quint64 flags, float ct @@ -477,9 +505,10 @@ void QGCXPlaneLink::updateActuatorControls(quint64 time, quint64 flags, float ct
/* Direct throttle control */
p.index = 25;
writeBytesSafe((const char*)&p, sizeof(p));
writeBytesSafe((const char *)&p, sizeof(p));
break;
}
case MAV_TYPE_VTOL_RESERVED2:
{
/**
@ -496,7 +525,7 @@ void QGCXPlaneLink::updateActuatorControls(quint64 time, quint64 flags, float ct @@ -496,7 +525,7 @@ void QGCXPlaneLink::updateActuatorControls(quint64 time, quint64 flags, float ct
p.f[6] = ctl_6;
p.f[7] = ctl_7;
p.index = 25;
writeBytesSafe((const char*)&p, sizeof(p));
writeBytesSafe((const char *)&p, sizeof(p));
/* Control individual actuators */
float max_surface_deflection = 30.0f; // Degrees
@ -507,6 +536,7 @@ void QGCXPlaneLink::updateActuatorControls(quint64 time, quint64 flags, float ct @@ -507,6 +536,7 @@ void QGCXPlaneLink::updateActuatorControls(quint64 time, quint64 flags, float ct
break;
}
default:
{
/* direct pass-through, normal fixed-wing. */
@ -516,7 +546,7 @@ void QGCXPlaneLink::updateActuatorControls(quint64 time, quint64 flags, float ct @@ -516,7 +546,7 @@ void QGCXPlaneLink::updateActuatorControls(quint64 time, quint64 flags, float ct
/* Send to group 8, which equals manual controls */
p.index = 8;
writeBytesSafe((const char*)&p, sizeof(p));
writeBytesSafe((const char *)&p, sizeof(p));
/* Send throttle to all eight motors */
p.index = 25;
@ -528,7 +558,7 @@ void QGCXPlaneLink::updateActuatorControls(quint64 time, quint64 flags, float ct @@ -528,7 +558,7 @@ void QGCXPlaneLink::updateActuatorControls(quint64 time, quint64 flags, float ct
p.f[5] = ctl_3;
p.f[6] = ctl_3;
p.f[7] = ctl_3;
writeBytesSafe((const char*)&p, sizeof(p));
writeBytesSafe((const char *)&p, sizeof(p));
break;
}
@ -536,7 +566,8 @@ void QGCXPlaneLink::updateActuatorControls(quint64 time, quint64 flags, float ct @@ -536,7 +566,8 @@ void QGCXPlaneLink::updateActuatorControls(quint64 time, quint64 flags, float ct
}
Eigen::Matrix3f euler_to_wRo(double yaw, double pitch, double roll) {
Eigen::Matrix3f euler_to_wRo(double yaw, double pitch, double roll)
{
double c__ = cos(yaw);
double _c_ = cos(pitch);
double __c = cos(roll);
@ -559,8 +590,8 @@ Eigen::Matrix3f euler_to_wRo(double yaw, double pitch, double roll) { @@ -559,8 +590,8 @@ Eigen::Matrix3f euler_to_wRo(double yaw, double pitch, double roll) {
double sss = ss_ * __s;
Eigen::Matrix3f wRo;
wRo <<
cc_ , css-s_c, csc+s_s,
sc_ , sss+c_c, ssc-c_s,
cc_ , css - s_c, csc + s_s,
sc_ , sss + c_c, ssc - c_s,
-_s_ , _cs, _cc;
return wRo;
}
@ -591,25 +622,30 @@ void QGCXPlaneLink::readBytes() @@ -591,25 +622,30 @@ void QGCXPlaneLink::readBytes()
quint16 senderPort;
unsigned int s = socket->pendingDatagramSize();
if (s > maxLength) std::cerr << __FILE__ << __LINE__ << " UDP datagram overflow, allowed to read less bytes than datagram size: " << s << std::endl;
socket->readDatagram(data, maxLength, &sender, &senderPort);
if (s > maxLength) {
std::string headStr = std::string(data, data+5);
if (s > maxLength)
{
std::string headStr = std::string(data, data + 5);
std::cerr << __FILE__ << __LINE__ << " UDP datagram header: " << headStr << std::endl;
}
// Calculate the number of data segments a 36 bytes
// XPlane always has 5 bytes header: 'DATA@'
unsigned nsegs = (s-5)/36;
unsigned nsegs = (s - 5) / 36;
//qDebug() << "XPLANE:" << "LEN:" << s << "segs:" << nsegs;
#pragma pack(push, 1)
struct payload {
#pragma pack(push, 1)
struct payload
{
int index;
float f[8];
} p;
#pragma pack(pop)
#pragma pack(pop)
bool oldConnectionState = xPlaneConnected;
@ -620,15 +656,16 @@ void QGCXPlaneLink::readBytes() @@ -620,15 +656,16 @@ void QGCXPlaneLink::readBytes()
{
xPlaneConnected = true;
if (oldConnectionState != xPlaneConnected) {
if (oldConnectionState != xPlaneConnected)
{
simUpdateFirst = QGC::groundTimeMilliseconds();
}
for (unsigned i = 0; i < nsegs; i++)
{
// Get index
unsigned ioff = (5+i*36);;
memcpy(&(p), data+ioff, sizeof(p));
unsigned ioff = (5 + i * 36);;
memcpy(&(p), data + ioff, sizeof(p));
if (p.index == 3)
{
@ -638,13 +675,14 @@ void QGCXPlaneLink::readBytes() @@ -638,13 +675,14 @@ void QGCXPlaneLink::readBytes()
//qDebug() << "SPEEDS:" << "airspeed" << airspeed << "m/s, groundspeed" << groundspeed << "m/s";
}
if (p.index == 4)
{
// WORKAROUND: IF ground speed <<1m/s and altitude-above-ground <1m, do NOT use the X-Plane data, because X-Plane (tested
// with v10.3 and earlier) delivers yacc=0 and zacc=0 when the ground speed is very low, which gives e.g. wrong readings
// before launch when waiting on the runway. This might pose a problem for initial state estimation/calibration.
// Instead, we calculate our own accelerations.
if (fabsf(groundspeed)<0.1f && alt_agl<1.0)
if (fabsf(groundspeed) < 0.1f && alt_agl < 1.0)
{
// TODO: Add centrip. acceleration to the current static acceleration implementation.
Eigen::Vector3f g(0, 0, -9.80665f);
@ -657,6 +695,7 @@ void QGCXPlaneLink::readBytes() @@ -657,6 +695,7 @@ void QGCXPlaneLink::readBytes()
//qDebug() << "Calculated values" << gr[0] << gr[1] << gr[2];
}
else
{
// Accelerometer readings, directly from X-Plane and including centripetal forces.
@ -671,6 +710,7 @@ void QGCXPlaneLink::readBytes() @@ -671,6 +710,7 @@ void QGCXPlaneLink::readBytes()
fields_changed |= (1 << 0) | (1 << 1) | (1 << 2);
emitUpdate = true;
}
// atmospheric pressure aircraft for XPlane 9 and 10
else if (p.index == 6)
{
@ -679,6 +719,7 @@ void QGCXPlaneLink::readBytes() @@ -679,6 +719,7 @@ void QGCXPlaneLink::readBytes()
temperature = p.f[1];
fields_changed |= (1 << 9) | (1 << 12);
}
// Forward controls from X-Plane to MAV, not very useful
// better: Connect Joystick to QGroundControl
// else if (p.index == 8)
@ -700,6 +741,7 @@ void QGCXPlaneLink::readBytes() @@ -700,6 +741,7 @@ void QGCXPlaneLink::readBytes()
emitUpdate = true;
}
else if ((xPlaneVersion == 10 && p.index == 17) || (xPlaneVersion == 9 && p.index == 18))
{
//qDebug() << "HDNG" << "pitch" << p.f[0] << "roll" << p.f[1] << "hding true" << p.f[2] << "hding mag" << p.f[3];
@ -708,19 +750,25 @@ void QGCXPlaneLink::readBytes() @@ -708,19 +750,25 @@ void QGCXPlaneLink::readBytes()
yaw = p.f[2] / 180.0f * M_PI;
// X-Plane expresses yaw as 0..2 PI
if (yaw > M_PI) {
if (yaw > M_PI)
{
yaw -= 2.0f * static_cast<float>(M_PI);
}
if (yaw < -M_PI) {
if (yaw < -M_PI)
{
yaw += 2.0f * static_cast<float>(M_PI);
}
float yawmag = p.f[3] / 180.0f * M_PI;
if (yawmag > M_PI) {
if (yawmag > M_PI)
{
yawmag -= 2.0f * static_cast<float>(M_PI);
}
if (yawmag < -M_PI) {
if (yawmag < -M_PI)
{
yawmag += 2.0f * static_cast<float>(M_PI);
}
@ -754,7 +802,7 @@ void QGCXPlaneLink::readBytes() @@ -754,7 +802,7 @@ void QGCXPlaneLink::readBytes()
dcm[2][1] = sinPhi * cosThe;
dcm[2][2] = cosPhi * cosThe;
Eigen::Matrix3f m = Eigen::Map<Eigen::Matrix3f>((float*)dcm).eval();
Eigen::Matrix3f m = Eigen::Map<Eigen::Matrix3f>((float *)dcm).eval();
Eigen::Vector3f mag(xmag, ymag, zmag);
@ -785,6 +833,7 @@ void QGCXPlaneLink::readBytes() @@ -785,6 +833,7 @@ void QGCXPlaneLink::readBytes()
alt = p.f[2] * 0.3048f; // convert feet (MSL) to meters
alt_agl = p.f[3] * 0.3048f; //convert feet (AGL) to meters
}
else if (p.index == 21)
{
vy = p.f[3];
@ -793,6 +842,7 @@ void QGCXPlaneLink::readBytes() @@ -793,6 +842,7 @@ void QGCXPlaneLink::readBytes()
// for us.
vz = -p.f[4];
}
else if (p.index == 12)
{
//qDebug() << "AIL/ELEV/RUD" << p.f[0] << p.f[1] << p.f[2];
@ -835,7 +885,8 @@ void QGCXPlaneLink::readBytes() @@ -835,7 +885,8 @@ void QGCXPlaneLink::readBytes()
}
// Wait for 0.5s before actually using the data, so that all fields are filled
if (QGC::groundTimeMilliseconds() - simUpdateFirst < 500) {
if (QGC::groundTimeMilliseconds() - simUpdateFirst < 500)
{
return;
}
@ -843,7 +894,9 @@ void QGCXPlaneLink::readBytes() @@ -843,7 +894,9 @@ void QGCXPlaneLink::readBytes()
if (emitUpdate && (QGC::groundTimeMilliseconds() - simUpdateLast) > 2)
{
simUpdateHz = simUpdateHz * 0.9f + 0.1f * (1000.0f / (QGC::groundTimeMilliseconds() - simUpdateLast));
if (QGC::groundTimeMilliseconds() - simUpdateLastText > 2000) {
if (QGC::groundTimeMilliseconds() - simUpdateLastText > 2000)
{
emit statusMessage(tr("Receiving from XPlane at %1 Hz").arg(static_cast<int>(simUpdateHz)));
// Reset lowpass with current value
simUpdateHz = (1000.0f / (QGC::groundTimeMilliseconds() - simUpdateLast));
@ -890,19 +943,23 @@ void QGCXPlaneLink::readBytes() @@ -890,19 +943,23 @@ void QGCXPlaneLink::readBytes()
int gps_fix_type = 3;
float eph = 0.3f;
float epv = 0.6f;
float vel = sqrt(vx*vx + vy*vy + vz*vz);
float vel = sqrt(vx * vx + vy * vy + vz * vz);
float cog = atan2(vy, vx);
int satellites = 8;
emit sensorHilGpsChanged(QGC::groundTimeUsecs(), lat, lon, alt, gps_fix_type, eph, epv, vel, vx, vy, vz, cog, satellites);
} else {
}
else
{
emit hilStateChanged(QGC::groundTimeUsecs(), roll, pitch, yaw, rollspeed,
pitchspeed, yawspeed, lat, lon, alt,
vx, vy, vz, ind_airspeed, true_airspeed, xacc, yacc, zacc);
}
// Limit ground truth to 25 Hz
if (QGC::groundTimeMilliseconds() - simUpdateLastGroundTruth > 40) {
if (QGC::groundTimeMilliseconds() - simUpdateLastGroundTruth > 40)
{
emit hilGroundTruthChanged(QGC::groundTimeUsecs(), roll, pitch, yaw, rollspeed,
pitchspeed, yawspeed, lat, lon, alt,
vx, vy, vz, ind_airspeed, true_airspeed, xacc, yacc, zacc);
@ -948,7 +1005,10 @@ bool QGCXPlaneLink::disconnectSimulation() @@ -948,7 +1005,10 @@ bool QGCXPlaneLink::disconnectSimulation()
if (connectState)
{
_should_exit = true;
} else {
}
else
{
emit simulationDisconnected();
emit simulationConnected(false);
}
@ -956,7 +1016,7 @@ bool QGCXPlaneLink::disconnectSimulation() @@ -956,7 +1016,7 @@ bool QGCXPlaneLink::disconnectSimulation()
return !connectState;
}
void QGCXPlaneLink::selectAirframe(const QString& plane)
void QGCXPlaneLink::selectAirframe(const QString &plane)
{
airframeName = plane;
@ -967,29 +1027,34 @@ void QGCXPlaneLink::selectAirframe(const QString& plane) @@ -967,29 +1027,34 @@ void QGCXPlaneLink::selectAirframe(const QString& plane)
airframeID = AIRFRAME_QUAD_X_MK_10INCH_I2C;
emit airframeChanged("QRO_X / MK");
}
else if (plane.contains("ARDRONE") && airframeID != AIRFRAME_QUAD_X_ARDRONE)
{
airframeID = AIRFRAME_QUAD_X_ARDRONE;
emit airframeChanged("QRO_X / ARDRONE");
}
else
{
bool changed = (airframeID != AIRFRAME_QUAD_DJI_F450_PWM);
airframeID = AIRFRAME_QUAD_DJI_F450_PWM;
if (changed) emit airframeChanged("QRO_X / DJI-F450 / PWM");
}
}
else
{
bool changed = (airframeID != AIRFRAME_UNKNOWN);
airframeID = AIRFRAME_UNKNOWN;
if (changed) emit airframeChanged("X Plane default");
}
}
void QGCXPlaneLink::setPositionAttitude(double lat, double lon, double alt, double roll, double pitch, double yaw)
{
#pragma pack(push, 1)
#pragma pack(push, 1)
struct VEH1_struct
{
char header[5];
@ -998,7 +1063,7 @@ void QGCXPlaneLink::setPositionAttitude(double lat, double lon, double alt, doub @@ -998,7 +1063,7 @@ void QGCXPlaneLink::setPositionAttitude(double lat, double lon, double alt, doub
float psi_the_phi[3];
float gear_flap_vect[3];
} pos;
#pragma pack(pop)
#pragma pack(pop)
pos.header[0] = 'V';
pos.header[1] = 'E';
@ -1016,7 +1081,7 @@ void QGCXPlaneLink::setPositionAttitude(double lat, double lon, double alt, doub @@ -1016,7 +1081,7 @@ void QGCXPlaneLink::setPositionAttitude(double lat, double lon, double alt, doub
pos.gear_flap_vect[1] = 0.0f;
pos.gear_flap_vect[2] = 0.0f;
writeBytesSafe((const char*)&pos, sizeof(pos));
writeBytesSafe((const char *)&pos, sizeof(pos));
// pos.header[0] = 'V';
// pos.header[1] = 'E';
@ -1046,8 +1111,8 @@ void QGCXPlaneLink::setRandomPosition() @@ -1046,8 +1111,8 @@ void QGCXPlaneLink::setRandomPosition()
// Initialize generator
srand(0);
double offLat = rand() / static_cast<double>(RAND_MAX) / 500.0 + 1.0/500.0;
double offLon = rand() / static_cast<double>(RAND_MAX) / 500.0 + 1.0/500.0;
double offLat = rand() / static_cast<double>(RAND_MAX) / 500.0 + 1.0 / 500.0;
double offLon = rand() / static_cast<double>(RAND_MAX) / 500.0 + 1.0 / 500.0;
double offAlt = rand() / static_cast<double>(RAND_MAX) * 200.0 + 100.0;
if (_vehicle->altitudeAMSL()->rawValue().toDouble() + offAlt < 0)
@ -1087,9 +1152,13 @@ void QGCXPlaneLink::setRandomAttitude() @@ -1087,9 +1152,13 @@ void QGCXPlaneLink::setRandomAttitude()
**/
bool QGCXPlaneLink::connectSimulation()
{
if (connectState) {
if (connectState)
{
qDebug() << "Simulation already active";
} else {
}
else
{
qDebug() << "STARTING X-PLANE LINK, CONNECTING TO" << remoteHost << ":" << remotePort;
// XXX Hack
storeSettings();
@ -1123,13 +1192,14 @@ void QGCXPlaneLink::setName(QString name) @@ -1123,13 +1192,14 @@ void QGCXPlaneLink::setName(QString name)
void QGCXPlaneLink::sendDataRef(QString ref, float value)
{
#pragma pack(push, 1)
struct payload {
#pragma pack(push, 1)
struct payload
{
char b[5];
float value;
char name[500];
} dref;
#pragma pack(pop)
#pragma pack(pop)
dref.b[0] = 'D';
dref.b[1] = 'R';
@ -1147,12 +1217,16 @@ void QGCXPlaneLink::sendDataRef(QString ref, float value) @@ -1147,12 +1217,16 @@ void QGCXPlaneLink::sendDataRef(QString ref, float value)
/* Send command */
QByteArray ba = ref.toUtf8();
if (ba.length() > 500) {
if (ba.length() > 500)
{
return;
}
for (int i = 0; i < ba.length(); i++) {
for (int i = 0; i < ba.length(); i++)
{
dref.name[i] = ba.at(i);
}
writeBytesSafe((const char*)&dref, sizeof(dref));
writeBytesSafe((const char *)&dref, sizeof(dref));
}

29
src/comm/QGCXPlaneLink.h

@ -36,7 +36,7 @@ class QGCXPlaneLink : public QGCHilLink @@ -36,7 +36,7 @@ class QGCXPlaneLink : public QGCHilLink
//Q_INTERFACES(QGCXPlaneLinkInterface:LinkInterface)
public:
QGCXPlaneLink(Vehicle* vehicle, QString remoteHost=QString("127.0.0.1:49000"), QHostAddress localHost = QHostAddress::Any, quint16 localPort = 49005);
QGCXPlaneLink(Vehicle *vehicle, QString remoteHost = QString("127.0.0.1:49000"), QHostAddress localHost = QHostAddress::Any, quint16 localPort = 49005);
~QGCXPlaneLink();
/**
@ -51,7 +51,8 @@ public: @@ -51,7 +51,8 @@ public:
bool isConnected();
qint64 bytesAvailable();
int getPort() const {
int getPort() const
{
return localPort;
}
@ -88,11 +89,13 @@ public: @@ -88,11 +89,13 @@ public:
return (int)airframeID;
}
bool sensorHilEnabled() {
bool sensorHilEnabled()
{
return _sensorHilEnabled;
}
bool useHilActuatorControls() {
bool useHilActuatorControls()
{
return _useHilActuatorControls;
}
@ -104,7 +107,7 @@ public slots: @@ -104,7 +107,7 @@ public slots:
// void setAddress(QString address);
void setPort(int port);
/** @brief Add a new host to broadcast messages to */
void setRemoteHost(const QString& host);
void setRemoteHost(const QString &host);
/** @brief Send new control states to the simulation */
void updateControls(quint64 time, float rollAilerons, float pitchElevator, float yawRudder, float throttle, quint8 systemMode, quint8 navMode);
/** @brief Send new control commands to the simulation */
@ -127,13 +130,15 @@ public slots: @@ -127,13 +130,15 @@ public slots:
float ctl_15,
quint8 mode);
/** @brief Set the simulator version as text string */
void setVersion(const QString& version);
void setVersion(const QString &version);
/** @brief Set the simulator version as integer */
void setVersion(unsigned int version);
void enableSensorHIL(bool enable) {
void enableSensorHIL(bool enable)
{
if (enable != _sensorHilEnabled)
_sensorHilEnabled = enable;
emit sensorHilChanged(enable);
}
@ -159,7 +164,7 @@ public slots: @@ -159,7 +164,7 @@ public slots:
* @brief Select airplane model
* @param plane the name of the airplane
*/
void selectAirframe(const QString& airframe);
void selectAirframe(const QString &airframe);
/**
* @brief Set the airplane position and attitude
* @param lat
@ -182,14 +187,14 @@ public slots: @@ -182,14 +187,14 @@ public slots:
void setRandomAttitude();
protected:
Vehicle* _vehicle;
Vehicle *_vehicle;
QString name;
QHostAddress localHost;
quint16 localPort;
QHostAddress remoteHost;
quint16 remotePort;
int id;
QUdpSocket* socket;
QUdpSocket *socket;
bool connectState;
quint64 bitsSentTotal;
@ -202,8 +207,8 @@ protected: @@ -202,8 +207,8 @@ protected:
QMutex statisticsMutex;
QMutex dataMutex;
QTimer refreshTimer;
QProcess* process;
QProcess* terraSync;
QProcess *process;
QProcess *terraSync;
bool gpsReceived;
bool attitudeReceived;

375
src/uas/UAS.cc

File diff suppressed because it is too large Load Diff

158
src/uas/UAS.h

@ -50,7 +50,7 @@ class UAS : public UASInterface @@ -50,7 +50,7 @@ class UAS : public UASInterface
{
Q_OBJECT
public:
UAS(MAVLinkProtocol* protocol, Vehicle* vehicle, FirmwarePluginManager * firmwarePluginManager);
UAS(MAVLinkProtocol *protocol, Vehicle *vehicle, FirmwarePluginManager *firmwarePluginManager);
float lipoFull; ///< 100% charged voltage
float lipoEmpty; ///< Discharged voltage
@ -89,8 +89,8 @@ public: @@ -89,8 +89,8 @@ public:
void setGroundSpeed(double val)
{
groundSpeed = val;
emit groundSpeedChanged(val,"groundSpeed");
emit valueChanged(this->uasId,"groundSpeed","m/s",QVariant(val),getUnixTime());
emit groundSpeedChanged(val, "groundSpeed");
emit valueChanged(this->uasId, "groundSpeed", "m/s", QVariant(val), getUnixTime());
}
double getGroundSpeed() const
{
@ -100,8 +100,8 @@ public: @@ -100,8 +100,8 @@ public:
void setAirSpeed(double val)
{
airSpeed = val;
emit airSpeedChanged(val,"airSpeed");
emit valueChanged(this->uasId,"airSpeed","m/s",QVariant(val),getUnixTime());
emit airSpeedChanged(val, "airSpeed");
emit valueChanged(this->uasId, "airSpeed", "m/s", QVariant(val), getUnixTime());
}
double getAirSpeed() const
@ -112,8 +112,8 @@ public: @@ -112,8 +112,8 @@ public:
void setLocalX(double val)
{
localX = val;
emit localXChanged(val,"localX");
emit valueChanged(this->uasId,"localX","m",QVariant(val),getUnixTime());
emit localXChanged(val, "localX");
emit valueChanged(this->uasId, "localX", "m", QVariant(val), getUnixTime());
}
double getLocalX() const
@ -124,8 +124,8 @@ public: @@ -124,8 +124,8 @@ public:
void setLocalY(double val)
{
localY = val;
emit localYChanged(val,"localY");
emit valueChanged(this->uasId,"localY","m",QVariant(val),getUnixTime());
emit localYChanged(val, "localY");
emit valueChanged(this->uasId, "localY", "m", QVariant(val), getUnixTime());
}
double getLocalY() const
{
@ -135,8 +135,8 @@ public: @@ -135,8 +135,8 @@ public:
void setLocalZ(double val)
{
localZ = val;
emit localZChanged(val,"localZ");
emit valueChanged(this->uasId,"localZ","m",QVariant(val),getUnixTime());
emit localZChanged(val, "localZ");
emit valueChanged(this->uasId, "localZ", "m", QVariant(val), getUnixTime());
}
double getLocalZ() const
{
@ -146,8 +146,8 @@ public: @@ -146,8 +146,8 @@ public:
void setLatitude(double val)
{
latitude = val;
emit latitudeChanged(val,"latitude");
emit valueChanged(this->uasId,"latitude","deg",QVariant(val),getUnixTime());
emit latitudeChanged(val, "latitude");
emit valueChanged(this->uasId, "latitude", "deg", QVariant(val), getUnixTime());
}
double getLatitude() const
@ -158,8 +158,8 @@ public: @@ -158,8 +158,8 @@ public:
void setLongitude(double val)
{
longitude = val;
emit longitudeChanged(val,"longitude");
emit valueChanged(this->uasId,"longitude","deg",QVariant(val),getUnixTime());
emit longitudeChanged(val, "longitude");
emit valueChanged(this->uasId, "longitude", "deg", QVariant(val), getUnixTime());
}
double getLongitude() const
@ -171,10 +171,10 @@ public: @@ -171,10 +171,10 @@ public:
{
altitudeAMSL = val;
emit altitudeAMSLChanged(val, "altitudeAMSL");
emit valueChanged(this->uasId,"altitudeAMSL","m",QVariant(altitudeAMSL),getUnixTime());
emit valueChanged(this->uasId, "altitudeAMSL", "m", QVariant(altitudeAMSL), getUnixTime());
altitudeAMSLFT = 3.28084 * altitudeAMSL;
emit altitudeAMSLFTChanged(val, "altitudeAMSLFT");
emit valueChanged(this->uasId,"altitudeAMSLFT","m",QVariant(altitudeAMSLFT),getUnixTime());
emit valueChanged(this->uasId, "altitudeAMSLFT", "m", QVariant(altitudeAMSLFT), getUnixTime());
}
double getAltitudeAMSL() const
@ -191,7 +191,7 @@ public: @@ -191,7 +191,7 @@ public:
{
altitudeRelative = val;
emit altitudeRelativeChanged(val, "altitudeRelative");
emit valueChanged(this->uasId,"altitudeRelative","m",QVariant(val),getUnixTime());
emit valueChanged(this->uasId, "altitudeRelative", "m", QVariant(val), getUnixTime());
}
double getAltitudeRelative() const
@ -217,8 +217,8 @@ public: @@ -217,8 +217,8 @@ public:
void setSatelliteCount(double val)
{
satelliteCount = val;
emit satelliteCountChanged(val,"satelliteCount");
emit valueChanged(this->uasId,"satelliteCount","",QVariant(val),getUnixTime());
emit satelliteCountChanged(val, "satelliteCount");
emit valueChanged(this->uasId, "satelliteCount", "", QVariant(val), getUnixTime());
}
double getSatelliteCount() const
@ -234,8 +234,8 @@ public: @@ -234,8 +234,8 @@ public:
void setDistToWaypoint(double val)
{
distToWaypoint = val;
emit distToWaypointChanged(val,"distToWaypoint");
emit valueChanged(this->uasId,"distToWaypoint","m",QVariant(val),getUnixTime());
emit distToWaypointChanged(val, "distToWaypoint");
emit valueChanged(this->uasId, "distToWaypoint", "m", QVariant(val), getUnixTime());
}
double getDistToWaypoint() const
@ -246,8 +246,8 @@ public: @@ -246,8 +246,8 @@ public:
void setBearingToWaypoint(double val)
{
bearingToWaypoint = val;
emit bearingToWaypointChanged(val,"bearingToWaypoint");
emit valueChanged(this->uasId,"bearingToWaypoint","deg",QVariant(val),getUnixTime());
emit bearingToWaypointChanged(val, "bearingToWaypoint");
emit valueChanged(this->uasId, "bearingToWaypoint", "deg", QVariant(val), getUnixTime());
}
double getBearingToWaypoint() const
@ -259,7 +259,7 @@ public: @@ -259,7 +259,7 @@ public:
void setRoll(double val)
{
roll = val;
emit rollChanged(val,"roll");
emit rollChanged(val, "roll");
}
double getRoll() const
@ -270,7 +270,7 @@ public: @@ -270,7 +270,7 @@ public:
void setPitch(double val)
{
pitch = val;
emit pitchChanged(val,"pitch");
emit pitchChanged(val, "pitch");
}
double getPitch() const
@ -281,7 +281,7 @@ public: @@ -281,7 +281,7 @@ public:
void setYaw(double val)
{
yaw = val;
emit yawChanged(val,"yaw");
emit yawChanged(val, "yaw");
}
double getYaw() const
@ -290,55 +290,68 @@ public: @@ -290,55 +290,68 @@ public:
}
// Setters for HIL noise variance
void setXaccVar(float var){
void setXaccVar(float var)
{
xacc_var = var;
}
void setYaccVar(float var){
void setYaccVar(float var)
{
yacc_var = var;
}
void setZaccVar(float var){
void setZaccVar(float var)
{
zacc_var = var;
}
void setRollSpeedVar(float var){
void setRollSpeedVar(float var)
{
rollspeed_var = var;
}
void setPitchSpeedVar(float var){
void setPitchSpeedVar(float var)
{
pitchspeed_var = var;
}
void setYawSpeedVar(float var){
void setYawSpeedVar(float var)
{
pitchspeed_var = var;
}
void setXmagVar(float var){
void setXmagVar(float var)
{
xmag_var = var;
}
void setYmagVar(float var){
void setYmagVar(float var)
{
ymag_var = var;
}
void setZmagVar(float var){
void setZmagVar(float var)
{
zmag_var = var;
}
void setAbsPressureVar(float var){
void setAbsPressureVar(float var)
{
abs_pressure_var = var;
}
void setDiffPressureVar(float var){
void setDiffPressureVar(float var)
{
diff_pressure_var = var;
}
void setPressureAltVar(float var){
void setPressureAltVar(float var)
{
pressure_alt_var = var;
}
void setTemperatureVar(float var){
void setTemperatureVar(float var)
{
temperature_var = var;
}
@ -352,7 +365,7 @@ protected: //COMMENTS FOR TEST UNIT @@ -352,7 +365,7 @@ protected: //COMMENTS FOR TEST UNIT
QMap<int, QString> components;///< IDs and names of all detected onboard components
QList<int> unknownPackets; ///< Packet IDs which are unknown and have been received
MAVLinkProtocol* mavlink; ///< Reference to the MAVLink instance
MAVLinkProtocol *mavlink; ///< Reference to the MAVLink instance
float receiveDropRate; ///< Percentage of packets that were dropped on the MAV's receiving link (from GCS and other MAVs)
float sendDropRate; ///< Percentage of packets that were not received from the MAV by the GCS
@ -450,20 +463,21 @@ protected: //COMMENTS FOR TEST UNIT @@ -450,20 +463,21 @@ protected: //COMMENTS FOR TEST UNIT
/// SIMULATION
#ifndef __mobile__
QGCHilLink* simulation; ///< Hardware in the loop simulation link
QGCHilLink *simulation; ///< Hardware in the loop simulation link
#endif
public:
/** @brief Get the human-readable status message for this code */
void getStatusForCode(int statusCode, QString& uasState, QString& stateDescription);
void getStatusForCode(int statusCode, QString &uasState, QString &stateDescription);
#ifndef __mobile__
virtual FileManager* getFileManager() { return &fileManager; }
virtual FileManager *getFileManager() { return &fileManager; }
#endif
/** @brief Get the HIL simulation */
#ifndef __mobile__
QGCHilLink* getHILSimulation() const {
QGCHilLink *getHILSimulation() const
{
return simulation;
}
#endif
@ -480,7 +494,7 @@ public slots: @@ -480,7 +494,7 @@ public slots:
/** @brief Enable / disable HIL */
#ifndef __mobile__
void enableHilFlightGear(bool enable, QString options, bool sensorHil, QObject * configuration);
void enableHilFlightGear(bool enable, QString options, bool sensorHil, QObject *configuration);
void enableHilJSBSim(bool enable, QString options);
void enableHilXPlane(bool enable);
@ -548,45 +562,45 @@ public slots: @@ -548,45 +562,45 @@ public slots:
/** @brief Send command to disable all bindings/maps between RC and parameters */
void unsetRCToParameterMap();
signals:
void loadChanged(UASInterface* uas, double load);
void loadChanged(UASInterface *uas, double load);
void imageStarted(quint64 timestamp);
/** @brief A new camera image has arrived */
void imageReady(UASInterface* uas);
void imageReady(UASInterface *uas);
/** @brief HIL controls have changed */
void hilControlsChanged(quint64 time, float rollAilerons, float pitchElevator, float yawRudder, float throttle, quint8 systemMode, quint8 navMode);
/** @brief HIL actuator controls (replaces HIL controls) */
void hilActuatorControlsChanged(quint64 time, quint64 flags, float ctl_0, float ctl_1, float ctl_2, float ctl_3, float ctl_4, float ctl_5, float ctl_6, float ctl_7, float ctl_8, float ctl_9, float ctl_10, float ctl_11, float ctl_12, float ctl_13, float ctl_14, float ctl_15, quint8 mode);
void localXChanged(double val,QString name);
void localYChanged(double val,QString name);
void localZChanged(double val,QString name);
void longitudeChanged(double val,QString name);
void latitudeChanged(double val,QString name);
void altitudeAMSLChanged(double val,QString name);
void altitudeAMSLFTChanged(double val,QString name);
void altitudeRelativeChanged(double val,QString name);
void satRawHDOPChanged (double value);
void satRawVDOPChanged (double value);
void satRawCOGChanged (double value);
void rollChanged(double val,QString name);
void pitchChanged(double val,QString name);
void yawChanged(double val,QString name);
void satelliteCountChanged(double val,QString name);
void distToWaypointChanged(double val,QString name);
void localXChanged(double val, QString name);
void localYChanged(double val, QString name);
void localZChanged(double val, QString name);
void longitudeChanged(double val, QString name);
void latitudeChanged(double val, QString name);
void altitudeAMSLChanged(double val, QString name);
void altitudeAMSLFTChanged(double val, QString name);
void altitudeRelativeChanged(double val, QString name);
void satRawHDOPChanged(double value);
void satRawVDOPChanged(double value);
void satRawCOGChanged(double value);
void rollChanged(double val, QString name);
void pitchChanged(double val, QString name);
void yawChanged(double val, QString name);
void satelliteCountChanged(double val, QString name);
void distToWaypointChanged(double val, QString name);
void groundSpeedChanged(double val, QString name);
void airSpeedChanged(double val, QString name);
void bearingToWaypointChanged(double val,QString name);
void bearingToWaypointChanged(double val, QString name);
protected:
/** @brief Get the UNIX timestamp in milliseconds, enter microseconds */
quint64 getUnixTime(quint64 time=0);
quint64 getUnixTime(quint64 time = 0);
/** @brief Get the UNIX timestamp in milliseconds, enter milliseconds */
quint64 getUnixTimeFromMs(quint64 time);
/** @brief Get the UNIX timestamp in milliseconds, ignore attitudeStamped mode */
quint64 getUnixReferenceTime(quint64 time);
virtual void processParamValueMsg(mavlink_message_t& msg, const QString& paramName,const mavlink_param_value_t& rawValue, mavlink_param_union_t& paramValue);
virtual void processParamValueMsg(mavlink_message_t &msg, const QString &paramName, const mavlink_param_value_t &rawValue, mavlink_param_union_t &paramValue);
int componentID[256];
bool componentMulti[256];
@ -602,11 +616,11 @@ protected: @@ -602,11 +616,11 @@ protected:
quint64 lastSendTimeOpticalFlow; ///< Last HIL Optical Flow message sent
private:
void _say(const QString& text, int severity = 6);
void _say(const QString &text, int severity = 6);
private:
Vehicle* _vehicle;
FirmwarePluginManager* _firmwarePluginManager;
Vehicle *_vehicle;
FirmwarePluginManager *_firmwarePluginManager;
};

11
src/ui/QGCHilXPlaneConfiguration.cc

@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
#include "QGCXPlaneLink.h"
#include "QGCHilConfiguration.h"
QGCHilXPlaneConfiguration::QGCHilXPlaneConfiguration(QGCHilLink* link, QGCHilConfiguration *parent) :
QGCHilXPlaneConfiguration::QGCHilXPlaneConfiguration(QGCHilLink *link, QGCHilConfiguration *parent) :
QWidget(parent),
ui(new Ui::QGCHilXPlaneConfiguration)
{
@ -12,7 +12,7 @@ QGCHilXPlaneConfiguration::QGCHilXPlaneConfiguration(QGCHilLink* link, QGCHilCon @@ -12,7 +12,7 @@ QGCHilXPlaneConfiguration::QGCHilXPlaneConfiguration(QGCHilLink* link, QGCHilCon
connect(ui->startButton, &QPushButton::clicked, this, &QGCHilXPlaneConfiguration::toggleSimulation);
connect(ui->hostComboBox, static_cast<void (QComboBox::*)(const QString&)>(&QComboBox::activated),
connect(ui->hostComboBox, static_cast<void (QComboBox::*)(const QString &)>(&QComboBox::activated),
link, &QGCHilLink::setRemoteHost);
connect(link, &QGCHilLink::remoteChanged, ui->hostComboBox, &QComboBox::setEditText);
@ -23,7 +23,7 @@ QGCHilXPlaneConfiguration::QGCHilXPlaneConfiguration(QGCHilLink* link, QGCHilCon @@ -23,7 +23,7 @@ QGCHilXPlaneConfiguration::QGCHilXPlaneConfiguration(QGCHilLink* link, QGCHilCon
ui->startButton->setText(tr("Connect"));
QGCXPlaneLink* xplane = dynamic_cast<QGCXPlaneLink*>(link);
QGCXPlaneLink *xplane = dynamic_cast<QGCXPlaneLink *>(link);
if (xplane)
{
@ -58,17 +58,20 @@ void QGCHilXPlaneConfiguration::setVersion(int version) @@ -58,17 +58,20 @@ void QGCHilXPlaneConfiguration::setVersion(int version)
void QGCHilXPlaneConfiguration::toggleSimulation(bool connect)
{
if (!link) {
if (!link)
{
return;
}
Q_UNUSED(connect);
if (!link->isConnected())
{
link->setRemoteHost(ui->hostComboBox->currentText());
link->connectSimulation();
ui->startButton->setText(tr("Disconnect"));
}
else
{
link->disconnectSimulation();

Loading…
Cancel
Save