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>
93 lines
2.3 KiB
C++
93 lines
2.3 KiB
C++
/**
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
#include "trimble_if.h"
|
|
|
|
#include "mainthread.h"
|
|
#include "dgps_config.h"
|
|
|
|
#include <NGLLogger/NGLLoggerBootstrap.h>
|
|
#include <QTcpSocket>
|
|
#include <QHostAddress>
|
|
#include <QFile>
|
|
#include <QTimer>
|
|
|
|
namespace DifferentialGPS
|
|
{
|
|
TrimbleIF::TrimbleIF()
|
|
: TcpSocket("TrimbleIF")
|
|
, m_main(nullptr)
|
|
, m_rxCycle_ms(10000)
|
|
, m_socketTimeout(nullptr)
|
|
, m_socketReconnect(nullptr)
|
|
, m_threadIndex(0)
|
|
{
|
|
}
|
|
|
|
TrimbleIF::~TrimbleIF()
|
|
{
|
|
}
|
|
|
|
void TrimbleIF::startThread(int threadIndex, MainThread *main)
|
|
{
|
|
const DgpsConfig::TrimbleConfig_t &cfg = DgpsConfig::instance().getTrimbleConfig();
|
|
m_threadIndex = threadIndex;
|
|
m_main = main;
|
|
startThreadInternal(cfg.ip[threadIndex], cfg.port[threadIndex]);
|
|
}
|
|
|
|
void TrimbleIF::run()
|
|
{
|
|
m_socketTimeout = new QTimer;
|
|
connect(m_socketTimeout, &QTimer::timeout, this, &TrimbleIF::onTimeout);
|
|
m_socketReconnect = new QTimer;
|
|
m_socketReconnect->setInterval(60 * 1000);
|
|
connect(m_socketReconnect, &QTimer::timeout, this, &TrimbleIF::doConnect);
|
|
|
|
TcpSocket::run();
|
|
|
|
delete m_socketTimeout;
|
|
delete m_socketReconnect;
|
|
}
|
|
|
|
void TrimbleIF::onError(QAbstractSocket::SocketError err)
|
|
{
|
|
m_socketTimeout->stop(); // Timer anhalten
|
|
|
|
TcpSocket::onError(err); // Generelle Fehlerbehandlung
|
|
}
|
|
|
|
|
|
void TrimbleIF::onReadyRead()
|
|
{
|
|
DEBUG_LOG(m_logger) << "Reading " << m_socket->bytesAvailable()
|
|
<< " bytes from " << m_socket->peerAddress().toString()
|
|
<< ":" << m_socket->peerPort();
|
|
m_buf = m_socket->readAll();
|
|
|
|
m_main->addNewData(m_buf, m_threadIndex);
|
|
|
|
const DgpsConfig::TrimbleConfig_t &cfg = DgpsConfig::instance().getTrimbleConfig();
|
|
m_socketTimeout->start(3 * cfg.rxCycle_ms); // starte/ restarte timeout-Ueberwachung (3-fache Zykluszeit)
|
|
}
|
|
|
|
|
|
void TrimbleIF::onTimeout()
|
|
{
|
|
ERROR_LOG(m_logger) << "Socket timeout "
|
|
<< m_socket->peerAddress().toString()
|
|
<< ":" << m_socket->peerPort()
|
|
<< " - trying to reconnect in " << m_socketReconnect->interval() / 1000 << " seconds";
|
|
|
|
m_socketTimeout->stop(); // Timer anhalten
|
|
|
|
m_socket->disconnectFromHost();
|
|
if (m_socket->state() != QAbstractSocket::UnconnectedState)
|
|
m_socket->waitForDisconnected();
|
|
|
|
m_socketReconnect->start();
|
|
}
|
|
} // namespace DifferentialGPS
|