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
+23
-23
@@ -56,17 +56,17 @@ FrequencySet FrequencySetHandler::toDdsFrequencySet(const Database::AvmFrequency
|
||||
{
|
||||
FrequencySet result;
|
||||
|
||||
result.id(dbData.id);
|
||||
result.name(dbData.name.toStdString());
|
||||
result.lastChange(dbData.lastChange);
|
||||
result.id = dbData.id;
|
||||
result.name = dbData.name.toStdString();
|
||||
result.lastChange = dbData.lastChange;
|
||||
|
||||
auto cb = [&result] (const Database::AvmFrequencySetData ¤tData)
|
||||
{
|
||||
result.data().push_back(toDdsFrequencySetDataWithId(currentData));
|
||||
result.data.push_back(toDdsFrequencySetDataWithId(currentData));
|
||||
};
|
||||
m_db->selectByFrequencySetId(cb, result.id());
|
||||
m_db->selectByFrequencySetId(cb, result.id);
|
||||
|
||||
DEBUG_LOG(m_logger) << "Frequency Set with ID " << dbData.id << " has " << result.data().size() << " data entries";
|
||||
DEBUG_LOG(m_logger) << "Frequency Set with ID " << dbData.id << " has " << result.data.size() << " data entries";
|
||||
|
||||
return result;
|
||||
}
|
||||
@@ -75,37 +75,37 @@ FrequencyBand FrequencySetHandler::getFrequencyBand(const QString &deviceString)
|
||||
{
|
||||
QString intermediate = deviceString.left(3);
|
||||
if (QString::compare(intermediate, QStringLiteral("VHF"), Qt::CaseInsensitive) == 0)
|
||||
return FrequencyBand_def::VHF;
|
||||
return FrequencyBand::VHF;
|
||||
else if (QString::compare(intermediate, QStringLiteral("UHF"), Qt::CaseInsensitive) == 0)
|
||||
return FrequencyBand_def::UHF;
|
||||
return FrequencyBand::UHF;
|
||||
else if (QString::compare(intermediate, QStringLiteral("HF"), Qt::CaseInsensitive) == 0)
|
||||
return FrequencyBand_def::HF;
|
||||
return FrequencyBand::HF;
|
||||
else //if (QString::compare(intermediate.left(1), QStringLiteral("R"), Qt::CaseInsensitive) == 0)
|
||||
return FrequencyBand_def::REL;
|
||||
return FrequencyBand::REL;
|
||||
}
|
||||
|
||||
FrequencySetDataWithId FrequencySetHandler::toDdsFrequencySetDataWithId(const Database::AvmFrequencySetData &dbData)
|
||||
{
|
||||
FrequencySetDataWithId result;
|
||||
|
||||
result.id(dbData.id);
|
||||
result.function(dbData.function.toStdString());
|
||||
result.frequency(dbData.frequency);
|
||||
result.id = dbData.id;
|
||||
result.function = dbData.function.toStdString();
|
||||
result.frequency = dbData.frequency;
|
||||
|
||||
// Todo: Put this into the database as well...
|
||||
result.frequencyBand(getFrequencyBand(dbData.device));
|
||||
result.frequencyBand = getFrequencyBand(dbData.device);
|
||||
|
||||
if (dbData.akwBundle >= 0)
|
||||
result.akwBundle().set(dbData.akwBundle);
|
||||
result.akwBundle = dbData.akwBundle;
|
||||
|
||||
if (dbData.fsbBundle >= 0)
|
||||
result.fsbBundle().set(dbData.fsbBundle);
|
||||
result.fsbBundle = dbData.fsbBundle;
|
||||
|
||||
if (dbData.akwRadioCircuit >= 0)
|
||||
result.akwRadioCircuit().set(dbData.akwRadioCircuit);
|
||||
result.akwRadioCircuit = dbData.akwRadioCircuit;
|
||||
|
||||
if (dbData.comsec >= 0)
|
||||
result.comsec().set(dbData.comsec);
|
||||
result.comsec = dbData.comsec;
|
||||
|
||||
return result;
|
||||
}
|
||||
@@ -114,15 +114,15 @@ void FrequencySetHandler::addFrequencySet(const FrequencySet &frequencySet)
|
||||
{
|
||||
QVector<int32_t> dataIds;
|
||||
|
||||
dataIds.reserve(frequencySet.data().size());
|
||||
dataIds.reserve(frequencySet.data.size());
|
||||
|
||||
for (const FrequencySetDataWithId ¤tData : frequencySet.data())
|
||||
dataIds << currentData.id();
|
||||
for (const FrequencySetDataWithId ¤tData : frequencySet.data)
|
||||
dataIds << currentData.id;
|
||||
|
||||
m_frequencySetDatas.insert(frequencySet.id(), dataIds);
|
||||
m_frequencySetDatas.insert(frequencySet.id, dataIds);
|
||||
|
||||
if (!m_dts->publish(frequencySet))
|
||||
ERROR_LOG(m_logger) << "Error while publishing Frequency Set with id " << frequencySet.id();
|
||||
ERROR_LOG(m_logger) << "Error while publishing Frequency Set with id " << frequencySet.id;
|
||||
}
|
||||
|
||||
} // namespace AudioVideoManagement
|
||||
Reference in new issue
Block a user