fix sdrplay configuration bug

misc_modules/rigctl_client/src/main.cpp

@@ -10,54 +10,23 @@
 #include <config.h>
 #include <cctype>
 #include <radio_interface.h>
-#include <utils/optionlist.h>
-#include <atomic>
-
 #define CONCAT(a, b) ((std::string(a) + b).c_str())
 
 SDRPP_MOD_INFO{
     /* Name:            */ "rigctl_client",
     /* Description:     */ "Client for the RigCTL protocol",
     /* Author:          */ "Ryzerth",
-    /* Version:         */ 0, 2, 0,
+    /* Version:         */ 0, 1, 0,
     /* Max instances    */ 1
 };
 
 ConfigManager config;
 
-enum Mode {
-    MODE_PANADAPTER,
-    MODE_MIRROR
-};
-
-enum Priority {
-    PRIOR_SDR,
-    PRIOR_RIGCTL
-};
-
-const std::map<int, net::rigctl::Mode> RADIO_TO_RIGCTL = {
-    { RADIO_IFACE_MODE_NFM, net::rigctl::MODE_FM  },
-    { RADIO_IFACE_MODE_WFM, net::rigctl::MODE_WFM },
-    { RADIO_IFACE_MODE_AM , net::rigctl::MODE_AM  },
-    { RADIO_IFACE_MODE_DSB, net::rigctl::MODE_DSB },
-    { RADIO_IFACE_MODE_USB, net::rigctl::MODE_USB },
-    { RADIO_IFACE_MODE_CW , net::rigctl::MODE_CW  },
-    { RADIO_IFACE_MODE_LSB, net::rigctl::MODE_LSB }
-};
-
 class RigctlClientModule : public ModuleManager::Instance {
 public:
     RigctlClientModule(std::string name) {
         this->name = name;
 
-        // Define the operation modes
-        modes.define("panadapter", "Pandapter", MODE_PANADAPTER);
-        modes.define("mirror", "Mirror", MODE_MIRROR);
-
-        // Define the priority modes
-        priorities.define("sdr", "SDR", PRIOR_SDR);
-        priorities.define("rigctl", "RigCTL", PRIOR_RIGCTL);
-
         // Load default
         strcpy(host, "127.0.0.1");
 
@@ -71,28 +40,13 @@ public:
             port = config.conf[name]["port"];
             port = std::clamp<int>(port, 1, 65535);
         }
-        if (config.conf[name].contains("mode")) {
-            std::string modeStr = config.conf[name]["mode"];
-            if (modes.keyExists(modeStr)) { modeId = modes.keyId(modeStr); }
-        }
-        if (config.conf[name].contains("priority")) {
-            std::string priorityStr = config.conf[name]["priority"];
-            if (priorities.keyExists(priorityStr)) { priorityId = modes.keyId(priorityStr); }
-        }
-        if (config.conf[name].contains("interval")) {
-            interval = config.conf[name]["interval"];
-            interval = std::clamp<int>(interval, 100, 1000);
-        }
         if (config.conf[name].contains("ifFreq")) {
             ifFreq = config.conf[name]["ifFreq"];
         }
-        if (config.conf[name].contains("vfo")) {
-            selectedVFO = config.conf[name]["vfo"];
-        }
         config.release();
 
-        // Refresh VFOs
-        refreshVFOs();
+        _retuneHandler.ctx = this;
+        _retuneHandler.handler = retuneHandler;
 
         gui::menu.registerEntry(name, menuHandler, this, NULL);
     }
@@ -131,20 +85,10 @@ public:
             return;
         }
 
-        if (mode == MODE_PANADAPTER) {
-            // Switch source to panadapter mode
-            sigpath::sourceManager.setPanadapterIF(ifFreq);
-            sigpath::sourceManager.setTuningMode(SourceManager::TuningMode::PANADAPTER);
-        }
-
-        // Start the worker thread
-        run = true;
-        if (mode == MODE_PANADAPTER) {
-            workerThread = std::thread(&RigctlClientModule::panadapterWorker, this);
-        }
-        else if (mode == MODE_MIRROR) {
-            workerThread = std::thread(&RigctlClientModule::mirrorWorker, this);
-        }
+        // Switch source to panadapter mode
+        sigpath::sourceManager.setPanadapterIF(ifFreq);
+        sigpath::sourceManager.setTuningMode(SourceManager::TuningMode::PANADAPTER);
+        sigpath::sourceManager.onRetune.bindHandler(&_retuneHandler);
 
         running = true;
     }
@@ -153,15 +97,9 @@ public:
         std::lock_guard<std::recursive_mutex> lck(mtx);
         if (!running) { return; }
 
-        // Stop the worker thread
-        run = false;
-        if (workerThread.joinable()) { workerThread.join(); }
-
-        if (mode == MODE_PANADAPTER) {
-            // Switch source back to normal mode
-            sigpath::sourceManager.onRetune.unbindHandler(&_retuneHandler);
-            sigpath::sourceManager.setTuningMode(SourceManager::TuningMode::NORMAL);
-        }
+        // Switch source back to normal mode
+        sigpath::sourceManager.onRetune.unbindHandler(&_retuneHandler);
+        sigpath::sourceManager.setTuningMode(SourceManager::TuningMode::NORMAL);
 
         // Disconnect from rigctl server
         client->close();
@@ -187,70 +125,19 @@ private:
             config.conf[_this->name]["port"] = _this->port;
             config.release(true);
         }
-
-        ImGui::LeftLabel("Mode");
-        ImGui::FillWidth();
-        if (ImGui::Combo(CONCAT("##_rigctl_cli_mode_", _this->name), &_this->modeId, _this->modes.txt)) {
-            _this->mode = _this->modes[_this->modeId];
-            config.acquire();
-            config.conf[_this->name]["mode"] = _this->modes.key(_this->modeId);
-            config.release(true);
-        }
-
-        ImGui::LeftLabel("Priority");
-        ImGui::FillWidth();
-        if (ImGui::Combo(CONCAT("##_rigctl_cli_priority_", _this->name), &_this->priorityId, _this->priorities.txt)) {
-            _this->priority = _this->priorities[_this->priorityId];
-            config.acquire();
-            config.conf[_this->name]["priority"] = _this->priorities.key(_this->priorityId);
-            config.release(true);
-        }
-
-        ImGui::LeftLabel("Interval");
-        ImGui::FillWidth();
-        if (ImGui::InputInt(CONCAT("##_rigctl_cli_interval_", _this->name), &_this->interval, 10, 100)) {
-            _this->interval = std::clamp<int>(_this->interval, 100, 1000);
-            config.acquire();
-            config.conf[_this->name]["interval"] = _this->interval;
-            config.release(true);
-        }
-
-        if (_this->mode == MODE_PANADAPTER) {
-            ImGui::LeftLabel("IF Frequency");
-            ImGui::FillWidth();
-            if (ImGui::InputDouble(CONCAT("##_rigctl_if_freq_", _this->name), &_this->ifFreq, 100.0, 100000.0, "%.0f")) {
-                if (_this->running) {
-                    sigpath::sourceManager.setPanadapterIF(_this->ifFreq);
-                }
-                config.acquire();
-                config.conf[_this->name]["ifFreq"] = _this->ifFreq;
-                config.release(true);
-            }
-        }
-        else if (_this->mode == MODE_MIRROR) {
-            ImGui::LeftLabel("Controlled VFO");
-            ImGui::FillWidth();
-            if (ImGui::Combo(CONCAT("##_rigctl_cli_vfo_", _this->name), &_this->vfoId, _this->vfos.txt)) {
-                _this->selectedVFO = _this->vfos[_this->vfoId];
-                config.acquire();
-                config.conf[_this->name]["vfo"] = _this->vfos.key(_this->vfoId);
-                config.release(true);
-            }
-
-            ImGui::Checkbox(CONCAT("Sync Frequency##_rigctl_sync_freq_", _this->name), &_this->syncFrequency);
-            if (_this->vfoIsRadio) {
-                ImGui::Checkbox(CONCAT("Sync Mode##_rigctl_sync_freq_", _this->name), &_this->syncMode);
-            }
-            else {
-                bool dummy = false;
-                if (!_this->running) { style::beginDisabled(); }
-                ImGui::Checkbox(CONCAT("Sync Mode##_rigctl_sync_freq_", _this->name), &dummy);
-                if (!_this->running) { style::endDisabled(); }
-            }
-        }
-
         if (_this->running) { style::endDisabled(); }
-        
+
+        ImGui::LeftLabel("IF Frequency");
+        ImGui::FillWidth();
+        if (ImGui::InputDouble(CONCAT("##_rigctl_if_freq_", _this->name), &_this->ifFreq, 100.0, 100000.0, "%.0f")) {
+            if (_this->running) {
+                sigpath::sourceManager.setPanadapterIF(_this->ifFreq);
+            }
+            config.acquire();
+            config.conf[_this->name]["ifFreq"] = _this->ifFreq;
+            config.release(true);
+        }
+
         ImGui::FillWidth();
         if (_this->running && ImGui::Button(CONCAT("Stop##_rigctl_cli_stop_", _this->name), ImVec2(menuWidth, 0))) {
             _this->stop();
@@ -272,131 +159,11 @@ private:
         }
     }
 
-    void selectVFO(const std::string& vfoName) {
-        // If no vfo is available, deselect
-        if (vfos.empty()) {
-            selectedVFO.clear();
-            vfoIsRadio = false;
-            return;
-        }
-
-        // If a vfo with that name isn't found, select the first VFO in the list
-        if (!vfos.keyExists(vfoName)) {
-            selectVFO(vfos.key(0));
-            return;
-        }
-
-        // Check if the VFO is from a radio module
-        vfoIsRadio = (core::moduleManager.getInstanceModuleName(vfoName) == "radio");
-
-        // Update the selected VFO
-        selectedVFO = vfoName;
-        vfoId = vfos.keyId(vfoName);
-    }
-
-    void refreshVFOs() {
-        // Clear the list
-        vfos.clear();
-
-        // Define using the VFO list from the waterfall
-        for (auto const& [_name, vfo] : gui::waterfall.vfos) {
-            vfos.define(_name, _name, _name);
-        }
-        
-        // Reselect the current VFO
-        selectVFO(selectedVFO);
-    }
-
-    void panadapterWorker() {
-        int64_t lastRigctlFreq = -1;
-        int64_t lastCenterFreq = -1;
-        int64_t rigctlFreq;
-        int64_t centerFreq;
-
-        while (run) {
-            // Query the current modes
-            try {
-                // Get the current rigctl frequency
-                rigctlFreq = (int64_t)client->getFreq();
-
-                // Get the current center frequency
-                centerFreq = (int64_t)gui::waterfall.getCenterFrequency();
-            }
-            catch (const std::exception& e) {
-                flog::error("Error while getting frequencies: {}", e.what());
-            }
-
-            // Update frequencies depending on the priority
-            if (priority == PRIOR_SDR) {
-                
-            }
-            else if (priority == PRIOR_RIGCTL) {
-
-            }
-
-            // Save frequencies
-            lastRigctlFreq = rigctlFreq;
-            lastCenterFreq = centerFreq;
-
-            // Wait for the time interval
-            std::this_thread::sleep_for(std::chrono::milliseconds(interval));
-        }
-    }
-
-    void mirrorWorker() {
-        int64_t lastRigctlFreq = -1;
-        int64_t lastFreq = -1;
-        int64_t rigctlFreq;
-        int64_t freq;
-        int lastRigctlMode = -1;
-        int lastVFOMode = -1;
-        int rigctlMode;
-        int vfoMode;
-
-        while (run) {
-            // Query the current modes
-            try {
-                // Get the current rigctl frequency
-                rigctlFreq = (int64_t)client->getFreq();
-
-                // Get the rigctl and VFO modes
-                if (selectedVFO.empty()) {
-                    // Get the VFO frequency
-                    // TODO
-
-                    // Get the mode if needed
-                    if (syncMode && vfoIsRadio) {
-                        // Get the current rigctl mode
-                        // rigctlMode = client->getMode();
-
-                        // Get the current VFO mode
-                        core::modComManager.callInterface(selectedVFO, RADIO_IFACE_CMD_GET_MODE, NULL, &vfoMode);
-                    }
-                }
-                else {
-                    freq = (int64_t)gui::waterfall.getCenterFrequency();
-                }
-            }
-            catch (const std::exception& e) {
-                flog::error("Error while getting frequencies: {}", e.what());
-            }
-
-            // Update frequencies depending on the priority
-            if (priority == PRIOR_SDR) {
-                
-            }
-            else if (priority == PRIOR_RIGCTL) {
-
-            }
-
-            // Save modes and frequencies
-            lastRigctlFreq = rigctlFreq;
-            lastFreq = freq;
-            lastRigctlMode = rigctlMode;
-            lastVFOMode = vfoMode;
-
-            // Wait for the time interval
-            std::this_thread::sleep_for(std::chrono::milliseconds(interval));
+    static void retuneHandler(double freq, void* ctx) {
+        RigctlClientModule* _this = (RigctlClientModule*)ctx;
+        if (!_this->client || !_this->client->isOpen()) { return; }
+        if (_this->client->setFreq(freq)) {
+            flog::error("Could not set frequency");
         }
     }
 
@@ -409,31 +176,9 @@ private:
     int port = 4532;
     std::shared_ptr<net::rigctl::Client> client;
 
-    Mode mode = MODE_PANADAPTER;
-    int modeId = 0;
-
-    Priority priority = PRIOR_SDR;
-    int priorityId = 0;
-
-    int interval = 100;
-
     double ifFreq = 8830000.0;
 
-    bool syncFrequency = true;
-    bool syncMode = true;
-    bool vfoIsRadio = false;
-
     EventHandler<double> _retuneHandler;
-
-    OptionList<std::string, Mode> modes;
-    OptionList<std::string, Priority> priorities;
-
-    std::string selectedVFO = "";
-    int vfoId = 0;
-    OptionList<std::string, std::string> vfos;
-
-    std::atomic_bool run;
-    std::thread workerThread;
 };
 
 MOD_EXPORT void _INIT_() {

misc_modules/rigctl_client/src/rigctl_client.h

@@ -0,0 +1,10 @@
+#pragma once
+#include <utils/networking.h>
+
+class RigCTLClient {
+public:
+    
+
+private:
+
+};

misc_modules/rigctl_server/src/main.cpp

@@ -18,7 +18,7 @@ SDRPP_MOD_INFO{
     /* Name:            */ "rigctl_server",
     /* Description:     */ "My fancy new module",
     /* Author:          */ "Ryzerth",
-    /* Version:         */ 0, 1, 1,
+    /* Version:         */ 0, 1, 0,
     /* Max instances    */ -1
 };
 
@@ -153,16 +153,21 @@ private:
             }
         }
 
+        ImGui::BeginTable(CONCAT("Stop##_rigctl_srv_tbl_", _this->name), 2);
+        ImGui::TableNextRow();
+        ImGui::TableSetColumnIndex(0);
         if (ImGui::Checkbox(CONCAT("Tuning##_rigctl_srv_tune_ena_", _this->name), &_this->tuningEnabled)) {
             config.acquire();
             config.conf[_this->name]["tuning"] = _this->tuningEnabled;
             config.release(true);
         }
+        ImGui::TableSetColumnIndex(1);
         if (ImGui::Checkbox(CONCAT("Recording##_rigctl_srv_tune_ena_", _this->name), &_this->recordingEnabled)) {
             config.acquire();
             config.conf[_this->name]["recording"] = _this->recordingEnabled;
             config.release(true);
         }
+        ImGui::EndTable();
 
         if (ImGui::Checkbox(CONCAT("Listen on startup##_rigctl_srv_auto_lst_", _this->name), &_this->autoStart)) {
             config.acquire();

readme.md

@@ -377,7 +377,7 @@ Modules in beta are still included in releases for the most part but not enabled
 | frequency_manager   | Working    | -            | OPT_BUILD_FREQUENCY_MANAGER | ✅              | ✅               | ✅                         |
 | iq_exporter         | Working    | -            | OPT_BUILD_IQ_EXPORTER       | ✅              | ✅               | ⛔                         |
 | recorder            | Working    | -            | OPT_BUILD_RECORDER          | ✅              | ✅               | ✅                         |
-| rigctl_client       | Beta       | -            | OPT_BUILD_RIGCTL_CLIENT     | ✅              | ✅               | ⛔                         |
+| rigctl_client       | Unfinished | -            | OPT_BUILD_RIGCTL_CLIENT     | ✅              | ✅               | ⛔                         |
 | rigctl_server       | Working    | -            | OPT_BUILD_RIGCTL_SERVER     | ✅              | ✅               | ✅                         |
 | scanner             | Beta       | -            | OPT_BUILD_SCANNER           | ✅              | ✅               | ⛔                         |
 | scheduler           | Unfinished | -            | OPT_BUILD_SCHEDULER         | ⛔              | ⛔               | ⛔                         |

source_modules/sdrplay_source/src/main.cpp

@@ -8,6 +8,7 @@
 #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())
 
@@ -15,57 +16,12 @@ 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
 };
 
 ConfigManager config;
 
-unsigned int sampleRates[] = {
-    2000000,
-    3000000,
-    4000000,
-    5000000,
-    6000000,
-    7000000,
-    8000000,
-    9000000,
-    10000000
-};
-
-const char* sampleRatesTxt =
-    "2MHz\0"
-    "3MHz\0"
-    "4MHz\0"
-    "5MHz\0"
-    "6MHz\0"
-    "7MHz\0"
-    "8MHz\0"
-    "9MHz\0"
-    "10MHz\0";
-
-sdrplay_api_Bw_MHzT bandwidths[] = {
-    sdrplay_api_BW_0_200,
-    sdrplay_api_BW_0_300,
-    sdrplay_api_BW_0_600,
-    sdrplay_api_BW_1_536,
-    sdrplay_api_BW_5_000,
-    sdrplay_api_BW_6_000,
-    sdrplay_api_BW_7_000,
-    sdrplay_api_BW_8_000,
-};
-
-const char* bandwidthsTxt =
-    "200KHz\0"
-    "300KHz\0"
-    "600KHz\0"
-    "1.536MHz\0"
-    "5MHz\0"
-    "6MHz\0"
-    "7MHz\0"
-    "8MHz\0"
-    "Auto\0";
-
 sdrplay_api_Bw_MHzT preferedBandwidth[] = {
     sdrplay_api_BW_5_000,
     sdrplay_api_BW_5_000,
@@ -208,6 +164,11 @@ public:
                 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;
@@ -223,6 +184,11 @@ public:
                 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;
@@ -290,6 +256,30 @@ public:
             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.clear();
+        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);
+        bandwidths.define(0, "Auto", sdrplay_api_BW_Undefined);
+
         channelParams = openDevParams->rxChannelA;
 
         selectedName = devNameList[id];
@@ -297,7 +287,7 @@ public:
         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) {
@@ -306,78 +296,54 @@ public:
         else if (openDev.hwVer == SDRPLAY_RSPduo_ID) {
             lnaSteps = 10;
         }
-        else if (openDev.hwVer == SDRPLAY_RSPdx_ID) {
+        else if (openDev.hwVer == SDRPLAY_RSPdx_ID || openDev.hwVer == SDRPLAY_RSPdxR2_ID) {
             lnaSteps = 28;
         }
 
-        bool created = false;
+        // Select default settings
+        srId = 0;
+        sampleRate = samplerates.value(0);
+        bandwidthId = 8;
+        lnaGain = lnaSteps - 1;
+        gain = 59;
+        agc = false;
+        agcAttack = 500;
+        agcDecay = 500;
+        agcDecayDelay = 200;
+        agcDecayThreshold = 5;
+        agcSetPoint = -30;
+        ifModeId = 0;
+        rsp1a_fmmwNotch = false;
+        rsp2_fmmwNotch = false;
+        rspdx_fmmwNotch = false;
+        rspduo_fmmwNotch = false;
+        rsp1a_dabNotch = false;
+        rspdx_dabNotch = false;
+        rspduo_dabNotch = false;
+        rsp1a_biasT = false;
+        rsp2_biasT = false;
+        rspdx_biasT = false;
+        rspduo_biasT = false;
+        rsp2_antennaPort = 0;
+        rspdx_antennaPort = 0;
+        rspduo_antennaPort = 0;
+
         config.acquire();
-        if (!config.conf["devices"].contains(selectedName)) {
-            created = true;
-            config.conf["devices"][selectedName]["sampleRate"] = sampleRates[0];
-            config.conf["devices"][selectedName]["bwMode"] = 8; // Auto
-            config.conf["devices"][selectedName]["lnaGain"] = lnaSteps - 1;
-            config.conf["devices"][selectedName]["ifGain"] = 59;
-            config.conf["devices"][selectedName]["agc"] = false;
-
-            config.conf["devices"][selectedName]["agcAttack"] = 500;
-            config.conf["devices"][selectedName]["agcDecay"] = 500;
-            config.conf["devices"][selectedName]["agcDecayDelay"] = 200;
-            config.conf["devices"][selectedName]["agcDecayThreshold"] = 5;
-            config.conf["devices"][selectedName]["agcSetPoint"] = -30;
-
-            config.conf["devices"][selectedName]["ifModeId"] = 0;
-
-            if (openDev.hwVer == SDRPLAY_RSP1_ID) {
-                // No config to load
-            }
-            else if (openDev.hwVer == SDRPLAY_RSP1A_ID) {
-                config.conf["devices"][selectedName]["fmmwNotch"] = false;
-                config.conf["devices"][selectedName]["dabNotch"] = false;
-                config.conf["devices"][selectedName]["biast"] = false;
-            }
-            else if (openDev.hwVer == SDRPLAY_RSP2_ID) {
-                config.conf["devices"][selectedName]["antenna"] = 0;
-                config.conf["devices"][selectedName]["fmmwNotch"] = false;
-                config.conf["devices"][selectedName]["biast"] = false;
-            }
-            else if (openDev.hwVer == SDRPLAY_RSPduo_ID) {
-                config.conf["devices"][selectedName]["antenna"] = 0;
-                config.conf["devices"][selectedName]["fmmwNotch"] = false;
-                config.conf["devices"][selectedName]["dabNotch"] = false;
-                config.conf["devices"][selectedName]["biast"] = false;
-            }
-            else if (openDev.hwVer == SDRPLAY_RSPdx_ID) {
-                config.conf["devices"][selectedName]["antenna"] = 0;
-                config.conf["devices"][selectedName]["fmmwNotch"] = false;
-                config.conf["devices"][selectedName]["dabNotch"] = false;
-                config.conf["devices"][selectedName]["biast"] = false;
-            }
-        }
 
         // General options
-        if (config.conf["devices"][selectedName].contains("sampleRate")) {
-            sampleRate = config.conf["devices"][selectedName]["sampleRate"];
-            bool found = false;
-            for (int i = 0; i < 9; i++) {
-                if (sampleRates[i] == sampleRate) {
-                    srId = i;
-                    found = true;
-                }
-            }
-            if (!found) {
-                sampleRate = sampleRates[0];
-                srId = 0;
+        if (config.conf["devices"][selectedName].contains("samplerate")) {
+            int sr = config.conf["devices"][selectedName]["samplerate"];
+            if (samplerates.keyExists(sr)) {
+                srId = samplerates.keyId(sr);
+                sampleRate = samplerates[srId];
             }
         }
-
         if (config.conf["devices"][selectedName].contains("ifModeId")) {
             ifModeId = config.conf["devices"][selectedName]["ifModeId"];
             if (ifModeId != 0) {
                 sampleRate = ifModes[ifModeId].effectiveSamplerate;
             }
         }
-
         if (config.conf["devices"][selectedName].contains("bwMode")) {
             bandwidthId = config.conf["devices"][selectedName]["bwMode"];
         }
@@ -388,11 +354,6 @@ public:
             gain = config.conf["devices"][selectedName]["ifGain"];
         }
         if (config.conf["devices"][selectedName].contains("agc")) {
-            if (!config.conf["devices"][selectedName]["agc"].is_boolean()) {
-                int oldMode = config.conf["devices"][selectedName]["agc"];
-                config.conf["devices"][selectedName]["agc"] = (bool)(oldMode != 0);
-                created = true;
-            }
             agc = config.conf["devices"][selectedName]["agc"];
         }
         if (config.conf["devices"][selectedName].contains("agcAttack")) {
@@ -415,7 +376,7 @@ public:
         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"];
             }
@@ -451,7 +412,7 @@ public:
                 rspduo_biasT = config.conf["devices"][selectedName]["biast"];
             }
         }
-        else if (openDev.hwVer == SDRPLAY_RSPdx_ID) {
+        else if (openDev.hwVer == SDRPLAY_RSPdx_ID || openDev.hwVer == SDRPLAY_RSPdxR2_ID) {
             if (config.conf["devices"][selectedName].contains("antenna")) {
                 rspdx_antennaPort = config.conf["devices"][selectedName]["antenna"];
             }
@@ -466,7 +427,7 @@ public:
             }
         }
 
-        config.release(created);
+        config.release();
 
         if (lnaGain >= lnaSteps) { lnaGain = lnaSteps - 1; }
 
@@ -614,7 +575,7 @@ private:
 
         // General options
         if (_this->ifModeId == 0) {
-            _this->bandwidth = (_this->bandwidthId == 8) ? preferedBandwidth[_this->srId] : bandwidths[_this->bandwidthId];
+            _this->bandwidth = (_this->bandwidthId == 8) ? preferedBandwidth[_this->srId] : _this->bandwidths[_this->bandwidthId];
             _this->openDevParams->devParams->fsFreq.fsHz = _this->sampleRate;
             _this->channelParams->tunerParams.bwType = _this->bandwidth;
         }
@@ -693,14 +654,14 @@ private:
         }
 
         if (_this->ifModeId == 0) {
-            if (SmGui::Combo(CONCAT("##sdrplay_sr", _this->name), &_this->srId, sampleRatesTxt)) {
-                _this->sampleRate = sampleRates[_this->srId];
+            if (SmGui::Combo(CONCAT("##sdrplay_sr", _this->name), &_this->srId, _this->samplerates.txt)) {
+                _this->sampleRate = _this->samplerates[_this->srId];
                 if (_this->bandwidthId == 8) {
                     _this->bandwidth = preferedBandwidth[_this->srId];
                 }
                 core::setInputSampleRate(_this->sampleRate);
                 config.acquire();
-                config.conf["devices"][_this->selectedName]["sampleRate"] = _this->sampleRate;
+                config.conf["devices"][_this->selectedName]["samplerate"] = _this->samplerates.key(_this->srId);
                 config.release(true);
             }
 
@@ -715,8 +676,8 @@ private:
 
             SmGui::LeftLabel("Bandwidth");
             SmGui::FillWidth();
-            if (SmGui::Combo(CONCAT("##sdrplay_bw", _this->name), &_this->bandwidthId, bandwidthsTxt)) {
-                _this->bandwidth = (_this->bandwidthId == 8) ? preferedBandwidth[_this->srId] : bandwidths[_this->bandwidthId];
+            if (SmGui::Combo(CONCAT("##sdrplay_bw", _this->name), &_this->bandwidthId, _this->bandwidths.txt)) {
+                _this->bandwidth = (_this->bandwidthId == 8) ? preferedBandwidth[_this->srId] : _this->bandwidths[_this->bandwidthId];
                 if (_this->running) {
                     _this->channelParams->tunerParams.bwType = _this->bandwidth;
                     sdrplay_api_Update(_this->openDev.dev, _this->openDev.tuner, sdrplay_api_Update_Tuner_BwType, sdrplay_api_Update_Ext1_None);
@@ -745,10 +706,28 @@ private:
             }
             else {
                 config.acquire();
-                _this->sampleRate = config.conf["devices"][_this->selectedName]["sampleRate"];
-                _this->bandwidthId = config.conf["devices"][_this->selectedName]["bwMode"];
-                config.release(false);
-                _this->bandwidth = (_this->bandwidthId == 8) ? preferedBandwidth[_this->srId] : bandwidths[_this->bandwidthId];
+                // Reload samplerate
+                if (config.conf["devices"][_this->selectedName].contains("samplerate")) {
+                    int sr = config.conf["devices"][_this->selectedName]["samplerate"];
+                    if (_this->samplerates.keyExists(sr)) {
+                        _this->srId = _this->samplerates.keyId(sr);
+                    }
+                }
+                else {
+                    _this->srId = 0;
+                }
+
+                // Reload bandwidth
+                if (config.conf["devices"][_this->selectedName].contains("bwMode")) {
+                    _this->bandwidthId = config.conf["devices"][_this->selectedName]["bwMode"];
+                }
+                else {
+                    // Auto
+                    _this->bandwidthId = 8;
+                }
+                _this->sampleRate = _this->samplerates[_this->srId];
+                config.release();
+                _this->bandwidth = (_this->bandwidthId == 8) ? preferedBandwidth[_this->srId] : _this->bandwidths[_this->bandwidthId];
             }
             core::setInputSampleRate(_this->sampleRate);
             config.acquire();
@@ -854,6 +833,7 @@ private:
                 _this->RSP1Menu();
                 break;
             case SDRPLAY_RSP1A_ID:
+            case SDRPLAY_RSP1B_ID:
                 _this->RSP1AMenu();
                 break;
             case SDRPLAY_RSP2_ID:
@@ -863,6 +843,7 @@ private:
                 _this->RSPduoMenu();
                 break;
             case SDRPLAY_RSPdx_ID:
+            case SDRPLAY_RSPdxR2_ID:
                 _this->RSPdxMenu();
                 break;
             default:
@@ -1146,7 +1127,7 @@ private:
     sdrplay_api_RxChannelParamsT* channelParams;
 
     sdrplay_api_Bw_MHzT bandwidth;
-    int bandwidthId = 0;
+    int bandwidthId = 8; // Auto
 
     int devId = 0;
     int srId = 0;
@@ -1201,6 +1182,9 @@ private:
     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_() {