From abf5ad2eec3edccc57f0f2083310e2e9ef1e6998 Mon Sep 17 00:00:00 2001 From: Ryzerth Date: Sun, 7 Mar 2021 16:14:08 +0100 Subject: [PATCH] fixed swapped b and hi-z ports --- core/src/core.cpp | 1 + make_windows_package.ps1 | 2 +- sdrplay_source/src/main.cpp | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/core/src/core.cpp b/core/src/core.cpp index 28708ad1..7613e364 100644 --- a/core/src/core.cpp +++ b/core/src/core.cpp @@ -130,6 +130,7 @@ int sdrpp_main(int argc, char *argv[]) { defConfig["moduleInstances"]["RTL-SDR Source"] = "rtl_sdr_source"; defConfig["moduleInstances"]["AirspyHF+ Source"] = "airspyhf_source"; defConfig["moduleInstances"]["Airspy Source"] = "airspy_source"; + //defConfig["moduleInstances"]["SDRplay Source"] = "sdrplay_source"; defConfig["moduleInstances"]["Audio Sink"] = "audio_sink"; defConfig["modules"] = json::array(); diff --git a/make_windows_package.ps1 b/make_windows_package.ps1 index 5012534b..4b8f0db2 100644 --- a/make_windows_package.ps1 +++ b/make_windows_package.ps1 @@ -30,7 +30,7 @@ cp build/rtl_tcp_source/Release/rtl_tcp_source.dll sdrpp_windows_x64/modules/ cp build/soapy_source/Release/soapy_source.dll sdrpp_windows_x64/modules/ cp build/audio_sink/Release/audio_sink.dll sdrpp_windows_x64/modules/ -cp build/audio_sink/Release/portaudio.dll sdrpp_windows_x64/ +cp "C:/Program Files (x86)/RtAudio/bin/rtaudio.dll" sdrpp_windows_x64/ Compress-Archive -Path sdrpp_windows_x64/ -DestinationPath sdrpp_windows_x64.zip diff --git a/sdrplay_source/src/main.cpp b/sdrplay_source/src/main.cpp index 4ac1096c..bd62e743 100644 --- a/sdrplay_source/src/main.cpp +++ b/sdrplay_source/src/main.cpp @@ -318,7 +318,7 @@ private: _this->openDevParams->rxChannelA->rsp2TunerParams.rfNotchEnable = _this->rsp2_notch; _this->openDevParams->rxChannelA->rsp2TunerParams.biasTEnable = _this->rsp2_biasT; _this->openDevParams->rxChannelA->rsp2TunerParams.antennaSel = rsp2_antennaPorts[_this->rsp2_antennaPort]; - _this->openDevParams->rxChannelA->rsp2TunerParams.amPortSel = (_this->rsp2_antennaPort == 2) ? sdrplay_api_Rsp2_AMPORT_2 : sdrplay_api_Rsp2_AMPORT_1; + _this->openDevParams->rxChannelA->rsp2TunerParams.amPortSel = (_this->rsp2_antennaPort == 2) ? sdrplay_api_Rsp2_AMPORT_1 : sdrplay_api_Rsp2_AMPORT_2; sdrplay_api_Update(_this->openDev.dev, _this->openDev.tuner, sdrplay_api_Update_Rsp2_RfNotchControl, sdrplay_api_Update_Ext1_None); sdrplay_api_Update(_this->openDev.dev, _this->openDev.tuner, sdrplay_api_Update_Rsp2_BiasTControl, sdrplay_api_Update_Ext1_None); sdrplay_api_Update(_this->openDev.dev, _this->openDev.tuner, sdrplay_api_Update_Rsp2_AntennaControl, sdrplay_api_Update_Ext1_None); @@ -475,7 +475,7 @@ private: } if (ImGui::Combo(CONCAT("Antenna##sdrplay_rsp2_ant", name), &rsp2_antennaPort, rsp2_antennaPortsTxt)) { openDevParams->rxChannelA->rsp2TunerParams.antennaSel = rsp2_antennaPorts[rsp2_antennaPort]; - openDevParams->rxChannelA->rsp2TunerParams.amPortSel = (rsp2_antennaPort == 2) ? sdrplay_api_Rsp2_AMPORT_2 : sdrplay_api_Rsp2_AMPORT_1; + openDevParams->rxChannelA->rsp2TunerParams.amPortSel = (rsp2_antennaPort == 2) ? sdrplay_api_Rsp2_AMPORT_1 : sdrplay_api_Rsp2_AMPORT_2; sdrplay_api_Update(openDev.dev, openDev.tuner, sdrplay_api_Update_Rsp2_AntennaControl, sdrplay_api_Update_Ext1_None); sdrplay_api_Update(openDev.dev, openDev.tuner, sdrplay_api_Update_Rsp2_AmPortSelect, sdrplay_api_Update_Ext1_None); }