Migrates residual Lts sources to generated rtiddsgen API
Adds NmeaManagement tests, fixes codegen includes and Qt6 SerialPort CMake target.
This commit is contained in:
1 parent
5485a90385
commit
881d44f4dd
512 files changed
+6887
-6426
No files matched your search
+3
-2
@@ -486,8 +486,9 @@ void DataManager::onNotification(const QString &name, QSqlDriver::NotificationSo
|
||||
const QString triggerNameEx0 = triggerName(0);
|
||||
if (name.contains(triggerNameEx0))
|
||||
{
|
||||
QStringRef name_(&name);
|
||||
name_ = name_.mid(triggerNameEx0.size() + 1);
|
||||
// Qt6: QStringRef removed; QString::mid returns a QString with the
|
||||
// same substring semantics.
|
||||
QString name_ = name.mid(triggerNameEx0.size() + 1);
|
||||
int exerciseId = name_.toInt();
|
||||
int participantId = payload.toInt();
|
||||
INFO_LOG(m_logger) << "exerciseId: " << exerciseId << ", participantId: " << participantId;
|
||||
|
||||
+9
-9
@@ -57,18 +57,18 @@ void convert(Database::EquipmentTypeWh &data, const EquipmentTypeWh &request)
|
||||
{
|
||||
data.id = request.id;
|
||||
data.name = QString::fromStdString(request.name);
|
||||
data.canAbeSprache = request.configurationAbeLanguage;
|
||||
data.agdusHelmWeste = request.configurationAgdusHV;
|
||||
data.canAbeSprache = static_cast<qint32>(request.configurationAbeLanguage);
|
||||
data.agdusHelmWeste = static_cast<qint32>(request.configurationAgdusHV);
|
||||
data.canAbeSprAusg = request.configurationAudioResponse;
|
||||
data.canWirkdarstPyro = request.configurationCedPyrotechnic;
|
||||
data.anzeigeAdag = request.configurationDisplayAdag;
|
||||
data.adagUntergruppe = request.configurationDisplayAdagSubUnit;
|
||||
data.anzeigeAdag = static_cast<qint32>(request.configurationDisplayAdag);
|
||||
data.adagUntergruppe = static_cast<qint32>(request.configurationDisplayAdagSubUnit);
|
||||
data.canMhgrEnergie = request.configurationMhgrEnergieSave;
|
||||
data.canMhgrBetrArt = request.configurationMhgrOperatingMode;
|
||||
data.canMhgrBetrArt = static_cast<qint32>(request.configurationMhgrOperatingMode);
|
||||
data.canSsFirSan = request.configurationSsFirSan;
|
||||
data.canSsFirFunkt = request.configurationSsFirFunction;
|
||||
data.canSsMvFunkt = request.configurationSsMineFitFunction;
|
||||
data.canSsStdFunkt = request.configurationSsStandardFunction;
|
||||
data.canSsFirFunkt = static_cast<qint32>(request.configurationSsFirFunction);
|
||||
data.canSsMvFunkt = static_cast<qint32>(request.configurationSsMineFitFunction);
|
||||
data.canSsStdFunkt = static_cast<qint32>(request.configurationSsStandardFunction);
|
||||
data.canStartupZeit = request.configurationStartupTime;
|
||||
data.ausstgGrp = request.equipGroup;
|
||||
data.ausstgNrMax = request.maxEquipNo;
|
||||
@@ -79,7 +79,7 @@ void convert(Database::EquipmentTypeWh &data, const EquipmentTypeWh &request)
|
||||
data.vbMinenIed = request.vbMineIed;
|
||||
data.vbAcWaffen = request.vbNc;
|
||||
data.canDevices = request.canDevices;
|
||||
data.posUpdate = request.posUpdate;
|
||||
data.posUpdate = static_cast<qint32>(request.posUpdate);
|
||||
}
|
||||
|
||||
void HandlerEquipmentTypeWh::onModifyEquipmentTypeWhRequest(const rti::core::SampleIdentity &cookie, const EquipmentTypeWh &request)
|
||||
|
||||
+9
-9
@@ -66,24 +66,24 @@ void ObjectEquipmentTypeWh::onPublishData()
|
||||
WarehouseGuez::EquipmentTypeWh ddsData;
|
||||
|
||||
ddsData.id = m_data.id;
|
||||
ddsData.configurationAbeLanguage = static_cast<WarehouseGuez::ConfigurationAbeLanguage_def::type>(m_data.canAbeSprache);
|
||||
ddsData.configurationAgdusHV = static_cast<WarehouseGuez::ConfigurationAgdusHV_def::type>(m_data.agdusHelmWeste);
|
||||
ddsData.configurationAbeLanguage = static_cast<WarehouseGuez::ConfigurationAbeLanguage>(m_data.canAbeSprache);
|
||||
ddsData.configurationAgdusHV = static_cast<WarehouseGuez::ConfigurationAgdusHV>(m_data.agdusHelmWeste);
|
||||
ddsData.configurationAudioResponse = m_data.canAbeSprAusg;
|
||||
ddsData.configurationCedPyrotechnic = m_data.canWirkdarstPyro;
|
||||
ddsData.configurationDisplayAdag = static_cast<WarehouseGuez::ConfigurationDisplayAdag_def::type>(m_data.anzeigeAdag);
|
||||
ddsData.configurationDisplayAdagSubUnit = static_cast<WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::type>(m_data.adagUntergruppe);
|
||||
ddsData.configurationDisplayAdag = static_cast<WarehouseGuez::ConfigurationDisplayAdag>(m_data.anzeigeAdag);
|
||||
ddsData.configurationDisplayAdagSubUnit = static_cast<WarehouseGuez::ConfigurationDisplayAdagSubUnit>(m_data.adagUntergruppe);
|
||||
ddsData.configurationMhgrEnergieSave = m_data.canMhgrEnergie;
|
||||
ddsData.configurationMhgrOperatingMode = static_cast<WarehouseGuez::ConfigurationMhgrSensor_def::type>(m_data.canMhgrBetrArt);
|
||||
ddsData.configurationMhgrOperatingMode = static_cast<WarehouseGuez::ConfigurationMhgrSensor>(m_data.canMhgrBetrArt);
|
||||
ddsData.configurationSsFirSan = m_data.canSsFirSan;
|
||||
ddsData.configurationSsFirFunction = static_cast<WarehouseGuez::ConfigurationSpecialSensorFir_def::type>(m_data.canSsFirFunkt);
|
||||
ddsData.configurationSsMineFitFunction = static_cast<WarehouseGuez::ConfigurationSpecialSensorMineFit_def::type>(m_data.canSsMvFunkt);
|
||||
ddsData.configurationSsStandardFunction = static_cast<WarehouseGuez::ConfigurationSpecialSensorStd_def::type>(m_data.canSsStdFunkt);
|
||||
ddsData.configurationSsFirFunction = static_cast<WarehouseGuez::ConfigurationSpecialSensorFir>(m_data.canSsFirFunkt);
|
||||
ddsData.configurationSsMineFitFunction = static_cast<WarehouseGuez::ConfigurationSpecialSensorMineFit>(m_data.canSsMvFunkt);
|
||||
ddsData.configurationSsStandardFunction = static_cast<WarehouseGuez::ConfigurationSpecialSensorStd>(m_data.canSsStdFunkt);
|
||||
ddsData.configurationStartupTime = m_data.canStartupZeit;
|
||||
ddsData.equipGroup = m_data.ausstgGrp;
|
||||
ddsData.maxEquipNo = m_data.ausstgNrMax;
|
||||
ddsData.minEquipNo = m_data.ausstgNrMin;
|
||||
ddsData.name = m_data.name.toStdString();
|
||||
ddsData.posUpdate = static_cast<WarehouseGuez::ConfigurationPositionUpdate_def::type>(m_data.posUpdate);
|
||||
ddsData.posUpdate = static_cast<WarehouseGuez::ConfigurationPositionUpdate>(m_data.posUpdate);
|
||||
ddsData.vbAgdusId = m_data.vbAgdus;
|
||||
ddsData.vbAirSupport = m_data.vbEinsatzmittel;
|
||||
ddsData.vbFireArea = m_data.vbSteilfeuer;
|
||||
|
||||
Reference in new issue
Block a user