From d0b4bf694ba5c3cc7b70ed98d0535ddd9157d142 Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Thu, 29 Apr 2021 21:25:24 -0400 Subject: [PATCH] Missed updates for digital modems --- src/modules/modem/digital/ModemAPSK.cpp | 2 +- src/modules/modem/digital/ModemASK.cpp | 2 +- src/modules/modem/digital/ModemDPSK.cpp | 2 +- src/modules/modem/digital/ModemFSK.cpp | 6 +++--- src/modules/modem/digital/ModemGMSK.cpp | 6 +++--- src/modules/modem/digital/ModemPSK.cpp | 2 +- src/modules/modem/digital/ModemQAM.cpp | 2 +- src/modules/modem/digital/ModemSQAM.cpp | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/modules/modem/digital/ModemAPSK.cpp b/src/modules/modem/digital/ModemAPSK.cpp index 8952cf0..6c24935 100644 --- a/src/modules/modem/digital/ModemAPSK.cpp +++ b/src/modules/modem/digital/ModemAPSK.cpp @@ -41,7 +41,7 @@ ModemArgInfoList ModemAPSK::getSettings() { consArg.name = "Constellation"; consArg.description = "Modem Constellation Pattern"; consArg.value = std::to_string(cons); - consArg.type = ModemArgInfo::STRING; + consArg.type = ModemArgInfo::Type::STRING; std::vector consOpts; consOpts.push_back("4"); consOpts.push_back("8"); diff --git a/src/modules/modem/digital/ModemASK.cpp b/src/modules/modem/digital/ModemASK.cpp index 3b330a9..c95e314 100644 --- a/src/modules/modem/digital/ModemASK.cpp +++ b/src/modules/modem/digital/ModemASK.cpp @@ -42,7 +42,7 @@ ModemArgInfoList ModemASK::getSettings() { consArg.name = "Constellation"; consArg.description = "Modem Constellation Pattern"; consArg.value = std::to_string(cons); - consArg.type = ModemArgInfo::STRING; + consArg.type = ModemArgInfo::Type::STRING; std::vector consOpts; consOpts.push_back("2"); consOpts.push_back("4"); diff --git a/src/modules/modem/digital/ModemDPSK.cpp b/src/modules/modem/digital/ModemDPSK.cpp index 55acf9c..0fc424b 100644 --- a/src/modules/modem/digital/ModemDPSK.cpp +++ b/src/modules/modem/digital/ModemDPSK.cpp @@ -43,7 +43,7 @@ ModemArgInfoList ModemDPSK::getSettings() { consArg.name = "Constellation"; consArg.description = "Modem Constellation Pattern"; consArg.value = std::to_string(cons); - consArg.type = ModemArgInfo::STRING; + consArg.type = ModemArgInfo::Type::STRING; std::vector consOpts; consOpts.push_back("2"); consOpts.push_back("4"); diff --git a/src/modules/modem/digital/ModemFSK.cpp b/src/modules/modem/digital/ModemFSK.cpp index 4d53483..7bec57d 100644 --- a/src/modules/modem/digital/ModemFSK.cpp +++ b/src/modules/modem/digital/ModemFSK.cpp @@ -38,7 +38,7 @@ ModemArgInfoList ModemFSK::getSettings() { bpsArg.name = "Bits/symbol"; bpsArg.value = std::to_string(bps); bpsArg.description = "Modem bits-per-symbol"; - bpsArg.type = ModemArgInfo::STRING; + bpsArg.type = ModemArgInfo::Type::STRING; bpsArg.units = "bits"; std::vector bpsOpts; @@ -56,7 +56,7 @@ ModemArgInfoList ModemFSK::getSettings() { spsArg.name = "Symbols/second"; spsArg.value = std::to_string(sps); spsArg.description = "Modem symbols-per-second"; - spsArg.type = ModemArgInfo::INT; + spsArg.type = ModemArgInfo::Type::INT; spsArg.range = ModemRange(10,115200); std::vector spsOpts; @@ -67,7 +67,7 @@ ModemArgInfoList ModemFSK::getSettings() { bwArg.name = "Signal bandwidth"; bwArg.value = std::to_string(bw); bwArg.description = "Total signal bandwidth"; - bwArg.type = ModemArgInfo::FLOAT; + bwArg.type = ModemArgInfo::Type::FLOAT; bwArg.range = ModemRange(0.1,0.49); args.push_back(bwArg); diff --git a/src/modules/modem/digital/ModemGMSK.cpp b/src/modules/modem/digital/ModemGMSK.cpp index cacae09..3aaff85 100644 --- a/src/modules/modem/digital/ModemGMSK.cpp +++ b/src/modules/modem/digital/ModemGMSK.cpp @@ -40,7 +40,7 @@ ModemArgInfoList ModemGMSK::getSettings() { fdelayArg.name = "Filter delay"; fdelayArg.value = std::to_string(_fdelay); fdelayArg.description = "Filter delay in samples"; - fdelayArg.type = ModemArgInfo::INT; + fdelayArg.type = ModemArgInfo::Type::INT; fdelayArg.units = "samples"; fdelayArg.range = ModemRange(1,128); args.push_back(fdelayArg); @@ -50,7 +50,7 @@ ModemArgInfoList ModemGMSK::getSettings() { spsArg.name = "Samples / symbol"; spsArg.value = std::to_string(_sps); spsArg.description = "Modem samples-per-symbol"; - spsArg.type = ModemArgInfo::INT; + spsArg.type = ModemArgInfo::Type::INT; spsArg.units = "samples/symbol"; spsArg.range = ModemRange(2,512); args.push_back(spsArg); @@ -60,7 +60,7 @@ ModemArgInfoList ModemGMSK::getSettings() { ebfArg.name = "Excess bandwidth"; ebfArg.value = std::to_string(_ebf); ebfArg.description = "Modem excess bandwidth factor"; - ebfArg.type = ModemArgInfo::FLOAT; + ebfArg.type = ModemArgInfo::Type::FLOAT; ebfArg.range = ModemRange(0.1,0.49); args.push_back(ebfArg); diff --git a/src/modules/modem/digital/ModemPSK.cpp b/src/modules/modem/digital/ModemPSK.cpp index 3bddc32..f320656 100644 --- a/src/modules/modem/digital/ModemPSK.cpp +++ b/src/modules/modem/digital/ModemPSK.cpp @@ -44,7 +44,7 @@ ModemArgInfoList ModemPSK::getSettings() { consArg.name = "Constellation"; consArg.description = "Modem Constellation Pattern"; consArg.value = std::to_string(cons); - consArg.type = ModemArgInfo::STRING; + consArg.type = ModemArgInfo::Type::STRING; std::vector consOpts; consOpts.push_back("2"); consOpts.push_back("4"); diff --git a/src/modules/modem/digital/ModemQAM.cpp b/src/modules/modem/digital/ModemQAM.cpp index 89cf79a..51054da 100644 --- a/src/modules/modem/digital/ModemQAM.cpp +++ b/src/modules/modem/digital/ModemQAM.cpp @@ -41,7 +41,7 @@ ModemArgInfoList ModemQAM::getSettings() { consArg.name = "Constellation"; consArg.description = "Modem Constellation Pattern"; consArg.value = std::to_string(cons); - consArg.type = ModemArgInfo::STRING; + consArg.type = ModemArgInfo::Type::STRING; std::vector consOpts; consOpts.push_back("4"); consOpts.push_back("8"); diff --git a/src/modules/modem/digital/ModemSQAM.cpp b/src/modules/modem/digital/ModemSQAM.cpp index b4cae56..fbff2e3 100644 --- a/src/modules/modem/digital/ModemSQAM.cpp +++ b/src/modules/modem/digital/ModemSQAM.cpp @@ -31,7 +31,7 @@ ModemArgInfoList ModemSQAM::getSettings() { consArg.name = "Constellation"; consArg.description = "Modem Constellation Pattern"; consArg.value = std::to_string(cons); - consArg.type = ModemArgInfo::STRING; + consArg.type = ModemArgInfo::Type::STRING; std::vector consOpts; consOpts.push_back("32"); consOpts.push_back("128");