comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2025-07-31 12:52:25 -04:00
Code Issues Projects Releases Wiki Activity

Missed updates for digital modems

Browse Source
This commit is contained in:
Charles J. Cliffe 2021-04-29 21:25:24 -04:00
parent dcaa5cda38
commit d0b4bf694b
8 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/modem/digital/ModemAPSK.cpp
View File

@ -41,7 +41,7 @@ ModemArgInfoList ModemAPSK::getSettings() {
consArg.name = "Constellation"; consArg.name = "Constellation";
consArg.description = "Modem Constellation Pattern"; consArg.description = "Modem Constellation Pattern";
consArg.value = std::to_string(cons); consArg.value = std::to_string(cons);
consArg.type = ModemArgInfo::STRING; consArg.type = ModemArgInfo::Type::STRING;
std::vector<std::string> consOpts; std::vector<std::string> consOpts;
consOpts.push_back("4"); consOpts.push_back("4");
consOpts.push_back("8"); consOpts.push_back("8");

2
src/modules/modem/digital/ModemASK.cpp
View File

@ -42,7 +42,7 @@ ModemArgInfoList ModemASK::getSettings() {
consArg.name = "Constellation"; consArg.name = "Constellation";
consArg.description = "Modem Constellation Pattern"; consArg.description = "Modem Constellation Pattern";
consArg.value = std::to_string(cons); consArg.value = std::to_string(cons);
consArg.type = ModemArgInfo::STRING; consArg.type = ModemArgInfo::Type::STRING;
std::vector<std::string> consOpts; std::vector<std::string> consOpts;
consOpts.push_back("2"); consOpts.push_back("2");
consOpts.push_back("4"); consOpts.push_back("4");

2
src/modules/modem/digital/ModemDPSK.cpp
View File

@ -43,7 +43,7 @@ ModemArgInfoList ModemDPSK::getSettings() {
consArg.name = "Constellation"; consArg.name = "Constellation";
consArg.description = "Modem Constellation Pattern"; consArg.description = "Modem Constellation Pattern";
consArg.value = std::to_string(cons); consArg.value = std::to_string(cons);
consArg.type = ModemArgInfo::STRING; consArg.type = ModemArgInfo::Type::STRING;
std::vector<std::string> consOpts; std::vector<std::string> consOpts;
consOpts.push_back("2"); consOpts.push_back("2");
consOpts.push_back("4"); consOpts.push_back("4");

6
src/modules/modem/digital/ModemFSK.cpp
View File

@ -38,7 +38,7 @@ ModemArgInfoList ModemFSK::getSettings() {
bpsArg.name = "Bits/symbol"; bpsArg.name = "Bits/symbol";
bpsArg.value = std::to_string(bps); bpsArg.value = std::to_string(bps);
bpsArg.description = "Modem bits-per-symbol"; bpsArg.description = "Modem bits-per-symbol";
bpsArg.type = ModemArgInfo::STRING; bpsArg.type = ModemArgInfo::Type::STRING;
bpsArg.units = "bits"; bpsArg.units = "bits";
std::vector<std::string> bpsOpts; std::vector<std::string> bpsOpts;
@ -56,7 +56,7 @@ ModemArgInfoList ModemFSK::getSettings() {
spsArg.name = "Symbols/second"; spsArg.name = "Symbols/second";
spsArg.value = std::to_string(sps); spsArg.value = std::to_string(sps);
spsArg.description = "Modem symbols-per-second"; spsArg.description = "Modem symbols-per-second";
spsArg.type = ModemArgInfo::INT; spsArg.type = ModemArgInfo::Type::INT;
spsArg.range = ModemRange(10,115200); spsArg.range = ModemRange(10,115200);
std::vector<std::string> spsOpts; std::vector<std::string> spsOpts;
@ -67,7 +67,7 @@ ModemArgInfoList ModemFSK::getSettings() {
bwArg.name = "Signal bandwidth"; bwArg.name = "Signal bandwidth";
bwArg.value = std::to_string(bw); bwArg.value = std::to_string(bw);
bwArg.description = "Total signal bandwidth"; bwArg.description = "Total signal bandwidth";
bwArg.type = ModemArgInfo::FLOAT; bwArg.type = ModemArgInfo::Type::FLOAT;
bwArg.range = ModemRange(0.1,0.49); bwArg.range = ModemRange(0.1,0.49);
args.push_back(bwArg); args.push_back(bwArg);

6
src/modules/modem/digital/ModemGMSK.cpp
View File

@ -40,7 +40,7 @@ ModemArgInfoList ModemGMSK::getSettings() {
fdelayArg.name = "Filter delay"; fdelayArg.name = "Filter delay";
fdelayArg.value = std::to_string(_fdelay); fdelayArg.value = std::to_string(_fdelay);
fdelayArg.description = "Filter delay in samples"; fdelayArg.description = "Filter delay in samples";
fdelayArg.type = ModemArgInfo::INT; fdelayArg.type = ModemArgInfo::Type::INT;
fdelayArg.units = "samples"; fdelayArg.units = "samples";
fdelayArg.range = ModemRange(1,128); fdelayArg.range = ModemRange(1,128);
args.push_back(fdelayArg); args.push_back(fdelayArg);
@ -50,7 +50,7 @@ ModemArgInfoList ModemGMSK::getSettings() {
spsArg.name = "Samples / symbol"; spsArg.name = "Samples / symbol";
spsArg.value = std::to_string(_sps); spsArg.value = std::to_string(_sps);
spsArg.description = "Modem samples-per-symbol"; spsArg.description = "Modem samples-per-symbol";
spsArg.type = ModemArgInfo::INT; spsArg.type = ModemArgInfo::Type::INT;
spsArg.units = "samples/symbol"; spsArg.units = "samples/symbol";
spsArg.range = ModemRange(2,512); spsArg.range = ModemRange(2,512);
args.push_back(spsArg); args.push_back(spsArg);
@ -60,7 +60,7 @@ ModemArgInfoList ModemGMSK::getSettings() {
ebfArg.name = "Excess bandwidth"; ebfArg.name = "Excess bandwidth";
ebfArg.value = std::to_string(_ebf); ebfArg.value = std::to_string(_ebf);
ebfArg.description = "Modem excess bandwidth factor"; ebfArg.description = "Modem excess bandwidth factor";
ebfArg.type = ModemArgInfo::FLOAT; ebfArg.type = ModemArgInfo::Type::FLOAT;
ebfArg.range = ModemRange(0.1,0.49); ebfArg.range = ModemRange(0.1,0.49);
args.push_back(ebfArg); args.push_back(ebfArg);

2
src/modules/modem/digital/ModemPSK.cpp
View File

@ -44,7 +44,7 @@ ModemArgInfoList ModemPSK::getSettings() {
consArg.name = "Constellation"; consArg.name = "Constellation";
consArg.description = "Modem Constellation Pattern"; consArg.description = "Modem Constellation Pattern";
consArg.value = std::to_string(cons); consArg.value = std::to_string(cons);
consArg.type = ModemArgInfo::STRING; consArg.type = ModemArgInfo::Type::STRING;
std::vector<std::string> consOpts; std::vector<std::string> consOpts;
consOpts.push_back("2"); consOpts.push_back("2");
consOpts.push_back("4"); consOpts.push_back("4");

2
src/modules/modem/digital/ModemQAM.cpp
View File

@ -41,7 +41,7 @@ ModemArgInfoList ModemQAM::getSettings() {
consArg.name = "Constellation"; consArg.name = "Constellation";
consArg.description = "Modem Constellation Pattern"; consArg.description = "Modem Constellation Pattern";
consArg.value = std::to_string(cons); consArg.value = std::to_string(cons);
consArg.type = ModemArgInfo::STRING; consArg.type = ModemArgInfo::Type::STRING;
std::vector<std::string> consOpts; std::vector<std::string> consOpts;
consOpts.push_back("4"); consOpts.push_back("4");
consOpts.push_back("8"); consOpts.push_back("8");

2
src/modules/modem/digital/ModemSQAM.cpp
View File

@ -31,7 +31,7 @@ ModemArgInfoList ModemSQAM::getSettings() {
consArg.name = "Constellation"; consArg.name = "Constellation";
consArg.description = "Modem Constellation Pattern"; consArg.description = "Modem Constellation Pattern";
consArg.value = std::to_string(cons); consArg.value = std::to_string(cons);
consArg.type = ModemArgInfo::STRING; consArg.type = ModemArgInfo::Type::STRING;
std::vector<std::string> consOpts; std::vector<std::string> consOpts;
consOpts.push_back("32"); consOpts.push_back("32");
consOpts.push_back("128"); consOpts.push_back("128");