Migration of Legatus codebase to Qt6 with RTI Connext DDS 7.7 integration is partially complete. Core DDS targets build successfully, but ProjectDataManagement module blocks full ddsfts compilation due to IDL definition conflicts.
This commit is contained in:
256 files changed
+1170
-610
No files matched your search
@@ -7,6 +7,7 @@
|
||||
*/
|
||||
#include <QtCore/QTime>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QtCore/QRegularExpression>
|
||||
#include "nmea_handler.h"
|
||||
namespace NmeaManagement
|
||||
{
|
||||
@@ -64,7 +65,7 @@ void NmeaHandler::IIXDR(QString package)
|
||||
|
||||
NmeaManagement::BatteryState batteryState;
|
||||
NmeaManagement::ServiceControl serviceControl;
|
||||
QRegExp sep(QStringLiteral("(\\,|\\*)"));
|
||||
QRegularExpression sep(QStringLiteral("(\\,|\\*)"));
|
||||
QStringList pkt_data = package.split(sep.pattern());
|
||||
INFO_LOG(m_logger) << "----------------------------------------------------";
|
||||
INFO_LOG(m_logger) << "batteryState pkt_data.size=" << pkt_data.size();
|
||||
@@ -185,7 +186,7 @@ qint64 NmeaHandler::getDateTime(QString receivedTimeStr)
|
||||
void NmeaHandler::IIALR(QString package)
|
||||
{
|
||||
NmeaManagement::BatteryAlarm batteryAlarm;
|
||||
QRegExp sep(QStringLiteral("(\\,|\\*)"));
|
||||
QRegularExpression sep(QStringLiteral("(\\,|\\*)"));
|
||||
QStringList pkt_data = package.split(sep.pattern());
|
||||
alarm_state packageData;
|
||||
INFO_LOG(m_logger) << "pkt_data.size=" << pkt_data.size();
|
||||
@@ -229,7 +230,7 @@ void NmeaHandler::GPGGA(QString package)
|
||||
NmeaManagement::PositionExcon PositionExcon;
|
||||
double latDecimal;
|
||||
double lonDecimal;
|
||||
QRegExp sep(QStringLiteral("(\\,|\\*)"));
|
||||
QRegularExpression sep(QStringLiteral("(\\,|\\*)"));
|
||||
QStringList pkt_data = package.split(sep.pattern());
|
||||
gpgga_data packageData;
|
||||
|
||||
@@ -316,7 +317,7 @@ void NmeaHandler::GPGGA(QString package)
|
||||
|
||||
void NmeaHandler::GPRMC(QString package)
|
||||
{
|
||||
QRegExp sep(QStringLiteral("(\\,|\\*)"));
|
||||
QRegularExpression sep(QStringLiteral("(\\,|\\*)"));
|
||||
QStringList pkt_data = package.split(sep.pattern());
|
||||
gprmc_data packageData;
|
||||
|
||||
|
||||
Reference in new issue
Block a user