Skip to content

Commit 45e4286

Browse files
AlexandreRoumaAlexandreRouma
authored
Merge pull request #1550 from AlexandreRouma/new_sdrplay_source
New sdrplay source
2 parents 5ded73c + c266a37 commit 45e4286

File tree

1 file changed

+108
-124
lines changed
  • source_modules/sdrplay_source/src

1 file changed

+108
-124
lines changed

‎source_modules/sdrplay_source/src/main.cpp

+108-124
Original file line numberDiff line numberDiff line change
@@ -8,64 +8,20 @@
88
#include <config.h>
99
#include <sdrplay_api.h>
1010
#include <gui/smgui.h>
11+
#include <utils/optionlist.h>
1112

1213
#define CONCAT(a, b) ((std::string(a) + b).c_str())
1314

1415
SDRPP_MOD_INFO{
1516
/* Name: */ "sdrplay_source",
1617
/* Description: */ "SDRplay source module for SDR++",
1718
/* Author: */ "Ryzerth",
18-
/* Version: */ 0, 1, 0,
19+
/* Version: */ 0, 2, 0,
1920
/* Max instances */ 1
2021
};
2122

2223
ConfigManager config;
2324

24-
unsigned int sampleRates[] = {
25-
2000000,
26-
3000000,
27-
4000000,
28-
5000000,
29-
6000000,
30-
7000000,
31-
8000000,
32-
9000000,
33-
10000000
34-
};
35-
36-
const char* sampleRatesTxt =
37-
"2MHz\0"
38-
"3MHz\0"
39-
"4MHz\0"
40-
"5MHz\0"
41-
"6MHz\0"
42-
"7MHz\0"
43-
"8MHz\0"
44-
"9MHz\0"
45-
"10MHz\0";
46-
47-
sdrplay_api_Bw_MHzT bandwidths[] = {
48-
sdrplay_api_BW_0_200,
49-
sdrplay_api_BW_0_300,
50-
sdrplay_api_BW_0_600,
51-
sdrplay_api_BW_1_536,
52-
sdrplay_api_BW_5_000,
53-
sdrplay_api_BW_6_000,
54-
sdrplay_api_BW_7_000,
55-
sdrplay_api_BW_8_000,
56-
};
57-
58-
const char* bandwidthsTxt =
59-
"200KHz\0"
60-
"300KHz\0"
61-
"600KHz\0"
62-
"1.536MHz\0"
63-
"5MHz\0"
64-
"6MHz\0"
65-
"7MHz\0"
66-
"8MHz\0"
67-
"Auto\0";
68-
6925
sdrplay_api_Bw_MHzT preferedBandwidth[] = {
7026
sdrplay_api_BW_5_000,
7127
sdrplay_api_BW_5_000,
@@ -208,6 +164,11 @@ class SDRPlaySourceModule : public ModuleManager::Instance {
208164
name += devArr[i].SerNo;
209165
name += ')';
210166
break;
167+
case SDRPLAY_RSP1B_ID:
168+
name = "RSP1B (";
169+
name += devArr[i].SerNo;
170+
name += ')';
171+
break;
211172
case SDRPLAY_RSP2_ID:
212173
name = "RSP2 (";
213174
name += devArr[i].SerNo;
@@ -223,6 +184,11 @@ class SDRPlaySourceModule : public ModuleManager::Instance {
223184
name += devArr[i].SerNo;
224185
name += ')';
225186
break;
187+
case SDRPLAY_RSPdxR2_ID:
188+
name = "RSPdx-R2 (";
189+
name += devArr[i].SerNo;
190+
name += ')';
191+
break;
226192
default:
227193
name = "Unknown (";
228194
name += devArr[i].SerNo;
@@ -290,14 +256,38 @@ class SDRPlaySourceModule : public ModuleManager::Instance {
290256
return;
291257
}
292258

259+
// Define the valid samplerates
260+
samplerates.clear();
261+
samplerates.define(2e6, "2MHz", 2e6);
262+
samplerates.define(3e6, "3MHz", 3e6);
263+
samplerates.define(4e6, "4MHz", 4e6);
264+
samplerates.define(5e6, "5MHz", 5e6);
265+
samplerates.define(6e6, "6MHz", 6e6);
266+
samplerates.define(7e6, "7MHz", 7e6);
267+
samplerates.define(8e6, "8MHz", 8e6);
268+
samplerates.define(9e6, "9MHz", 9e6);
269+
samplerates.define(10e6, "10MHz", 10e6);
270+
271+
// Define the valid bandwidths
272+
bandwidths.clear();
273+
bandwidths.define(200e3, "200KHz", sdrplay_api_BW_0_200);
274+
bandwidths.define(300e3, "300KHz", sdrplay_api_BW_0_300);
275+
bandwidths.define(600e3, "600KHz", sdrplay_api_BW_0_600);
276+
bandwidths.define(1.536e6, "1.536MHz", sdrplay_api_BW_1_536);
277+
bandwidths.define(5e6, "5MHz", sdrplay_api_BW_5_000);
278+
bandwidths.define(6e6, "6MHz", sdrplay_api_BW_6_000);
279+
bandwidths.define(7e6, "7MHz", sdrplay_api_BW_7_000);
280+
bandwidths.define(8e6, "8MHz", sdrplay_api_BW_8_000);
281+
bandwidths.define(0, "Auto", sdrplay_api_BW_Undefined);
282+
293283
channelParams = openDevParams->rxChannelA;
294284

295285
selectedName = devNameList[id];
296286

297287
if (openDev.hwVer == SDRPLAY_RSP1_ID) {
298288
lnaSteps = 4;
299289
}
300-
else if (openDev.hwVer == SDRPLAY_RSP1A_ID) {
290+
else if (openDev.hwVer == SDRPLAY_RSP1A_ID || openDev.hwVer == SDRPLAY_RSP1B_ID) {
301291
lnaSteps = 10;
302292
}
303293
else if (openDev.hwVer == SDRPLAY_RSP2_ID) {
@@ -306,78 +296,54 @@ class SDRPlaySourceModule : public ModuleManager::Instance {
306296
else if (openDev.hwVer == SDRPLAY_RSPduo_ID) {
307297
lnaSteps = 10;
308298
}
309-
else if (openDev.hwVer == SDRPLAY_RSPdx_ID) {
299+
else if (openDev.hwVer == SDRPLAY_RSPdx_ID || openDev.hwVer == SDRPLAY_RSPdxR2_ID) {
310300
lnaSteps = 28;
311301
}
312302

313-
bool created = false;
303+
// Select default settings
304+
srId = 0;
305+
sampleRate = samplerates.value(0);
306+
bandwidthId = 8;
307+
lnaGain = lnaSteps - 1;
308+
gain = 59;
309+
agc = false;
310+
agcAttack = 500;
311+
agcDecay = 500;
312+
agcDecayDelay = 200;
313+
agcDecayThreshold = 5;
314+
agcSetPoint = -30;
315+
ifModeId = 0;
316+
rsp1a_fmmwNotch = false;
317+
rsp2_fmmwNotch = false;
318+
rspdx_fmmwNotch = false;
319+
rspduo_fmmwNotch = false;
320+
rsp1a_dabNotch = false;
321+
rspdx_dabNotch = false;
322+
rspduo_dabNotch = false;
323+
rsp1a_biasT = false;
324+
rsp2_biasT = false;
325+
rspdx_biasT = false;
326+
rspduo_biasT = false;
327+
rsp2_antennaPort = 0;
328+
rspdx_antennaPort = 0;
329+
rspduo_antennaPort = 0;
330+
314331
config.acquire();
315-
if (!config.conf["devices"].contains(selectedName)) {
316-
created = true;
317-
config.conf["devices"][selectedName]["sampleRate"] = sampleRates[0];
318-
config.conf["devices"][selectedName]["bwMode"] = 8; // Auto
319-
config.conf["devices"][selectedName]["lnaGain"] = lnaSteps - 1;
320-
config.conf["devices"][selectedName]["ifGain"] = 59;
321-
config.conf["devices"][selectedName]["agc"] = false;
322-
323-
config.conf["devices"][selectedName]["agcAttack"] = 500;
324-
config.conf["devices"][selectedName]["agcDecay"] = 500;
325-
config.conf["devices"][selectedName]["agcDecayDelay"] = 200;
326-
config.conf["devices"][selectedName]["agcDecayThreshold"] = 5;
327-
config.conf["devices"][selectedName]["agcSetPoint"] = -30;
328-
329-
config.conf["devices"][selectedName]["ifModeId"] = 0;
330-
331-
if (openDev.hwVer == SDRPLAY_RSP1_ID) {
332-
// No config to load
333-
}
334-
else if (openDev.hwVer == SDRPLAY_RSP1A_ID) {
335-
config.conf["devices"][selectedName]["fmmwNotch"] = false;
336-
config.conf["devices"][selectedName]["dabNotch"] = false;
337-
config.conf["devices"][selectedName]["biast"] = false;
338-
}
339-
else if (openDev.hwVer == SDRPLAY_RSP2_ID) {
340-
config.conf["devices"][selectedName]["antenna"] = 0;
341-
config.conf["devices"][selectedName]["fmmwNotch"] = false;
342-
config.conf["devices"][selectedName]["biast"] = false;
343-
}
344-
else if (openDev.hwVer == SDRPLAY_RSPduo_ID) {
345-
config.conf["devices"][selectedName]["antenna"] = 0;
346-
config.conf["devices"][selectedName]["fmmwNotch"] = false;
347-
config.conf["devices"][selectedName]["dabNotch"] = false;
348-
config.conf["devices"][selectedName]["biast"] = false;
349-
}
350-
else if (openDev.hwVer == SDRPLAY_RSPdx_ID) {
351-
config.conf["devices"][selectedName]["antenna"] = 0;
352-
config.conf["devices"][selectedName]["fmmwNotch"] = false;
353-
config.conf["devices"][selectedName]["dabNotch"] = false;
354-
config.conf["devices"][selectedName]["biast"] = false;
355-
}
356-
}
357332

358333
// General options
359-
if (config.conf["devices"][selectedName].contains("sampleRate")) {
360-
sampleRate = config.conf["devices"][selectedName]["sampleRate"];
361-
bool found = false;
362-
for (int i = 0; i < 9; i++) {
363-
if (sampleRates[i] == sampleRate) {
364-
srId = i;
365-
found = true;
366-
}
367-
}
368-
if (!found) {
369-
sampleRate = sampleRates[0];
370-
srId = 0;
334+
if (config.conf["devices"][selectedName].contains("samplerate")) {
335+
int sr = config.conf["devices"][selectedName]["samplerate"];
336+
if (samplerates.keyExists(sr)) {
337+
srId = samplerates.keyId(sr);
338+
sampleRate = samplerates[srId];
371339
}
372340
}
373-
374341
if (config.conf["devices"][selectedName].contains("ifModeId")) {
375342
ifModeId = config.conf["devices"][selectedName]["ifModeId"];
376343
if (ifModeId != 0) {
377344
sampleRate = ifModes[ifModeId].effectiveSamplerate;
378345
}
379346
}
380-
381347
if (config.conf["devices"][selectedName].contains("bwMode")) {
382348
bandwidthId = config.conf["devices"][selectedName]["bwMode"];
383349
}
@@ -388,11 +354,6 @@ class SDRPlaySourceModule : public ModuleManager::Instance {
388354
gain = config.conf["devices"][selectedName]["ifGain"];
389355
}
390356
if (config.conf["devices"][selectedName].contains("agc")) {
391-
if (!config.conf["devices"][selectedName]["agc"].is_boolean()) {
392-
int oldMode = config.conf["devices"][selectedName]["agc"];
393-
config.conf["devices"][selectedName]["agc"] = (bool)(oldMode != 0);
394-
created = true;
395-
}
396357
agc = config.conf["devices"][selectedName]["agc"];
397358
}
398359
if (config.conf["devices"][selectedName].contains("agcAttack")) {
@@ -415,7 +376,7 @@ class SDRPlaySourceModule : public ModuleManager::Instance {
415376
if (openDev.hwVer == SDRPLAY_RSP1_ID) {
416377
// No config to load
417378
}
418-
else if (openDev.hwVer == SDRPLAY_RSP1A_ID) {
379+
else if (openDev.hwVer == SDRPLAY_RSP1A_ID || openDev.hwVer == SDRPLAY_RSP1B_ID) {
419380
if (config.conf["devices"][selectedName].contains("fmmwNotch")) {
420381
rsp1a_fmmwNotch = config.conf["devices"][selectedName]["fmmwNotch"];
421382
}
@@ -451,7 +412,7 @@ class SDRPlaySourceModule : public ModuleManager::Instance {
451412
rspduo_biasT = config.conf["devices"][selectedName]["biast"];
452413
}
453414
}
454-
else if (openDev.hwVer == SDRPLAY_RSPdx_ID) {
415+
else if (openDev.hwVer == SDRPLAY_RSPdx_ID || openDev.hwVer == SDRPLAY_RSPdxR2_ID) {
455416
if (config.conf["devices"][selectedName].contains("antenna")) {
456417
rspdx_antennaPort = config.conf["devices"][selectedName]["antenna"];
457418
}
@@ -466,7 +427,7 @@ class SDRPlaySourceModule : public ModuleManager::Instance {
466427
}
467428
}
468429

469-
config.release(created);
430+
config.release();
470431

471432
if (lnaGain >= lnaSteps) { lnaGain = lnaSteps - 1; }
472433

@@ -614,7 +575,7 @@ class SDRPlaySourceModule : public ModuleManager::Instance {
614575

615576
// General options
616577
if (_this->ifModeId == 0) {
617-
_this->bandwidth = (_this->bandwidthId == 8) ? preferedBandwidth[_this->srId] : bandwidths[_this->bandwidthId];
578+
_this->bandwidth = (_this->bandwidthId == 8) ? preferedBandwidth[_this->srId] : _this->bandwidths[_this->bandwidthId];
618579
_this->openDevParams->devParams->fsFreq.fsHz = _this->sampleRate;
619580
_this->channelParams->tunerParams.bwType = _this->bandwidth;
620581
}
@@ -693,14 +654,14 @@ class SDRPlaySourceModule : public ModuleManager::Instance {
693654
}
694655

695656
if (_this->ifModeId == 0) {
696-
if (SmGui::Combo(CONCAT("##sdrplay_sr", _this->name), &_this->srId, sampleRatesTxt)) {
697-
_this->sampleRate = sampleRates[_this->srId];
657+
if (SmGui::Combo(CONCAT("##sdrplay_sr", _this->name), &_this->srId, _this->samplerates.txt)) {
658+
_this->sampleRate = _this->samplerates[_this->srId];
698659
if (_this->bandwidthId == 8) {
699660
_this->bandwidth = preferedBandwidth[_this->srId];
700661
}
701662
core::setInputSampleRate(_this->sampleRate);
702663
config.acquire();
703-
config.conf["devices"][_this->selectedName]["sampleRate"] = _this->sampleRate;
664+
config.conf["devices"][_this->selectedName]["samplerate"] = _this->samplerates.key(_this->srId);
704665
config.release(true);
705666
}
706667

@@ -715,8 +676,8 @@ class SDRPlaySourceModule : public ModuleManager::Instance {
715676

716677
SmGui::LeftLabel("Bandwidth");
717678
SmGui::FillWidth();
718-
if (SmGui::Combo(CONCAT("##sdrplay_bw", _this->name), &_this->bandwidthId, bandwidthsTxt)) {
719-
_this->bandwidth = (_this->bandwidthId == 8) ? preferedBandwidth[_this->srId] : bandwidths[_this->bandwidthId];
679+
if (SmGui::Combo(CONCAT("##sdrplay_bw", _this->name), &_this->bandwidthId, _this->bandwidths.txt)) {
680+
_this->bandwidth = (_this->bandwidthId == 8) ? preferedBandwidth[_this->srId] : _this->bandwidths[_this->bandwidthId];
720681
if (_this->running) {
721682
_this->channelParams->tunerParams.bwType = _this->bandwidth;
722683
sdrplay_api_Update(_this->openDev.dev, _this->openDev.tuner, sdrplay_api_Update_Tuner_BwType, sdrplay_api_Update_Ext1_None);
@@ -745,10 +706,28 @@ class SDRPlaySourceModule : public ModuleManager::Instance {
745706
}
746707
else {
747708
config.acquire();
748-
_this->sampleRate = config.conf["devices"][_this->selectedName]["sampleRate"];
749-
_this->bandwidthId = config.conf["devices"][_this->selectedName]["bwMode"];
750-
config.release(false);
751-
_this->bandwidth = (_this->bandwidthId == 8) ? preferedBandwidth[_this->srId] : bandwidths[_this->bandwidthId];
709+
// Reload samplerate
710+
if (config.conf["devices"][_this->selectedName].contains("samplerate")) {
711+
int sr = config.conf["devices"][_this->selectedName]["samplerate"];
712+
if (_this->samplerates.keyExists(sr)) {
713+
_this->srId = _this->samplerates.keyId(sr);
714+
}
715+
}
716+
else {
717+
_this->srId = 0;
718+
}
719+
720+
// Reload bandwidth
721+
if (config.conf["devices"][_this->selectedName].contains("bwMode")) {
722+
_this->bandwidthId = config.conf["devices"][_this->selectedName]["bwMode"];
723+
}
724+
else {
725+
// Auto
726+
_this->bandwidthId = 8;
727+
}
728+
_this->sampleRate = _this->samplerates[_this->srId];
729+
config.release();
730+
_this->bandwidth = (_this->bandwidthId == 8) ? preferedBandwidth[_this->srId] : _this->bandwidths[_this->bandwidthId];
752731
}
753732
core::setInputSampleRate(_this->sampleRate);
754733
config.acquire();
@@ -854,6 +833,7 @@ class SDRPlaySourceModule : public ModuleManager::Instance {
854833
_this->RSP1Menu();
855834
break;
856835
case SDRPLAY_RSP1A_ID:
836+
case SDRPLAY_RSP1B_ID:
857837
_this->RSP1AMenu();
858838
break;
859839
case SDRPLAY_RSP2_ID:
@@ -863,6 +843,7 @@ class SDRPlaySourceModule : public ModuleManager::Instance {
863843
_this->RSPduoMenu();
864844
break;
865845
case SDRPLAY_RSPdx_ID:
846+
case SDRPLAY_RSPdxR2_ID:
866847
_this->RSPdxMenu();
867848
break;
868849
default:
@@ -1146,7 +1127,7 @@ class SDRPlaySourceModule : public ModuleManager::Instance {
11461127
sdrplay_api_RxChannelParamsT* channelParams;
11471128

11481129
sdrplay_api_Bw_MHzT bandwidth;
1149-
int bandwidthId = 0;
1130+
int bandwidthId = 8; // Auto
11501131

11511132
int devId = 0;
11521133
int srId = 0;
@@ -1201,6 +1182,9 @@ class SDRPlaySourceModule : public ModuleManager::Instance {
12011182
std::string devListTxt;
12021183
std::vector<std::string> devNameList;
12031184
std::string selectedName;
1185+
1186+
OptionList<int, int> samplerates;
1187+
OptionList<int, sdrplay_api_Bw_MHzT> bandwidths;
12041188
};
12051189

12061190
MOD_EXPORT void _INIT_() {

0 commit comments

Comments
 (0)