lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrates residual Lts sources to generated rtiddsgen API

Browse Source 
Adds NmeaManagement tests, fixes codegen includes and Qt6 SerialPort CMake target.
This commit is contained in:
berrux-dev committed 2026-09-23 12:05:37 +02:00
1 parent 5485a90385
commit 881d44f4dd
512 files changed
+6887 -6426
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/nmea_handler.cpp
+25 -25
View File
@@ -66,7 +66,7 @@ void NmeaHandler::IIXDR(QString package)
NmeaManagement::BatteryState batteryState;
NmeaManagement::ServiceControl serviceControl;
QRegularExpression sep(QStringLiteral("(\\,|\\*)"));
QStringList pkt_data = package.split(sep.pattern());
QStringList pkt_data = package.split(sep);
INFO_LOG(m_logger) << "----------------------------------------------------";
INFO_LOG(m_logger) << "batteryState pkt_data.size=" << pkt_data.size();
for (int i = 0; i < pkt_data.size(); i++)
@@ -80,17 +80,17 @@ void NmeaHandler::IIXDR(QString package)
if (pkt_data[4] == QStringLiteral("SERVICE_CONTROL_PRESHUTDOWN"))
{
INFO_LOG(m_logger) << "SERVICE_CONTROL_PRESHUTDOWN";
serviceControl.ServiceControlState(ServiceControlEnum_def::PRESHUTDOWN);
serviceControl.ServiceControlState = ServiceControlEnum::PRESHUTDOWN;
}
if (pkt_data[4] == QStringLiteral("SERVICE_CONTROL_SHUTDOWN"))
{
INFO_LOG(m_logger) << "SERVICE_CONTROL_SHUTDOWN";
serviceControl.ServiceControlState(ServiceControlEnum_def::SHUTDOWN);
serviceControl.ServiceControlState = ServiceControlEnum::SHUTDOWN;
}
if (pkt_data[4] == QStringLiteral("SERVICE_CONTROL_STOP"))
{
INFO_LOG(m_logger) << "SERVICE_CONTROL_STOP";
serviceControl.ServiceControlState(ServiceControlEnum_def::STOP);
serviceControl.ServiceControlState = ServiceControlEnum::STOP;
}
m_ddsHandler->dts()->publish(serviceControl);
return;
@@ -109,7 +109,7 @@ void NmeaHandler::IIXDR(QString package)
m_batteries.append(serialNumber);
}
batteryState.id(m_batteries.indexOf(serialNumber));
batteryState.id = m_batteries.indexOf(serialNumber);
}
index = pkt_data.indexOf(QLatin1String("B")) + 1;
@@ -117,28 +117,28 @@ void NmeaHandler::IIXDR(QString package)
battery = pkt_data[index].toInt() ;
else
battery = -1;
batteryState.battery(battery );
batteryState.battery = battery;
index = pkt_data.indexOf(QLatin1String("C")) + 1;
if ( index >= 0)
temperature = pkt_data[index].toInt() ;
else
temperature = -1;
batteryState.temperature(temperature);
batteryState.temperature = temperature;
index = pkt_data.indexOf(QLatin1String("F")) + 1;
if ( index >= 0)
frequency = pkt_data[index].toInt() ;
else
frequency = -1;
batteryState.frequency(frequency);
batteryState.frequency = frequency;
index = pkt_data.indexOf(QLatin1String("F")) + 1;
if ( index >= 0)
generic = pkt_data[index].toDouble() ;
else
generic = -1.0;
batteryState.generic(generic);
batteryState.generic = generic;
index = pkt_data.lastIndexOf(QLatin1String("I")) + 1;
@@ -146,22 +146,22 @@ void NmeaHandler::IIXDR(QString package)
current = pkt_data[index].toInt();
else
current = -1;
batteryState.current(current);
batteryState.current = current;
index = pkt_data.indexOf(QLatin1String("S")) + 1;
switchOrValue = false;
if ( index >= 0)
if ( pkt_data[index].toInt() == 1 )
switchOrValue = true;
batteryState.switchOrValue(switchOrValue);
batteryState.switchOrValue = switchOrValue;
index = pkt_data.indexOf(QLatin1String("U")) + 1;
if ( index >= 0)
voltage = pkt_data[index].toInt() ;
else
voltage = -1;
batteryState.voltage(voltage);
batteryState.voltage = voltage;
batteryState.serialNumber(serialNumber.toStdString()) ;
batteryState.serialNumber = serialNumber.toStdString();
INFO_LOG(m_logger) << "publish batteryState serialNumber=" << serialNumber;
m_ddsHandler->dts()->publish(batteryState);
}
@@ -187,7 +187,7 @@ void NmeaHandler::IIALR(QString package)
{
NmeaManagement::BatteryAlarm batteryAlarm;
QRegularExpression sep(QStringLiteral("(\\,|\\*)"));
QStringList pkt_data = package.split(sep.pattern());
QStringList pkt_data = package.split(sep);
alarm_state packageData;
INFO_LOG(m_logger) << "pkt_data.size=" << pkt_data.size();
// for ( int i = 0; i < pkt_data.size(); i++)
@@ -214,12 +214,12 @@ void NmeaHandler::IIALR(QString package)
<< " condition=" << packageData.condition
<< " acknowledgeState=" << packageData.acknowledgeState
<< " description=" << packageData.description;
batteryAlarm.id(0);
batteryAlarm.time(timeAlarm);
batteryAlarm.description(packageData.description.toStdString());
batteryAlarm.acknowledge(packageData.acknowledgeState);
batteryAlarm.condition(packageData.condition);
batteryAlarm.uniqueAlarmNumber(packageData.number);
batteryAlarm.id = 0;
batteryAlarm.time = timeAlarm;
batteryAlarm.description = packageData.description.toStdString();
batteryAlarm.acknowledge = packageData.acknowledgeState;
batteryAlarm.condition = packageData.condition;
batteryAlarm.uniqueAlarmNumber = packageData.number;
m_ddsHandler->dts()->publish(batteryAlarm);
}
@@ -231,7 +231,7 @@ void NmeaHandler::GPGGA(QString package)
double latDecimal;
double lonDecimal;
QRegularExpression sep(QStringLiteral("(\\,|\\*)"));
QStringList pkt_data = package.split(sep.pattern());
QStringList pkt_data = package.split(sep);
gpgga_data packageData;
@@ -306,9 +306,9 @@ void NmeaHandler::GPGGA(QString package)
<< " latitude=" << latDecimal;
PositionExcon.position().lat(latDecimal * M_PI / 180.0);
PositionExcon.position().lon(lonDecimal * M_PI / 180.0);
PositionExcon.valid(true);
PositionExcon.position.lat = latDecimal * M_PI / 180.0;
PositionExcon.position.lon = lonDecimal * M_PI / 180.0;
PositionExcon.valid = true;
m_ddsHandler->dts()->publish(PositionExcon);
}
@@ -318,7 +318,7 @@ void NmeaHandler::GPGGA(QString package)
void NmeaHandler::GPRMC(QString package)
{
QRegularExpression sep(QStringLiteral("(\\,|\\*)"));
QStringList pkt_data = package.split(sep.pattern());
QStringList pkt_data = package.split(sep);
gprmc_data packageData;
packageData.A_hour = (int)pkt_data[1].toFloat();