torstenandCopilot
7173785915
Major Changes:
- Merged latest Qt5 devel content from dlbo (292 files changed, 7 new dirs)
- Consolidated forward-declarations and include folders
- Removed unneeded modules per Niklas' repo check list
Build System Fixes:
- Fixed CMake VERSION_GREATER syntax in ParticipantManagement/CMakeLists.txt
- Added VLC packages (libvlc-dev, vlc-plugin-base) to docker_build.sh
- Added PostgreSQL dev packages (libpq-dev, postgresql-server-dev-all) to Dockerfile
- Fixed locale warnings (ANSI_X3.4-1968 → C.UTF-8)
- Fixed ArcGIS SDK path warnings when BUILD_ARCGIS=OFF
Code Generation Fixes:
- Fixed IDL enum collisions (PortType→CorePortType/DdsutPortType, PdmEventType)
- Fixed Grantlee template svc_translation.cpp.grantlee:
- Changed {{ idl_enum.name }}_def:: to {{ idl_enum.name }}::
- Fixed .underlying() calls for C++11 scoped enums (enum class)
- Removed generated files from repo (moc_*, *_dtc.h, *_ftc.h)
Validation:
- BUILD_RTI=ON: SUCCESS
- BUILD_RTI=OFF: SUCCESS
- C++17 standard maintained for RTI 7.7 compatibility
- Ubuntu 26.04 Docker environment verified
Remaining Warnings (expected):
- BgViewer, KDChart, KDReports, Poppler-Qt6 not found (optional features)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
53 lines
902 B
C++
53 lines
902 B
C++
/**
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
#pragma once
|
|
|
|
#include <QString>
|
|
|
|
namespace DifferentialGPS
|
|
{
|
|
class DgpsConfig
|
|
{
|
|
private:
|
|
DgpsConfig();
|
|
|
|
public:
|
|
DgpsConfig(DgpsConfig &) = delete;
|
|
|
|
static DgpsConfig &instance();
|
|
|
|
void readIniData(QString iniFileName = QLatin1String("dgps.ini"));
|
|
|
|
|
|
struct TrimbleConfig_t
|
|
{
|
|
int rxCycle_ms = 0;
|
|
QString ip[2];
|
|
quint16 port[2] = {};
|
|
};
|
|
|
|
const TrimbleConfig_t &getTrimbleConfig() const { return m_trimbleConfig; }
|
|
|
|
|
|
struct TetraConfig_t
|
|
{
|
|
int feedbackTimeout_ms = 0;
|
|
QString ip[2];
|
|
quint16 port[2] = {};
|
|
int issi[2] = {};
|
|
int broadcastIssi[2] = {};
|
|
};
|
|
|
|
const TetraConfig_t &getTetraConfig() const { return m_tetraConfig; }
|
|
|
|
|
|
private:
|
|
TrimbleConfig_t m_trimbleConfig;
|
|
TetraConfig_t m_tetraConfig;
|
|
|
|
};
|
|
} // namespace DifferentialGPS
|