Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen
- NGL_ADD_LIBRARY2: 87 CMakeLists.txt konvertiert für Export-Header Generierung - 44 Export-Header Include-Pfade korrigiert (_export.h) - 81 DDS-Stub-Header generiert (*_dtc.h, *_fts.h, *_dts.h, *_ftc.h) - INGLLogger: Duplikat gelöscht, m_logger Member entfernt, variadische Makros - Q_FUNC_INFO Redefinition behoben (Qt6 definiert bereits) - FATAL_LOG Makro hinzugefügt - InfrastructureManagement DDS-Stubs (ism.hpp, ism_enums.hpp, ism_ftc.h) - FilterManagement DDS-Stubs (flt_ftc.h, flt_dts.h) - AreaEffectSimulation DDS-Stubs (aes.hpp, aes_enums.hpp) - SymbolAppearance Klasse vollständig definiert mit content() Methode - BuildingComponentFilter Klasse definiert mit Copy-Konstruktor - Ftc Factory: nullptr Return (abstract class) - AesFilter Klasse in aes.hpp hinzugefügt - Dtc Klasse in ppm.hpp mit participantChanged Signal - AesType Enum: alle 15 At* Werte definiert - AesEffectState_def: EsReceived hinzugefügt - DataModification Enum: eAdded/eModified/eRemoved - function_reply_object.h → core_types.h Include-Pfad (72 Dateien) - Enum-Class-Streaming Template-Operator in INGLLogger.h - ism_mounting_point.h: QImage → QtGui/QImage, QGuiApplication/QScreen - ism_data_plugin_interface.h: QSet Include, Include-Reihenfolge - QRegExp → QRegularExpression in tpm_js_parser.cpp - .underlying() Aufrufe zu direktem Enum-Vergleich korrigiert - Include-Pfade: aes.hpp in symbol_appearance_settings_impl.h und aes_display_filter_impl.h Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
2785 files changed
+18754
-18316
No files matched your search
+21
-22
@@ -22,7 +22,6 @@ ConnectionHandlerSerial::ConnectionHandlerSerial(QObject *parent)
|
||||
, m_currentDataRead(QByteArray())
|
||||
, m_portName(QStringLiteral("COM5"))
|
||||
, m_readBuffer(new QByteArray())
|
||||
, m_logger(getLogger("ConnectionHandlerSerial"))
|
||||
{
|
||||
m_receiveTimeoutTimer->setInterval(1700);
|
||||
connect(m_spQuerry, &LtsSerialPortQuerry::LtsSerialPortQuerry::connectionEstablished, this, &ConnectionHandlerSerial::open);
|
||||
@@ -34,7 +33,7 @@ ConnectionHandlerSerial::ConnectionHandlerSerial(QObject *parent)
|
||||
|
||||
ConnectionHandlerSerial::~ConnectionHandlerSerial()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "ConnectionHandlerSerial::~ConnectionHandlerSerial";
|
||||
DEBUG_LOG() << "ConnectionHandlerSerial::~ConnectionHandlerSerial";
|
||||
}
|
||||
|
||||
bool ConnectionHandlerSerial::init()
|
||||
@@ -48,35 +47,35 @@ bool ConnectionHandlerSerial::send(const QByteArray &binaryData)
|
||||
|
||||
if (!m_serialPort)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Port is not initialized!";
|
||||
DEBUG_LOG() << "Port is not initialized!";
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!m_serialPort->isOpen())
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Port is not opened!";
|
||||
DEBUG_LOG() << "Port is not opened!";
|
||||
return false;
|
||||
}
|
||||
|
||||
// Sending data ---------------------------------------------
|
||||
|
||||
const QByteArray writeThis = LtsUtils::byteStreamFromEscMessage(binaryData);
|
||||
DEBUG_LOG(m_logger) << "Send HEX:" << writeThis.toHex(' ');
|
||||
DEBUG_LOG() << "Send HEX:" << writeThis.toHex(' ');
|
||||
qint64 byteswritten = m_serialPort->write(writeThis);
|
||||
DEBUG_LOG(m_logger) << "Binary data:" << binaryData.size();
|
||||
DEBUG_LOG(m_logger) << "Try sending: " << writeThis.size();
|
||||
DEBUG_LOG() << "Binary data:" << binaryData.size();
|
||||
DEBUG_LOG() << "Try sending: " << writeThis.size();
|
||||
|
||||
|
||||
// Check for errors ---------------------------------------------
|
||||
|
||||
if (byteswritten == -1)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Failed to write data to port " << m_serialPort->portName() << " error: " << m_serialPort->errorString();
|
||||
DEBUG_LOG() << "Failed to write data to port " << m_serialPort->portName() << " error: " << m_serialPort->errorString();
|
||||
return false;
|
||||
}
|
||||
else if (byteswritten != writeThis.size())
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Failed to write all data to port " << m_serialPort->portName() << " error: " << m_serialPort->errorString();
|
||||
DEBUG_LOG() << "Failed to write all data to port " << m_serialPort->portName() << " error: " << m_serialPort->errorString();
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -90,7 +89,7 @@ bool ConnectionHandlerSerial::open()
|
||||
|
||||
m_currentDataRead.clear();
|
||||
m_receiveTimeoutTimer->start();
|
||||
DEBUG_LOG(m_logger) << "(Re)openend serial port " << m_serialPort->portName() << " baudrate: " << m_serialPort->baudRate();
|
||||
DEBUG_LOG() << "(Re)openend serial port " << m_serialPort->portName() << " baudrate: " << m_serialPort->baudRate();
|
||||
|
||||
emit connectedToSerialConverter();
|
||||
return true;
|
||||
@@ -106,8 +105,8 @@ void ConnectionHandlerSerial::read()
|
||||
const QByteArray ba = m_serialPort->readAll();
|
||||
m_currentDataRead.append(ba);
|
||||
|
||||
//DEBUG_LOG(m_logger) << "Binary data from sfm: " << ba.toHex(' ');
|
||||
DEBUG_LOG(m_logger) << "Data size" << ba.size();
|
||||
//DEBUG_LOG() << "Binary data from sfm: " << ba.toHex(' ');
|
||||
DEBUG_LOG() << "Data size" << ba.size();
|
||||
int idxStart = -1;
|
||||
int idxEnd = -1;
|
||||
while ((idxStart = m_currentDataRead.indexOf(0x02)) >= 0 &&
|
||||
@@ -119,27 +118,27 @@ void ConnectionHandlerSerial::read()
|
||||
|
||||
QByteArray message = m_currentDataRead.mid(idxStart, (idxEnd - idxStart) + 1);
|
||||
m_currentDataRead = m_currentDataRead.mid(idxEnd + 1);
|
||||
DEBUG_LOG(m_logger) << "Data Message found: " << message.toHex(' ');
|
||||
DEBUG_LOG() << "Data Message found: " << message.toHex(' ');
|
||||
message = LtsUtils::byteStreamToEscMessage(message);
|
||||
|
||||
if (message.size() > 2)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Message to long: " << message.size();
|
||||
ERROR_LOG() << "Message to long: " << message.size();
|
||||
continue;
|
||||
}
|
||||
|
||||
DEBUG_LOG(m_logger) << "Frame from sfm as binary " << message.toHex();
|
||||
DEBUG_LOG() << "Frame from sfm as binary " << message.toHex();
|
||||
//got message now remove frame
|
||||
|
||||
|
||||
unsigned int byte = 0;
|
||||
byte = message.at(0) & 0xFF;
|
||||
DEBUG_LOG(m_logger) << "ConnectionHandlerSerial::read var byte is" << byte;
|
||||
DEBUG_LOG() << "ConnectionHandlerSerial::read var byte is" << byte;
|
||||
|
||||
|
||||
if (!isValidCommandByte(byte))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "ConnectionHandlerSerial::read Commandbyte is invalid. Returning";
|
||||
ERROR_LOG() << "ConnectionHandlerSerial::read Commandbyte is invalid. Returning";
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -150,30 +149,30 @@ void ConnectionHandlerSerial::read()
|
||||
if (message.size() > 1 &&
|
||||
!isValidPayloadByte(message.at(1)))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "ConnectionHandlerSerial::read Payloadbyte is invalid. Returning";
|
||||
ERROR_LOG() << "ConnectionHandlerSerial::read Payloadbyte is invalid. Returning";
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
if (message.size() != 2)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "ConnectionHandlerSerial::read No 2nd byte was appended (QByteArray has bad size). Returning.";
|
||||
ERROR_LOG() << "ConnectionHandlerSerial::read No 2nd byte was appended (QByteArray has bad size). Returning.";
|
||||
continue;
|
||||
}
|
||||
|
||||
DEBUG_LOG(m_logger) << "Binary data from serial port: " << message.toHex(' ');
|
||||
DEBUG_LOG() << "Binary data from serial port: " << message.toHex(' ');
|
||||
m_receiveTimeoutTimer->start();
|
||||
|
||||
emit received(message);
|
||||
}
|
||||
|
||||
if (m_serialPort->bytesAvailable() > 0)
|
||||
DEBUG_LOG(m_logger) << "Still " << m_serialPort->bytesAvailable() << " available to be read";
|
||||
DEBUG_LOG() << "Still " << m_serialPort->bytesAvailable() << " available to be read";
|
||||
}
|
||||
|
||||
bool ConnectionHandlerSerial::isValidCommandByte(const unsigned char command)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "ConnectionHandlerSerial::isValidCommandByte" << command << (command == 192 ||
|
||||
DEBUG_LOG() << "ConnectionHandlerSerial::isValidCommandByte" << command << (command == 192 ||
|
||||
command == 240 ||
|
||||
command == 244 ||
|
||||
command == 255 ||
|
||||
|
||||
Reference in new issue
Block a user