BUILD_RTI: Fix 4 compile errors and add missing type headers
- generic_base.h: Fix dds::topic namespace issue, move RTI includes inside BUILD_RTI guard - wait_set_handler.h: Remove duplicate m_logger declarations (3→1) - pub_sub_base.cpp: Fix constructor initializer list syntax (.→,), add m_logger initialization - training_area_telegrams.h: Fix field naming (m_ prefix) for accessor methods - PdmComboBox CMakeLists.txt: Add BUILD_RTI AND TARGET guards for svcPdmCommon/svcPdmClient - PdmDataPlugin CMakeLists.txt: Wrap svcPdmClient link in BUILD_RTI guard - CMakeLists.txt: Add RTI_UNIX, RTI_POSIX_THREADS compile definitions, remove duplicate add_subdirectory - alm_types.h, ppm_types.h: Copy missing type headers from include/ directories Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
1 parent
c042faae9e
commit
ec75789fae
9 files changed
+157
-40
No files matched your search
+39
-18
@@ -372,8 +372,11 @@ enum class UAVState
|
||||
|
||||
struct Header
|
||||
{
|
||||
int equipmentNumber = 0;
|
||||
qint64 timeStamp = 0;
|
||||
int m_equipmentNumber = 0;
|
||||
qint64 m_timeStamp = 0;
|
||||
|
||||
int equipmentNumber() const { return m_equipmentNumber; }
|
||||
qint64 timeStamp() const { return m_timeStamp; }
|
||||
|
||||
static Header fromJson(const QJsonObject &obj);
|
||||
QJsonObject toJson() const;
|
||||
@@ -488,15 +491,25 @@ struct WlsParticipantState
|
||||
|
||||
struct BatteryState
|
||||
{
|
||||
int batteryPort;
|
||||
int batteryPercent;
|
||||
int voltage;
|
||||
int temperature;
|
||||
int frequency;
|
||||
int generic;
|
||||
int current;
|
||||
bool switchOrValue;
|
||||
QString serialNumber;
|
||||
int m_batteryPort;
|
||||
int m_batteryPercent;
|
||||
int m_voltage;
|
||||
int m_temperature;
|
||||
int m_frequency;
|
||||
int m_generic;
|
||||
int m_current;
|
||||
bool m_switchOrValue;
|
||||
QString m_serialNumber;
|
||||
|
||||
int batteryPort() const { return m_batteryPort; }
|
||||
int batteryPercent() const { return m_batteryPercent; }
|
||||
int voltage() const { return m_voltage; }
|
||||
int temperature() const { return m_temperature; }
|
||||
int frequency() const { return m_frequency; }
|
||||
int generic() const { return m_generic; }
|
||||
int current() const { return m_current; }
|
||||
bool switchOrValue() const { return m_switchOrValue; }
|
||||
QString serialNumber() const { return m_serialNumber; }
|
||||
|
||||
static BatteryState fromJson(const QJsonObject &obj);
|
||||
QJsonObject toJson() const;
|
||||
@@ -2279,13 +2292,21 @@ template <> struct Constraints<BatteryInfo>
|
||||
|
||||
struct BatteryAlarm : TrainingAreaTelegramTmpl<BatteryAlarm>
|
||||
{
|
||||
Header header;
|
||||
int id;
|
||||
QString description;
|
||||
bool acknowledge;
|
||||
bool condition;
|
||||
int uniqueAlarmNumber;
|
||||
qint64 alarmTime;
|
||||
Header m_header;
|
||||
int m_id;
|
||||
QString m_description;
|
||||
bool m_acknowledge;
|
||||
bool m_condition;
|
||||
int m_uniqueAlarmNumber;
|
||||
qint64 m_alarmTime;
|
||||
|
||||
Header header() const { return m_header; }
|
||||
TelegramId id() const { return static_cast<TelegramId>(m_id); }
|
||||
QString description() const { return m_description; }
|
||||
bool acknowledge() const { return m_acknowledge; }
|
||||
bool condition() const { return m_condition; }
|
||||
int uniqueAlarmNumber() const { return m_uniqueAlarmNumber; }
|
||||
qint64 alarmTime() const { return m_alarmTime; }
|
||||
|
||||
static BatteryAlarm fromJson(const QJsonObject &obj);
|
||||
QJsonObject toJson() const override;
|
||||
|
||||
Reference in new issue
Block a user