From 8a18bec55c6e579ad8e6b864b534c59112d1d724 Mon Sep 17 00:00:00 2001 From: Ryzerth Date: Tue, 18 May 2021 20:05:24 +0200 Subject: [PATCH] switched pothos version --- .github/workflows/build_all.yml | 2 +- sddc_source/src/main.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index dbab4a32..412fb86d 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -17,7 +17,7 @@ jobs: run: cmake -E make_directory ${{runner.workspace}}/build - name: Download PothosSDR - run: Invoke-WebRequest -Uri "https://downloads.myriadrf.org/builds/PothosSDR/PothosSDR-2021.02.28-vc16-x64.exe" -OutFile ${{runner.workspace}}/pothos.exe + run: Invoke-WebRequest -Uri "https://downloads.myriadrf.org/builds/PothosSDR/PothosSDR-2020.01.26-vc14-x64.exe" -OutFile ${{runner.workspace}}/pothos.exe - name: Install PothosSDR run: mkdir "C:/Program Files/PothosSDR" ; 7z x ${{runner.workspace}}/pothos.exe -o"C:/Program Files/PothosSDR/" diff --git a/sddc_source/src/main.cpp b/sddc_source/src/main.cpp index 9e4a4dbd..6209ca8d 100644 --- a/sddc_source/src/main.cpp +++ b/sddc_source/src/main.cpp @@ -183,11 +183,11 @@ private: if (_this->running) { style::beginDisabled(); } ImGui::SetNextItemWidth(menuWidth); - if (ImGui::Combo(CONCAT("##_airspyhf_dev_sel_", _this->name), &_this->devId, _this->devListTxt.c_str())) { + if (ImGui::Combo(CONCAT("##_sddc_dev_sel_", _this->name), &_this->devId, _this->devListTxt.c_str())) { // Select here } - if (ImGui::Combo(CONCAT("##_airspyhf_sr_sel_", _this->name), &_this->srId, _this->sampleRateListTxt.c_str())) { + if (ImGui::Combo(CONCAT("##_sddc_sr_sel_", _this->name), &_this->srId, _this->sampleRateListTxt.c_str())) { _this->sampleRate = _this->sampleRateList[_this->srId]; core::setInputSampleRate(_this->sampleRate); // Select SR here @@ -195,7 +195,7 @@ private: ImGui::SameLine(); float refreshBtnWdith = menuWidth - ImGui::GetCursorPosX(); - if (ImGui::Button(CONCAT("Refresh##_airspyhf_refr_", _this->name), ImVec2(refreshBtnWdith, 0))) { + if (ImGui::Button(CONCAT("Refresh##_sddc_refr_", _this->name), ImVec2(refreshBtnWdith, 0))) { _this->refresh(); // Reselect and reset samplerate if it changed }