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
+6
-6
@@ -40,7 +40,7 @@ T fromJson(const QByteArray &json)
|
||||
QJsonObject frequencyPlanningJson(QJsonObject obj, const QString &name, FrequencyBand freqBand, int radioStationId)
|
||||
{
|
||||
obj.insert(QStringLiteral("Name"), name);
|
||||
obj.insert(QStringLiteral("FrequencyBand"), freqBand);
|
||||
obj.insert(QStringLiteral("FrequencyBand"), static_cast<int>(freqBand));
|
||||
obj.insert(QStringLiteral("RadioStationId"), radioStationId);
|
||||
return obj;
|
||||
}
|
||||
@@ -59,8 +59,8 @@ bool RadioCircuitHF::isValid() const
|
||||
QJsonObject RadioCircuitHF::toJson() const
|
||||
{
|
||||
QJsonObject obj;
|
||||
obj.insert(QStringLiteral("ModulationType"), modulationType);
|
||||
obj.insert(QStringLiteral("ChannelSpacing"), channelSpacing);
|
||||
obj.insert(QStringLiteral("ModulationType"), static_cast<int>(modulationType));
|
||||
obj.insert(QStringLiteral("ChannelSpacing"), static_cast<int>(channelSpacing));
|
||||
obj.insert(QStringLiteral("Frequency"), frequency);
|
||||
obj.insert(QStringLiteral("Squelch"), squelch);
|
||||
|
||||
@@ -94,8 +94,8 @@ bool RadioCircuitUHF::isValid() const
|
||||
QJsonObject RadioCircuitUHF::toJson() const
|
||||
{
|
||||
QJsonObject obj;
|
||||
obj.insert(QStringLiteral("ModulationType"), modulationType);
|
||||
obj.insert(QStringLiteral("ChannelSpacing"), channelSpacing);
|
||||
obj.insert(QStringLiteral("ModulationType"), static_cast<int>(modulationType));
|
||||
obj.insert(QStringLiteral("ChannelSpacing"), static_cast<int>(channelSpacing));
|
||||
obj.insert(QStringLiteral("Frequency"), frequency);
|
||||
obj.insert(QStringLiteral("Squelch"), squelchDB);
|
||||
obj.insert(QStringLiteral("Clipper"), clipper);
|
||||
@@ -128,7 +128,7 @@ RadioCircuitUHF* RadioCircuitUHF::fromJson(const QJsonObject &obj)
|
||||
QJsonObject RadioCircuitVHF::toJson() const
|
||||
{
|
||||
QJsonObject obj;
|
||||
obj.insert(QStringLiteral("OperatingMode"), operatingMode);
|
||||
obj.insert(QStringLiteral("OperatingMode"), static_cast<int>(operatingMode));
|
||||
obj.insert(QStringLiteral("FrequencySetDataId"), freqSetDataId);
|
||||
obj.insert(QStringLiteral("PilotTone"), pilotTone);
|
||||
|
||||
|
||||
+2
-2
@@ -33,7 +33,7 @@ struct SVCCNRHELPER_EXPORT RadioCircuit
|
||||
virtual ~RadioCircuit() = default;
|
||||
|
||||
QString name;
|
||||
FrequencyBand freqBand {FrequencyBand::VHF_v};
|
||||
FrequencyBand freqBand {FrequencyBand::VHF};
|
||||
int radioStationId {0};
|
||||
|
||||
|
||||
@@ -92,7 +92,7 @@ struct SVCCNRHELPER_EXPORT RadioCircuitUHF: public RadioCircuit
|
||||
|
||||
struct SVCCNRHELPER_EXPORT RadioCircuitVHF: public RadioCircuit
|
||||
{
|
||||
RcOperatingMode operatingMode {RcOperatingMode::FixedFreqEncNone_v};
|
||||
RcOperatingMode operatingMode {RcOperatingMode::FixedFreqEncNone};
|
||||
int freqSetDataId {0};
|
||||
bool pilotTone {false};
|
||||
|
||||
|
||||
Reference in new issue
Block a user