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>
81 lines
1.5 KiB
C++
81 lines
1.5 KiB
C++
/**
|
|
* Converter serial to tcp
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Philipp Dassow, NLT, 30-11-2018
|
|
*/
|
|
#pragma once
|
|
|
|
#include <QObject>
|
|
#include <QSerialPort>
|
|
#include <QString>
|
|
#include <QTcpServer>
|
|
#include <QTcpSocket>
|
|
#include <QThread>
|
|
|
|
#include "logger.h"
|
|
|
|
namespace SerialToTcpConverter
|
|
{
|
|
class Converter;
|
|
class ConverterThread : public QThread
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
explicit ConverterThread(const QString &serialPortName,
|
|
int baudrate,
|
|
int tcpPort);
|
|
|
|
QString portName() const { return m_serialPortName; }
|
|
|
|
protected:
|
|
void run() override;
|
|
|
|
signals:
|
|
void connected(const QString &port);
|
|
|
|
private:
|
|
QString m_serialPortName;
|
|
int m_baudrate;
|
|
int m_tcpPort;
|
|
|
|
LOGGER_T &m_logger; // Logger-Object
|
|
};
|
|
|
|
class Converter : public QObject
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
explicit Converter(QObject* parent = nullptr);
|
|
~Converter();
|
|
|
|
bool init(const QString &serialPortName, int baudrate, int tcpPort);
|
|
|
|
private slots:
|
|
// serial
|
|
bool openSerialPort();
|
|
void readSerial();
|
|
void serialClosed();
|
|
void handleSerialError(QSerialPort::SerialPortError error);
|
|
// tcp
|
|
void newConnection();
|
|
void readTcp();
|
|
void tcpDisconnected();
|
|
void handleTcpError(QAbstractSocket::SocketError error);
|
|
|
|
private:
|
|
QSerialPort *m_serialPort;
|
|
QString m_serialPortName;
|
|
int m_baudrate;
|
|
|
|
QTcpServer *m_tcpServer;
|
|
QVector<QTcpSocket*> m_sockets;
|
|
|
|
LOGGER_T m_logger;
|
|
};
|
|
|
|
} //namespace SerialToTcpConverter
|