Skip to content

Commit

Permalink
some fucking changes too lazy to name this shit
Browse files Browse the repository at this point in the history
  • Loading branch information
@AlexandreRouma
AlexandreRouma committed Nov 27, 2024
1 parent 11f87e0 commit 304d5c4
Showing 1 changed file with 46 additions and 7 deletions.
53 changes: 46 additions & 7 deletions source_modules/sdrplay_source/src/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,15 @@
#include <config.h>
#include <sdrplay_api.h>
#include <gui/smgui.h>
#include <utils/optionlist.h>

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

SDRPP_MOD_INFO{
/* Name: */ "sdrplay_source",
/* Description: */ "SDRplay source module for SDR++",
/* Author: */ "Ryzerth",
/* Version: */ 0, 1, 0,
/* Version: */ 0, 2, 0,
/* Max instances */ 1
};

Expand Down Expand Up @@ -208,6 +209,11 @@ class SDRPlaySourceModule : public ModuleManager::Instance {
name += devArr[i].SerNo;
name += ')';
break;
case SDRPLAY_RSP1B_ID:
name = "RSP1B (";
name += devArr[i].SerNo;
name += ')';
break;
case SDRPLAY_RSP2_ID:
name = "RSP2 (";
name += devArr[i].SerNo;
Expand All @@ -223,6 +229,11 @@ class SDRPlaySourceModule : public ModuleManager::Instance {
name += devArr[i].SerNo;
name += ')';
break;
case SDRPLAY_RSPdxR2_ID:
name = "RSPdx-R2 (";
name += devArr[i].SerNo;
name += ')';
break;
default:
name = "Unknown (";
name += devArr[i].SerNo;
Expand Down Expand Up @@ -290,14 +301,37 @@ class SDRPlaySourceModule : public ModuleManager::Instance {
return;
}

// Define the valid samplerates
samplerates.clear();
samplerates.define(2e6, "2MHz", 2e6);
samplerates.define(3e6, "3MHz", 3e6);
samplerates.define(4e6, "4MHz", 4e6);
samplerates.define(5e6, "5MHz", 5e6);
samplerates.define(6e6, "6MHz", 6e6);
samplerates.define(7e6, "7MHz", 7e6);
samplerates.define(8e6, "8MHz", 8e6);
samplerates.define(9e6, "9MHz", 9e6);
samplerates.define(10e6, "10MHz", 10e6);

// Define the valid bandwidths
bandwidths.define(0, "Auto", sdrplay_api_BW_Undefined);
bandwidths.define(200e3, "200KHz", sdrplay_api_BW_0_200);
bandwidths.define(300e3, "300KHz", sdrplay_api_BW_0_300);
bandwidths.define(600e3, "600KHz", sdrplay_api_BW_0_600);
bandwidths.define(1.536e6, "1.536MHz", sdrplay_api_BW_1_536);
bandwidths.define(5e6, "5MHz", sdrplay_api_BW_5_000);
bandwidths.define(6e6, "6MHz", sdrplay_api_BW_6_000);
bandwidths.define(7e6, "7MHz", sdrplay_api_BW_7_000);
bandwidths.define(8e6, "8MHz", sdrplay_api_BW_8_000);

channelParams = openDevParams->rxChannelA;

selectedName = devNameList[id];

if (openDev.hwVer == SDRPLAY_RSP1_ID) {
lnaSteps = 4;
}
else if (openDev.hwVer == SDRPLAY_RSP1A_ID) {
else if (openDev.hwVer == SDRPLAY_RSP1A_ID || openDev.hwVer == SDRPLAY_RSP1B_ID) {
lnaSteps = 10;
}
else if (openDev.hwVer == SDRPLAY_RSP2_ID) {
Expand All @@ -306,7 +340,7 @@ class SDRPlaySourceModule : public ModuleManager::Instance {
else if (openDev.hwVer == SDRPLAY_RSPduo_ID) {
lnaSteps = 10;
}
else if (openDev.hwVer == SDRPLAY_RSPdx_ID) {
else if (openDev.hwVer == SDRPLAY_RSP1A_ID || openDev.hwVer == SDRPLAY_RSPdxR2_ID) {
lnaSteps = 28;
}

Expand All @@ -331,7 +365,7 @@ class SDRPlaySourceModule : public ModuleManager::Instance {
if (openDev.hwVer == SDRPLAY_RSP1_ID) {
// No config to load
}
else if (openDev.hwVer == SDRPLAY_RSP1A_ID) {
else if (openDev.hwVer == SDRPLAY_RSP1A_ID || openDev.hwVer == SDRPLAY_RSP1B_ID) {
config.conf["devices"][selectedName]["fmmwNotch"] = false;
config.conf["devices"][selectedName]["dabNotch"] = false;
config.conf["devices"][selectedName]["biast"] = false;
Expand All @@ -347,7 +381,7 @@ class SDRPlaySourceModule : public ModuleManager::Instance {
config.conf["devices"][selectedName]["dabNotch"] = false;
config.conf["devices"][selectedName]["biast"] = false;
}
else if (openDev.hwVer == SDRPLAY_RSPdx_ID) {
else if (openDev.hwVer == SDRPLAY_RSP1A_ID || openDev.hwVer == SDRPLAY_RSPdxR2_ID) {
config.conf["devices"][selectedName]["antenna"] = 0;
config.conf["devices"][selectedName]["fmmwNotch"] = false;
config.conf["devices"][selectedName]["dabNotch"] = false;
Expand Down Expand Up @@ -415,7 +449,7 @@ class SDRPlaySourceModule : public ModuleManager::Instance {
if (openDev.hwVer == SDRPLAY_RSP1_ID) {
// No config to load
}
else if (openDev.hwVer == SDRPLAY_RSP1A_ID) {
else if (openDev.hwVer == SDRPLAY_RSP1A_ID || openDev.hwVer == SDRPLAY_RSP1B_ID) {
if (config.conf["devices"][selectedName].contains("fmmwNotch")) {
rsp1a_fmmwNotch = config.conf["devices"][selectedName]["fmmwNotch"];
}
Expand Down Expand Up @@ -451,7 +485,7 @@ class SDRPlaySourceModule : public ModuleManager::Instance {
rspduo_biasT = config.conf["devices"][selectedName]["biast"];
}
}
else if (openDev.hwVer == SDRPLAY_RSPdx_ID) {
else if (openDev.hwVer == SDRPLAY_RSP1A_ID || openDev.hwVer == SDRPLAY_RSPdxR2_ID) {
if (config.conf["devices"][selectedName].contains("antenna")) {
rspdx_antennaPort = config.conf["devices"][selectedName]["antenna"];
}
Expand Down Expand Up @@ -854,6 +888,7 @@ class SDRPlaySourceModule : public ModuleManager::Instance {
_this->RSP1Menu();
break;
case SDRPLAY_RSP1A_ID:
case SDRPLAY_RSP1B_ID:
_this->RSP1AMenu();
break;
case SDRPLAY_RSP2_ID:
Expand All @@ -863,6 +898,7 @@ class SDRPlaySourceModule : public ModuleManager::Instance {
_this->RSPduoMenu();
break;
case SDRPLAY_RSPdx_ID:
case SDRPLAY_RSPdxR2_ID:
_this->RSPdxMenu();
break;
default:
Expand Down Expand Up @@ -1201,6 +1237,9 @@ class SDRPlaySourceModule : public ModuleManager::Instance {
std::string devListTxt;
std::vector<std::string> devNameList;
std::string selectedName;

OptionList<int, int> samplerates;
OptionList<int, sdrplay_api_Bw_MHzT> bandwidths;
};

MOD_EXPORT void _INIT_() {
Expand Down

0 comments on commit 304d5c4

Please sign in to comment.