1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-20 10:54:14 +01:00

Freebie: implemented access to the UAVObject description in GCS-side UAVObjects, and added support for this in the UAVObject browser: leave your mouse over the name of a UAVObject and the tooltip will show the description. Nice, eh?

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2273 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
edouard 2010-12-22 21:29:23 +00:00 committed by edouard
parent bb1d5e8b2e
commit d72d4fa4d2
81 changed files with 198 additions and 12 deletions

View File

@ -53,6 +53,12 @@ public:
int childCount() const;
int columnCount() const;
QVariant data(int column = 1) const;
QString description() { return m_description; }
void setDescription(QString d) { // Split around 40 characters
int idx = d.indexOf(" ",40);
d.insert(idx,QString("<br>"));
m_description = d;
}
// only column 1 (TreeItem::dataColumn) is changed with setData currently
// other columns are initialized in constructor
virtual void setData(QVariant value, int column = 1);
@ -78,8 +84,9 @@ private slots:
private:
QList<TreeItem*> m_children;
// m_data contains: [0] property name, [1] value, and [2] unit
// m_data contains: [0] property name, [1] value, [2] unit
QList<QVariant> m_data;
QString m_description;
TreeItem *m_parent;
bool m_highlight;
bool m_changed;
@ -120,7 +127,7 @@ public:
TreeItem(data, parent), m_obj(0) { }
ObjectTreeItem(const QVariant &data, TreeItem *parent = 0) :
TreeItem(data, parent), m_obj(0) { }
void setObject(UAVObject *obj) { m_obj = obj; }
void setObject(UAVObject *obj) { m_obj = obj; setDescription(obj->getDescription()); }
inline UAVObject *object() { return m_obj; }
private:
UAVObject *m_obj;

View File

@ -281,6 +281,11 @@ QVariant UAVObjectTreeModel::data(const QModelIndex &index, int role) const
// if (role == Qt::DecorationRole)
// return QIcon(":/core/images/openpilot_logo_128.png");
if (role == Qt::ToolTipRole) {
TreeItem *item = static_cast<TreeItem*>(index.internalPointer());
return item->description();
}
TreeItem *item = static_cast<TreeItem*>(index.internalPointer());
if (index.column() == 0 && role == Qt::BackgroundRole) {

View File

@ -292,20 +292,21 @@ function [] = OPLogConvert()
pipxtrememodemsettingsIdx = 1;
PipXtremeModemSettings.timestamp = 0;
PipXtremeModemSettings(1).Mode = 0;
PipXtremeModemSettings(1).Serial_Baudrate = 0;
PipXtremeModemSettings(1).Frequency_Calibration = 0;
PipXtremeModemSettings(1).Frequency_Min = 0;
PipXtremeModemSettings(1).Frequency_Max = 0;
PipXtremeModemSettings(1).Frequency = 0;
PipXtremeModemSettings(1).RF_Bandwidth = 0;
PipXtremeModemSettings(1).Max_RF_Bandwidth = 0;
PipXtremeModemSettings(1).Max_Tx_Power = 0;
PipXtremeModemSettings(1).AES_Encryption = 0;
PipXtremeModemSettings(1).AES_EncryptionKey = zeros(1,16);
PipXtremeModemSettings(1).Paired_Serial_Number_CRC = 0;
PipXtremeModemSettings(1).Paired_Serial_Number = 0;
pipxtrememodemstatusIdx = 1;
PipXtremeModemStatus.timestamp = 0;
PipXtremeModemStatus(1).Serial_Number = zeros(1,24);
PipXtremeModemStatus(1).Serial_Number_CRC = 0;
PipXtremeModemStatus(1).Serial_Number = 0;
PipXtremeModemStatus(1).Up_Time = 0;
PipXtremeModemStatus(1).Frequency = 0;
PipXtremeModemStatus(1).RF_Bandwidth = 0;
@ -487,10 +488,10 @@ function [] = OPLogConvert()
case 572614706
ObjectPersistence(objectpersistenceIdx) = ReadObjectPersistenceObject(fid, timestamp);
objectpersistenceIdx = objectpersistenceIdx + 1;
case 2660664364
case 3822692478
PipXtremeModemSettings(pipxtrememodemsettingsIdx) = ReadPipXtremeModemSettingsObject(fid, timestamp);
pipxtrememodemsettingsIdx = pipxtrememodemsettingsIdx + 1;
case 3920019084
case 539085060
PipXtremeModemStatus(pipxtrememodemstatusIdx) = ReadPipXtremeModemStatusObject(fid, timestamp);
pipxtrememodemstatusIdx = pipxtrememodemstatusIdx + 1;
case 3765671478
@ -1090,15 +1091,17 @@ function [PipXtremeModemSettings] = ReadPipXtremeModemSettingsObject(fid, timest
end
PipXtremeModemSettings.timestamp = timestamp;
PipXtremeModemSettings.Mode = double(fread(fid, 1, 'uint8'));
PipXtremeModemSettings.Serial_Baudrate = double(fread(fid, 1, 'uint8'));
PipXtremeModemSettings.Frequency_Calibration = double(fread(fid, 1, 'uint8'));
PipXtremeModemSettings.Frequency_Min = double(fread(fid, 1, 'uint32'));
PipXtremeModemSettings.Frequency_Max = double(fread(fid, 1, 'uint32'));
PipXtremeModemSettings.Frequency = double(fread(fid, 1, 'uint32'));
PipXtremeModemSettings.RF_Bandwidth = double(fread(fid, 1, 'uint8'));
PipXtremeModemSettings.Max_RF_Bandwidth = double(fread(fid, 1, 'uint8'));
PipXtremeModemSettings.Max_Tx_Power = double(fread(fid, 1, 'uint8'));
PipXtremeModemSettings.AES_Encryption = double(fread(fid, 1, 'uint8'));
PipXtremeModemSettings.AES_EncryptionKey = double(fread(fid, 16, 'uint8'));
PipXtremeModemSettings.Paired_Serial_Number_CRC = double(fread(fid, 1, 'uint32'));
PipXtremeModemSettings.Paired_Serial_Number = double(fread(fid, 1, 'uint32'));
% read CRC
fread(fid, 1, 'uint8');
end
@ -1112,8 +1115,7 @@ function [PipXtremeModemStatus] = ReadPipXtremeModemStatusObject(fid, timestamp)
end
PipXtremeModemStatus.timestamp = timestamp;
PipXtremeModemStatus.Serial_Number = double(fread(fid, 24, 'uint8'));
PipXtremeModemStatus.Serial_Number_CRC = double(fread(fid, 1, 'uint32'));
PipXtremeModemStatus.Serial_Number = double(fread(fid, 1, 'uint32'));
PipXtremeModemStatus.Up_Time = double(fread(fid, 1, 'uint32'));
PipXtremeModemStatus.Frequency = double(fread(fid, 1, 'uint32'));
PipXtremeModemStatus.RF_Bandwidth = double(fread(fid, 1, 'uint32'));

View File

@ -34,6 +34,7 @@
#include "uavobjectfield.h"
const QString ActuatorCommand::NAME = QString("ActuatorCommand");
const QString ActuatorCommand::DESCRIPTION = QString("Contains the pulse duration sent to each of the channels. Set by @ref ActuatorModule");
/**
* Constructor
@ -57,6 +58,8 @@ ActuatorCommand::ActuatorCommand(): UAVDataObject(OBJID, ISSINGLEINST, ISSETTING
initializeFields(fields, (quint8*)&data, NUMBYTES);
// Set the default field values
setDefaultFieldValues();
// Set the object description
setDescription(DESCRIPTION);
}
/**

View File

@ -56,6 +56,7 @@ public:
// Constants
static const quint32 OBJID = 3909877022U;
static const QString NAME;
static const QString DESCRIPTION;
static const bool ISSINGLEINST = 1;
static const bool ISSETTINGS = 0;
static const quint32 NUMBYTES = sizeof(DataFields);

View File

@ -34,6 +34,7 @@
#include "uavobjectfield.h"
const QString ActuatorDesired::NAME = QString("ActuatorDesired");
const QString ActuatorDesired::DESCRIPTION = QString("Desired raw, pitch and yaw actuator settings. Comes from either @ref StabilizationModule or @ref ManualControlModule depending on FlightMode.");
/**
* Constructor
@ -65,6 +66,8 @@ ActuatorDesired::ActuatorDesired(): UAVDataObject(OBJID, ISSINGLEINST, ISSETTING
initializeFields(fields, (quint8*)&data, NUMBYTES);
// Set the default field values
setDefaultFieldValues();
// Set the object description
setDescription(DESCRIPTION);
}
/**

View File

@ -64,6 +64,7 @@ public:
// Constants
static const quint32 OBJID = 3562104706U;
static const QString NAME;
static const QString DESCRIPTION;
static const bool ISSINGLEINST = 1;
static const bool ISSETTINGS = 0;
static const quint32 NUMBYTES = sizeof(DataFields);

View File

@ -34,6 +34,7 @@
#include "uavobjectfield.h"
const QString ActuatorSettings::NAME = QString("ActuatorSettings");
const QString ActuatorSettings::DESCRIPTION = QString("Settings for the @ref ActuatorModule that controls the channel assignments for the mixer based on AircraftType");
/**
* Constructor
@ -263,6 +264,8 @@ ActuatorSettings::ActuatorSettings(): UAVDataObject(OBJID, ISSINGLEINST, ISSETTI
initializeFields(fields, (quint8*)&data, NUMBYTES);
// Set the default field values
setDefaultFieldValues();
// Set the object description
setDescription(DESCRIPTION);
}
/**

View File

@ -124,6 +124,7 @@ public:
// Constants
static const quint32 OBJID = 3054509114U;
static const QString NAME;
static const QString DESCRIPTION;
static const bool ISSINGLEINST = 1;
static const bool ISSETTINGS = 1;
static const quint32 NUMBYTES = sizeof(DataFields);

View File

@ -34,6 +34,7 @@
#include "uavobjectfield.h"
const QString AHRSCalibration::NAME = QString("AHRSCalibration");
const QString AHRSCalibration::DESCRIPTION = QString("Contains the calibration settings for the @ref AHRSCommsModule");
/**
* Constructor
@ -104,6 +105,8 @@ AHRSCalibration::AHRSCalibration(): UAVDataObject(OBJID, ISSINGLEINST, ISSETTING
initializeFields(fields, (quint8*)&data, NUMBYTES);
// Set the default field values
setDefaultFieldValues();
// Set the object description
setDescription(DESCRIPTION);
}
/**

View File

@ -114,6 +114,7 @@ public:
// Constants
static const quint32 OBJID = 3761202980U;
static const QString NAME;
static const QString DESCRIPTION;
static const bool ISSINGLEINST = 1;
static const bool ISSETTINGS = 1;
static const quint32 NUMBYTES = sizeof(DataFields);

View File

@ -34,6 +34,7 @@
#include "uavobjectfield.h"
const QString AHRSSettings::NAME = QString("AHRSSettings");
const QString AHRSSettings::DESCRIPTION = QString("Settings for the @ref AHRSCommsModule to control the algorithm and what is updated");
/**
* Constructor
@ -76,6 +77,8 @@ AHRSSettings::AHRSSettings(): UAVDataObject(OBJID, ISSINGLEINST, ISSETTINGS, NAM
initializeFields(fields, (quint8*)&data, NUMBYTES);
// Set the default field values
setDefaultFieldValues();
// Set the object description
setDescription(DESCRIPTION);
}
/**

View File

@ -70,6 +70,7 @@ public:
// Constants
static const quint32 OBJID = 3741078856U;
static const QString NAME;
static const QString DESCRIPTION;
static const bool ISSINGLEINST = 1;
static const bool ISSETTINGS = 1;
static const quint32 NUMBYTES = sizeof(DataFields);

View File

@ -34,6 +34,7 @@
#include "uavobjectfield.h"
const QString AhrsStatus::NAME = QString("AhrsStatus");
const QString AhrsStatus::DESCRIPTION = QString("Status for the @ref AHRSCommsModule, including communication errors");
/**
* Constructor
@ -99,6 +100,8 @@ AhrsStatus::AhrsStatus(): UAVDataObject(OBJID, ISSINGLEINST, ISSETTINGS, NAME)
initializeFields(fields, (quint8*)&data, NUMBYTES);
// Set the default field values
setDefaultFieldValues();
// Set the object description
setDescription(DESCRIPTION);
}
/**

View File

@ -84,6 +84,7 @@ public:
// Constants
static const quint32 OBJID = 933623714U;
static const QString NAME;
static const QString DESCRIPTION;
static const bool ISSINGLEINST = 1;
static const bool ISSETTINGS = 0;
static const quint32 NUMBYTES = sizeof(DataFields);

View File

@ -34,6 +34,7 @@
#include "uavobjectfield.h"
const QString AttitudeActual::NAME = QString("AttitudeActual");
const QString AttitudeActual::DESCRIPTION = QString("The updated Attitude estimation from @ref AHRSCommsModule.");
/**
* Constructor
@ -68,6 +69,8 @@ AttitudeActual::AttitudeActual(): UAVDataObject(OBJID, ISSINGLEINST, ISSETTINGS,
initializeFields(fields, (quint8*)&data, NUMBYTES);
// Set the default field values
setDefaultFieldValues();
// Set the object description
setDescription(DESCRIPTION);
}
/**

View File

@ -66,6 +66,7 @@ public:
// Constants
static const quint32 OBJID = 4233858292U;
static const QString NAME;
static const QString DESCRIPTION;
static const bool ISSINGLEINST = 1;
static const bool ISSETTINGS = 0;
static const quint32 NUMBYTES = sizeof(DataFields);

View File

@ -34,6 +34,7 @@
#include "uavobjectfield.h"
const QString AttitudeDesired::NAME = QString("AttitudeDesired");
const QString AttitudeDesired::DESCRIPTION = QString("The desired attitude that @ref StabilizationModule will try and achieve if FlightMode is Stabilized. Comes from @ref ManaulControlModule.");
/**
* Constructor
@ -59,6 +60,8 @@ AttitudeDesired::AttitudeDesired(): UAVDataObject(OBJID, ISSINGLEINST, ISSETTING
initializeFields(fields, (quint8*)&data, NUMBYTES);
// Set the default field values
setDefaultFieldValues();
// Set the object description
setDescription(DESCRIPTION);
}
/**

View File

@ -60,6 +60,7 @@ public:
// Constants
static const quint32 OBJID = 1412270808U;
static const QString NAME;
static const QString DESCRIPTION;
static const bool ISSINGLEINST = 1;
static const bool ISSETTINGS = 0;
static const quint32 NUMBYTES = sizeof(DataFields);

View File

@ -34,6 +34,7 @@
#include "uavobjectfield.h"
const QString AttitudeRaw::NAME = QString("AttitudeRaw");
const QString AttitudeRaw::DESCRIPTION = QString("The raw attitude sensor data from @ref AHRSCommsModule. Not always updated.");
/**
* Constructor
@ -76,6 +77,8 @@ AttitudeRaw::AttitudeRaw(): UAVDataObject(OBJID, ISSINGLEINST, ISSETTINGS, NAME)
initializeFields(fields, (quint8*)&data, NUMBYTES);
// Set the default field values
setDefaultFieldValues();
// Set the object description
setDescription(DESCRIPTION);
}
/**

View File

@ -88,6 +88,7 @@ public:
// Constants
static const quint32 OBJID = 1323193976U;
static const QString NAME;
static const QString DESCRIPTION;
static const bool ISSINGLEINST = 1;
static const bool ISSETTINGS = 0;
static const quint32 NUMBYTES = sizeof(DataFields);

View File

@ -34,6 +34,7 @@
#include "uavobjectfield.h"
const QString BaroAltitude::NAME = QString("BaroAltitude");
const QString BaroAltitude::DESCRIPTION = QString("The raw data from the barometric sensor with pressure, temperature and altitude estimate.");
/**
* Constructor
@ -56,6 +57,8 @@ BaroAltitude::BaroAltitude(): UAVDataObject(OBJID, ISSINGLEINST, ISSETTINGS, NAM
initializeFields(fields, (quint8*)&data, NUMBYTES);
// Set the default field values
setDefaultFieldValues();
// Set the object description
setDescription(DESCRIPTION);
}
/**

View File

@ -58,6 +58,7 @@ public:
// Constants
static const quint32 OBJID = 3980666102U;
static const QString NAME;
static const QString DESCRIPTION;
static const bool ISSINGLEINST = 1;
static const bool ISSETTINGS = 0;
static const quint32 NUMBYTES = sizeof(DataFields);

View File

@ -34,6 +34,7 @@
#include "uavobjectfield.h"
const QString FirmwareIAPObj::NAME = QString("FirmwareIAPObj");
const QString FirmwareIAPObj::DESCRIPTION = QString("Firmware IAP");
/**
* Constructor
@ -164,6 +165,8 @@ FirmwareIAPObj::FirmwareIAPObj(): UAVDataObject(OBJID, ISSINGLEINST, ISSETTINGS,
initializeFields(fields, (quint8*)&data, NUMBYTES);
// Set the default field values
setDefaultFieldValues();
// Set the object description
setDescription(DESCRIPTION);
}
/**

View File

@ -66,6 +66,7 @@ public:
// Constants
static const quint32 OBJID = 879185696U;
static const QString NAME;
static const QString DESCRIPTION;
static const bool ISSINGLEINST = 1;
static const bool ISSETTINGS = 0;
static const quint32 NUMBYTES = sizeof(DataFields);

View File

@ -34,6 +34,7 @@
#include "uavobjectfield.h"
const QString FlightBatteryState::NAME = QString("FlightBatteryState");
const QString FlightBatteryState::DESCRIPTION = QString("Battery status information. Not currently updated.");
/**
* Constructor
@ -56,6 +57,8 @@ FlightBatteryState::FlightBatteryState(): UAVDataObject(OBJID, ISSINGLEINST, ISS
initializeFields(fields, (quint8*)&data, NUMBYTES);
// Set the default field values
setDefaultFieldValues();
// Set the object description
setDescription(DESCRIPTION);
}
/**

View File

@ -58,6 +58,7 @@ public:
// Constants
static const quint32 OBJID = 144318184U;
static const QString NAME;
static const QString DESCRIPTION;
static const bool ISSINGLEINST = 1;
static const bool ISSETTINGS = 0;
static const quint32 NUMBYTES = sizeof(DataFields);

View File

@ -34,6 +34,7 @@
#include "uavobjectfield.h"
const QString FlightTelemetryStats::NAME = QString("FlightTelemetryStats");
const QString FlightTelemetryStats::DESCRIPTION = QString("Maintains the telemetry statistics from the OpenPilot flight computer.");
/**
* Constructor
@ -70,6 +71,8 @@ FlightTelemetryStats::FlightTelemetryStats(): UAVDataObject(OBJID, ISSINGLEINST,
initializeFields(fields, (quint8*)&data, NUMBYTES);
// Set the default field values
setDefaultFieldValues();
// Set the object description
setDescription(DESCRIPTION);
}
/**

View File

@ -66,6 +66,7 @@ public:
// Constants
static const quint32 OBJID = 1712072286U;
static const QString NAME;
static const QString DESCRIPTION;
static const bool ISSINGLEINST = 1;
static const bool ISSETTINGS = 0;
static const quint32 NUMBYTES = sizeof(DataFields);

View File

@ -34,6 +34,7 @@
#include "uavobjectfield.h"
const QString GCSTelemetryStats::NAME = QString("GCSTelemetryStats");
const QString GCSTelemetryStats::DESCRIPTION = QString("The telemetry statistics from the ground computer");
/**
* Constructor
@ -70,6 +71,8 @@ GCSTelemetryStats::GCSTelemetryStats(): UAVDataObject(OBJID, ISSINGLEINST, ISSET
initializeFields(fields, (quint8*)&data, NUMBYTES);
// Set the default field values
setDefaultFieldValues();
// Set the object description
setDescription(DESCRIPTION);
}
/**

View File

@ -66,6 +66,7 @@ public:
// Constants
static const quint32 OBJID = 1998458950U;
static const QString NAME;
static const QString DESCRIPTION;
static const bool ISSINGLEINST = 1;
static const bool ISSETTINGS = 0;
static const quint32 NUMBYTES = sizeof(DataFields);

View File

@ -34,6 +34,7 @@
#include "uavobjectfield.h"
const QString GPSPosition::NAME = QString("GPSPosition");
const QString GPSPosition::DESCRIPTION = QString("Future object for the raw GPS data from @ref GPSModule. Only should be used by @ref AHRSCommsModule.");
/**
* Constructor
@ -85,6 +86,8 @@ GPSPosition::GPSPosition(): UAVDataObject(OBJID, ISSINGLEINST, ISSETTINGS, NAME)
initializeFields(fields, (quint8*)&data, NUMBYTES);
// Set the default field values
setDefaultFieldValues();
// Set the object description
setDescription(DESCRIPTION);
}
/**

View File

@ -76,6 +76,7 @@ public:
// Constants
static const quint32 OBJID = 3041480770U;
static const QString NAME;
static const QString DESCRIPTION;
static const bool ISSINGLEINST = 1;
static const bool ISSETTINGS = 0;
static const quint32 NUMBYTES = sizeof(DataFields);

View File

@ -34,6 +34,7 @@
#include "uavobjectfield.h"
const QString GPSSatellites::NAME = QString("GPSSatellites");
const QString GPSSatellites::DESCRIPTION = QString("Contains information about the GPS satellites in view from @ref GPSModule.");
/**
* Constructor
@ -122,6 +123,8 @@ GPSSatellites::GPSSatellites(): UAVDataObject(OBJID, ISSINGLEINST, ISSETTINGS, N
initializeFields(fields, (quint8*)&data, NUMBYTES);
// Set the default field values
setDefaultFieldValues();
// Set the object description
setDescription(DESCRIPTION);
}
/**

View File

@ -70,6 +70,7 @@ public:
// Constants
static const quint32 OBJID = 3593446318U;
static const QString NAME;
static const QString DESCRIPTION;
static const bool ISSINGLEINST = 1;
static const bool ISSETTINGS = 0;
static const quint32 NUMBYTES = sizeof(DataFields);

View File

@ -34,6 +34,7 @@
#include "uavobjectfield.h"
const QString GPSTime::NAME = QString("GPSTime");
const QString GPSTime::DESCRIPTION = QString("Contains the GPS time from @ref GPSModule. Required to compute the world magnetic model correctly when setting the home location.");
/**
* Constructor
@ -65,6 +66,8 @@ GPSTime::GPSTime(): UAVDataObject(OBJID, ISSINGLEINST, ISSETTINGS, NAME)
initializeFields(fields, (quint8*)&data, NUMBYTES);
// Set the default field values
setDefaultFieldValues();
// Set the object description
setDescription(DESCRIPTION);
}
/**

View File

@ -64,6 +64,7 @@ public:
// Constants
static const quint32 OBJID = 1459613858U;
static const QString NAME;
static const QString DESCRIPTION;
static const bool ISSINGLEINST = 1;
static const bool ISSETTINGS = 0;
static const quint32 NUMBYTES = sizeof(DataFields);

View File

@ -34,6 +34,7 @@
#include "uavobjectfield.h"
const QString GuidanceSettings::NAME = QString("GuidanceSettings");
const QString GuidanceSettings::DESCRIPTION = QString("Settings for the @ref GuidanceModule");
/**
* Constructor
@ -96,6 +97,8 @@ GuidanceSettings::GuidanceSettings(): UAVDataObject(OBJID, ISSINGLEINST, ISSETTI
initializeFields(fields, (quint8*)&data, NUMBYTES);
// Set the default field values
setDefaultFieldValues();
// Set the object description
setDescription(DESCRIPTION);
}
/**

View File

@ -84,6 +84,7 @@ public:
// Constants
static const quint32 OBJID = 2071403670U;
static const QString NAME;
static const QString DESCRIPTION;
static const bool ISSINGLEINST = 1;
static const bool ISSETTINGS = 1;
static const quint32 NUMBYTES = sizeof(DataFields);

View File

@ -34,6 +34,7 @@
#include "uavobjectfield.h"
const QString HomeLocation::NAME = QString("HomeLocation");
const QString HomeLocation::DESCRIPTION = QString("HomeLocation setting which contains the constants to tranlate from longitutde and latitude to NED reference frame. Automatically set by @ref GPSModule after acquiring a 3D lock. Used by @ref AHRSCommsModule.");
/**
* Constructor
@ -83,6 +84,8 @@ HomeLocation::HomeLocation(): UAVDataObject(OBJID, ISSINGLEINST, ISSETTINGS, NAM
initializeFields(fields, (quint8*)&data, NUMBYTES);
// Set the default field values
setDefaultFieldValues();
// Set the object description
setDescription(DESCRIPTION);
}
/**

View File

@ -74,6 +74,7 @@ public:
// Constants
static const quint32 OBJID = 3590360786U;
static const QString NAME;
static const QString DESCRIPTION;
static const bool ISSINGLEINST = 1;
static const bool ISSETTINGS = 1;
static const quint32 NUMBYTES = sizeof(DataFields);

View File

@ -34,6 +34,7 @@
#include "uavobjectfield.h"
const QString I2CStats::NAME = QString("I2CStats");
const QString I2CStats::DESCRIPTION = QString("Tracks statistics on the I2C bus.");
/**
* Constructor
@ -77,6 +78,8 @@ I2CStats::I2CStats(): UAVDataObject(OBJID, ISSINGLEINST, ISSETTINGS, NAME)
initializeFields(fields, (quint8*)&data, NUMBYTES);
// Set the default field values
setDefaultFieldValues();
// Set the object description
setDescription(DESCRIPTION);
}
/**

View File

@ -70,6 +70,7 @@ public:
// Constants
static const quint32 OBJID = 1063893720U;
static const QString NAME;
static const QString DESCRIPTION;
static const bool ISSINGLEINST = 1;
static const bool ISSETTINGS = 0;
static const quint32 NUMBYTES = sizeof(DataFields);

View File

@ -34,6 +34,7 @@
#include "uavobjectfield.h"
const QString ManualControlCommand::NAME = QString("ManualControlCommand");
const QString ManualControlCommand::DESCRIPTION = QString("The output from the @ref ManualControlModule which descodes the receiver inputs. Overriden by GCS for fly-by-wire control.");
/**
* Constructor
@ -106,6 +107,8 @@ ManualControlCommand::ManualControlCommand(): UAVDataObject(OBJID, ISSINGLEINST,
initializeFields(fields, (quint8*)&data, NUMBYTES);
// Set the default field values
setDefaultFieldValues();
// Set the object description
setDescription(DESCRIPTION);
}
/**

View File

@ -90,6 +90,7 @@ public:
// Constants
static const quint32 OBJID = 2841592332U;
static const QString NAME;
static const QString DESCRIPTION;
static const bool ISSINGLEINST = 1;
static const bool ISSETTINGS = 0;
static const quint32 NUMBYTES = sizeof(DataFields);

View File

@ -34,6 +34,7 @@
#include "uavobjectfield.h"
const QString ManualControlSettings::NAME = QString("ManualControlSettings");
const QString ManualControlSettings::DESCRIPTION = QString("Settings to indicate how to decode receiver input by @ref ManualControlModule.");
/**
* Constructor
@ -239,6 +240,8 @@ ManualControlSettings::ManualControlSettings(): UAVDataObject(OBJID, ISSINGLEINS
initializeFields(fields, (quint8*)&data, NUMBYTES);
// Set the default field values
setDefaultFieldValues();
// Set the object description
setDescription(DESCRIPTION);
}
/**

View File

@ -138,6 +138,7 @@ public:
// Constants
static const quint32 OBJID = 157988682U;
static const QString NAME;
static const QString DESCRIPTION;
static const bool ISSINGLEINST = 1;
static const bool ISSETTINGS = 1;
static const quint32 NUMBYTES = sizeof(DataFields);

View File

@ -34,6 +34,7 @@
#include "uavobjectfield.h"
const QString MixerSettings::NAME = QString("MixerSettings");
const QString MixerSettings::DESCRIPTION = QString("Settings for the @ref ActuatorModule that controls the channel assignments for the mixer based on AircraftType");
/**
* Constructor
@ -185,6 +186,8 @@ MixerSettings::MixerSettings(): UAVDataObject(OBJID, ISSINGLEINST, ISSETTINGS, N
initializeFields(fields, (quint8*)&data, NUMBYTES);
// Set the default field values
setDefaultFieldValues();
// Set the object description
setDescription(DESCRIPTION);
}
/**

View File

@ -152,6 +152,7 @@ public:
// Constants
static const quint32 OBJID = 1336817486U;
static const QString NAME;
static const QString DESCRIPTION;
static const bool ISSINGLEINST = 1;
static const bool ISSETTINGS = 1;
static const quint32 NUMBYTES = sizeof(DataFields);

View File

@ -34,6 +34,7 @@
#include "uavobjectfield.h"
const QString MixerStatus::NAME = QString("MixerStatus");
const QString MixerStatus::DESCRIPTION = QString("Status for the matrix mixer showing the output of each mixer after all scaling");
/**
* Constructor
@ -71,6 +72,8 @@ MixerStatus::MixerStatus(): UAVDataObject(OBJID, ISSINGLEINST, ISSETTINGS, NAME)
initializeFields(fields, (quint8*)&data, NUMBYTES);
// Set the default field values
setDefaultFieldValues();
// Set the object description
setDescription(DESCRIPTION);
}
/**

View File

@ -68,6 +68,7 @@ public:
// Constants
static const quint32 OBJID = 4137893648U;
static const QString NAME;
static const QString DESCRIPTION;
static const bool ISSINGLEINST = 1;
static const bool ISSETTINGS = 0;
static const quint32 NUMBYTES = sizeof(DataFields);

View File

@ -34,6 +34,7 @@
#include "uavobjectfield.h"
const QString ObjectPersistence::NAME = QString("ObjectPersistence");
const QString ObjectPersistence::DESCRIPTION = QString("Someone who knows please enter this");
/**
* Constructor
@ -68,6 +69,8 @@ ObjectPersistence::ObjectPersistence(): UAVDataObject(OBJID, ISSINGLEINST, ISSET
initializeFields(fields, (quint8*)&data, NUMBYTES);
// Set the default field values
setDefaultFieldValues();
// Set the object description
setDescription(DESCRIPTION);
}
/**

View File

@ -64,6 +64,7 @@ public:
// Constants
static const quint32 OBJID = 572614706U;
static const QString NAME;
static const QString DESCRIPTION;
static const bool ISSINGLEINST = 1;
static const bool ISSETTINGS = 0;
static const quint32 NUMBYTES = sizeof(DataFields);

View File

@ -34,6 +34,7 @@
#include "uavobjectfield.h"
const QString PipXtremeModemSettings::NAME = QString("PipXtremeModemSettings");
const QString PipXtremeModemSettings::DESCRIPTION = QString("Settings for the @ref PipXtremeModemSettings");
/**
* Constructor
@ -135,6 +136,8 @@ PipXtremeModemSettings::PipXtremeModemSettings(): UAVDataObject(OBJID, ISSINGLEI
initializeFields(fields, (quint8*)&data, NUMBYTES);
// Set the default field values
setDefaultFieldValues();
// Set the object description
setDescription(DESCRIPTION);
}
/**

View File

@ -86,6 +86,7 @@ public:
// Constants
static const quint32 OBJID = 3822692478U;
static const QString NAME;
static const QString DESCRIPTION;
static const bool ISSINGLEINST = 1;
static const bool ISSETTINGS = 1;
static const quint32 NUMBYTES = sizeof(DataFields);

View File

@ -34,6 +34,7 @@
#include "uavobjectfield.h"
const QString PipXtremeModemStatus::NAME = QString("PipXtremeModemStatus");
const QString PipXtremeModemStatus::DESCRIPTION = QString("Status for the @ref PipXtremeModem");
/**
* Constructor
@ -79,6 +80,8 @@ PipXtremeModemStatus::PipXtremeModemStatus(): UAVDataObject(OBJID, ISSINGLEINST,
initializeFields(fields, (quint8*)&data, NUMBYTES);
// Set the default field values
setDefaultFieldValues();
// Set the object description
setDescription(DESCRIPTION);
}
/**

View File

@ -72,6 +72,7 @@ public:
// Constants
static const quint32 OBJID = 539085060U;
static const QString NAME;
static const QString DESCRIPTION;
static const bool ISSINGLEINST = 1;
static const bool ISSETTINGS = 0;
static const quint32 NUMBYTES = sizeof(DataFields);

View File

@ -34,6 +34,7 @@
#include "uavobjectfield.h"
const QString PositionActual::NAME = QString("PositionActual");
const QString PositionActual::DESCRIPTION = QString("Contains the current position relative to @ref HomeLocation");
/**
* Constructor
@ -56,6 +57,8 @@ PositionActual::PositionActual(): UAVDataObject(OBJID, ISSINGLEINST, ISSETTINGS,
initializeFields(fields, (quint8*)&data, NUMBYTES);
// Set the default field values
setDefaultFieldValues();
// Set the object description
setDescription(DESCRIPTION);
}
/**

View File

@ -58,6 +58,7 @@ public:
// Constants
static const quint32 OBJID = 3765671478U;
static const QString NAME;
static const QString DESCRIPTION;
static const bool ISSINGLEINST = 1;
static const bool ISSETTINGS = 0;
static const quint32 NUMBYTES = sizeof(DataFields);

View File

@ -34,6 +34,7 @@
#include "uavobjectfield.h"
const QString PositionDesired::NAME = QString("PositionDesired");
const QString PositionDesired::DESCRIPTION = QString("The position the craft is trying t achieve. Can come from GCS or @ref PathPlanner ");
/**
* Constructor
@ -56,6 +57,8 @@ PositionDesired::PositionDesired(): UAVDataObject(OBJID, ISSINGLEINST, ISSETTING
initializeFields(fields, (quint8*)&data, NUMBYTES);
// Set the default field values
setDefaultFieldValues();
// Set the object description
setDescription(DESCRIPTION);
}
/**

View File

@ -58,6 +58,7 @@ public:
// Constants
static const quint32 OBJID = 801433018U;
static const QString NAME;
static const QString DESCRIPTION;
static const bool ISSINGLEINST = 1;
static const bool ISSETTINGS = 0;
static const quint32 NUMBYTES = sizeof(DataFields);

View File

@ -34,6 +34,7 @@
#include "uavobjectfield.h"
const QString RateDesired::NAME = QString("RateDesired");
const QString RateDesired::DESCRIPTION = QString("Status for the matrix mixer showing the output of each mixer after all scaling");
/**
* Constructor
@ -56,6 +57,8 @@ RateDesired::RateDesired(): UAVDataObject(OBJID, ISSINGLEINST, ISSETTINGS, NAME)
initializeFields(fields, (quint8*)&data, NUMBYTES);
// Set the default field values
setDefaultFieldValues();
// Set the object description
setDescription(DESCRIPTION);
}
/**

View File

@ -58,6 +58,7 @@ public:
// Constants
static const quint32 OBJID = 3124868380U;
static const QString NAME;
static const QString DESCRIPTION;
static const bool ISSINGLEINST = 1;
static const bool ISSETTINGS = 0;
static const quint32 NUMBYTES = sizeof(DataFields);

View File

@ -34,6 +34,7 @@
#include "uavobjectfield.h"
const QString StabilizationSettings::NAME = QString("StabilizationSettings");
const QString StabilizationSettings::DESCRIPTION = QString("PID settings used by the Stabilization module to combine the @ref AttitudeActual and @ref AttitudeDesired to compute @ref ActuatorDesired");
/**
* Constructor
@ -96,6 +97,8 @@ StabilizationSettings::StabilizationSettings(): UAVDataObject(OBJID, ISSINGLEINS
initializeFields(fields, (quint8*)&data, NUMBYTES);
// Set the default field values
setDefaultFieldValues();
// Set the object description
setDescription(DESCRIPTION);
}
/**

View File

@ -106,6 +106,7 @@ public:
// Constants
static const quint32 OBJID = 3792991236U;
static const QString NAME;
static const QString DESCRIPTION;
static const bool ISSINGLEINST = 1;
static const bool ISSETTINGS = 1;
static const quint32 NUMBYTES = sizeof(DataFields);

View File

@ -34,6 +34,7 @@
#include "uavobjectfield.h"
const QString SystemAlarms::NAME = QString("SystemAlarms");
const QString SystemAlarms::DESCRIPTION = QString("Alarms from OpenPilot to indicate failure conditions or warnings. Set by various modules.");
/**
* Constructor
@ -64,6 +65,8 @@ SystemAlarms::SystemAlarms(): UAVDataObject(OBJID, ISSINGLEINST, ISSETTINGS, NAM
initializeFields(fields, (quint8*)&data, NUMBYTES);
// Set the default field values
setDefaultFieldValues();
// Set the object description
setDescription(DESCRIPTION);
}
/**

View File

@ -60,6 +60,7 @@ public:
// Constants
static const quint32 OBJID = 2311311584U;
static const QString NAME;
static const QString DESCRIPTION;
static const bool ISSINGLEINST = 1;
static const bool ISSETTINGS = 0;
static const quint32 NUMBYTES = sizeof(DataFields);

View File

@ -34,6 +34,7 @@
#include "uavobjectfield.h"
const QString SystemSettings::NAME = QString("SystemSettings");
const QString SystemSettings::DESCRIPTION = QString("Select airframe type. Currently used by @ref ActuatorModule to choose mixing from @ref ActuatorDesired to @ref ActuatorCommand");
/**
* Constructor
@ -67,6 +68,8 @@ SystemSettings::SystemSettings(): UAVDataObject(OBJID, ISSINGLEINST, ISSETTINGS,
initializeFields(fields, (quint8*)&data, NUMBYTES);
// Set the default field values
setDefaultFieldValues();
// Set the object description
setDescription(DESCRIPTION);
}
/**

View File

@ -56,6 +56,7 @@ public:
// Constants
static const quint32 OBJID = 59202798U;
static const QString NAME;
static const QString DESCRIPTION;
static const bool ISSINGLEINST = 1;
static const bool ISSETTINGS = 1;
static const quint32 NUMBYTES = sizeof(DataFields);

View File

@ -34,6 +34,7 @@
#include "uavobjectfield.h"
const QString SystemStats::NAME = QString("SystemStats");
const QString SystemStats::DESCRIPTION = QString("CPU and memory usage from OpenPilot computer. ");
/**
* Constructor
@ -56,6 +57,8 @@ SystemStats::SystemStats(): UAVDataObject(OBJID, ISSINGLEINST, ISSETTINGS, NAME)
initializeFields(fields, (quint8*)&data, NUMBYTES);
// Set the default field values
setDefaultFieldValues();
// Set the object description
setDescription(DESCRIPTION);
}
/**

View File

@ -58,6 +58,7 @@ public:
// Constants
static const quint32 OBJID = 680908530U;
static const QString NAME;
static const QString DESCRIPTION;
static const bool ISSINGLEINST = 1;
static const bool ISSETTINGS = 0;
static const quint32 NUMBYTES = sizeof(DataFields);

View File

@ -34,6 +34,7 @@
#include "uavobjectfield.h"
const QString TelemetrySettings::NAME = QString("TelemetrySettings");
const QString TelemetrySettings::DESCRIPTION = QString("Select baud rate of telemetry. Warning - this must match your modem.");
/**
* Constructor
@ -58,6 +59,8 @@ TelemetrySettings::TelemetrySettings(): UAVDataObject(OBJID, ISSINGLEINST, ISSET
initializeFields(fields, (quint8*)&data, NUMBYTES);
// Set the default field values
setDefaultFieldValues();
// Set the object description
setDescription(DESCRIPTION);
}
/**

View File

@ -56,6 +56,7 @@ public:
// Constants
static const quint32 OBJID = 2785592614U;
static const QString NAME;
static const QString DESCRIPTION;
static const bool ISSINGLEINST = 1;
static const bool ISSETTINGS = 1;
static const quint32 NUMBYTES = sizeof(DataFields);

View File

@ -116,6 +116,23 @@ QString UAVObject::getName()
return name;
}
/**
* Get the description of the object
*/
QString UAVObject::getDescription()
{
return description;
}
/**
* Set the description of the object
*/
void UAVObject::setDescription(const QString& description)
{
this->description = description;
}
/**
* Get the total number of bytes of the object's data
*/

View File

@ -88,6 +88,7 @@ public:
quint32 getInstID();
bool isSingleInstance();
QString getName();
QString getDescription();
quint32 getNumBytes();
qint32 pack(quint8* dataOut);
qint32 unpack(const quint8* dataIn);
@ -128,12 +129,14 @@ protected:
quint32 instID;
bool isSingleInst;
QString name;
QString description;
quint32 numBytes;
QMutex* mutex;
quint8* data;
QList<UAVObjectField*> fields;
void initializeFields(QList<UAVObjectField*>& fields, quint8* data, quint32 numBytes);
void setDescription(const QString& description);
};
#endif // UAVOBJECT_H

View File

@ -34,6 +34,7 @@
#include "uavobjectfield.h"
const QString $(NAME)::NAME = QString("$(NAME)");
const QString $(NAME)::DESCRIPTION = QString("$(DESCRIPTION)");
/**
* Constructor
@ -47,6 +48,8 @@ $(FIELDSINIT)
initializeFields(fields, (quint8*)&data, NUMBYTES);
// Set the default field values
setDefaultFieldValues();
// Set the object description
setDescription(DESCRIPTION);
}
/**

View File

@ -52,6 +52,7 @@ $(DATAFIELDINFO)
// Constants
static const quint32 OBJID = $(OBJID)U;
static const QString NAME;
static const QString DESCRIPTION;
static const bool ISSINGLEINST = $(ISSINGLEINST);
static const bool ISSETTINGS = $(ISSETTINGS);
static const quint32 NUMBYTES = sizeof(DataFields);

View File

@ -34,6 +34,7 @@
#include "uavobjectfield.h"
const QString VelocityActual::NAME = QString("VelocityActual");
const QString VelocityActual::DESCRIPTION = QString("Updated by @ref AHRSCommsModule and used within @ref GuidanceModulefor velocity control");
/**
* Constructor
@ -56,6 +57,8 @@ VelocityActual::VelocityActual(): UAVDataObject(OBJID, ISSINGLEINST, ISSETTINGS,
initializeFields(fields, (quint8*)&data, NUMBYTES);
// Set the default field values
setDefaultFieldValues();
// Set the object description
setDescription(DESCRIPTION);
}
/**

View File

@ -58,6 +58,7 @@ public:
// Constants
static const quint32 OBJID = 1207999624U;
static const QString NAME;
static const QString DESCRIPTION;
static const bool ISSINGLEINST = 1;
static const bool ISSETTINGS = 0;
static const quint32 NUMBYTES = sizeof(DataFields);

View File

@ -34,6 +34,7 @@
#include "uavobjectfield.h"
const QString VelocityDesired::NAME = QString("VelocityDesired");
const QString VelocityDesired::DESCRIPTION = QString("Used within @ref GuidanceModule to communicate between the task computing the desired velocity and the PID loop to achieve it (running at different rates).");
/**
* Constructor
@ -56,6 +57,8 @@ VelocityDesired::VelocityDesired(): UAVDataObject(OBJID, ISSINGLEINST, ISSETTING
initializeFields(fields, (quint8*)&data, NUMBYTES);
// Set the default field values
setDefaultFieldValues();
// Set the object description
setDescription(DESCRIPTION);
}
/**

View File

@ -58,6 +58,7 @@ public:
// Constants
static const quint32 OBJID = 305094202U;
static const QString NAME;
static const QString DESCRIPTION;
static const bool ISSINGLEINST = 1;
static const bool ISSETTINGS = 0;
static const quint32 NUMBYTES = sizeof(DataFields);