mirror/SDRPlusPlus
0
0
Fork 0
mirror of https://github.com/AlexandreRouma/SDRPlusPlus.git synced 2025-03-26 01:35:29 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed small bug in SSB tuning

Browse Source
This commit is contained in:
Ryzerth 2021-02-02 21:49:35 +01:00
parent 2f93c7ae58
commit 29e9db184f
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/gui/main_window.cpp
View File

@ -299,7 +299,7 @@ void setVFO(double freq) {
if (vfoBottom < bottom) { if (vfoBottom < bottom) {
gui::waterfall.setViewOffset((BW / 2.0) - (viewBW / 2.0)); gui::waterfall.setViewOffset((BW / 2.0) - (viewBW / 2.0));
double newVFOOffset = (BW / 2.0) - (vfoBW / 2.0) - (viewBW / 10.0); double newVFOOffset = (BW / 2.0) - (vfoBW / 2.0) - (viewBW / 10.0);
sigpath::vfoManager.setCenterOffset(gui::waterfall.selectedVFO, newVFOOffset); sigpath::vfoManager.setOffset(gui::waterfall.selectedVFO, newVFOOffset);
gui::waterfall.setCenterFrequency(freq - newVFOOffset); gui::waterfall.setCenterFrequency(freq - newVFOOffset);
sigpath::sourceManager.tune(freq - newVFOOffset); sigpath::sourceManager.tune(freq - newVFOOffset);
return; return;
@ -309,7 +309,7 @@ void setVFO(double freq) {
if (vfoTop > top) { if (vfoTop > top) {
gui::waterfall.setViewOffset((viewBW / 2.0) - (BW / 2.0)); gui::waterfall.setViewOffset((viewBW / 2.0) - (BW / 2.0));
double newVFOOffset = (vfoBW / 2.0) - (BW / 2.0) + (viewBW / 10.0); double newVFOOffset = (vfoBW / 2.0) - (BW / 2.0) + (viewBW / 10.0);
sigpath::vfoManager.setCenterOffset(gui::waterfall.selectedVFO, newVFOOffset); sigpath::vfoManager.setOffset(gui::waterfall.selectedVFO, newVFOOffset);
gui::waterfall.setCenterFrequency(freq - newVFOOffset); gui::waterfall.setCenterFrequency(freq - newVFOOffset);
sigpath::sourceManager.tune(freq - newVFOOffset); sigpath::sourceManager.tune(freq - newVFOOffset);
return; return;

10
hackrf_source/src/main.cpp
View File

@ -8,6 +8,8 @@
#include <config.h> #include <config.h>
#include <libhackrf/hackrf.h> #include <libhackrf/hackrf.h>
#pragma optimize( "", off )
#define CONCAT(a, b) ((std::string(a) + b).c_str()) #define CONCAT(a, b) ((std::string(a) + b).c_str())
SDRPP_MOD_INFO { SDRPP_MOD_INFO {
@ -89,7 +91,7 @@ public:
for (int i = 0; i < _devList->devicecount; i++) { for (int i = 0; i < _devList->devicecount; i++) {
devList.push_back(_devList->serial_numbers[i]); devList.push_back(_devList->serial_numbers[i]);
devListTxt += _devList->serial_numbers[i]; devListTxt += (char*)(_devList->serial_numbers[i] + 16);
devListTxt += '\0'; devListTxt += '\0';
} }
@ -114,7 +116,7 @@ private:
spdlog::info("HackRFSourceModule '{0}': Menu Deselect!", _this->name); spdlog::info("HackRFSourceModule '{0}': Menu Deselect!", _this->name);
} }
#pragma optimize( "", off )
static void start(void* ctx) { static void start(void* ctx) {
HackRFSourceModule* _this = (HackRFSourceModule*)ctx; HackRFSourceModule* _this = (HackRFSourceModule*)ctx;
@ -146,8 +148,6 @@ private:
spdlog::info("HackRFSourceModule '{0}': Start!", _this->name); spdlog::info("HackRFSourceModule '{0}': Start!", _this->name);
} }
#pragma optimize( "", on )
static void stop(void* ctx) { static void stop(void* ctx) {
HackRFSourceModule* _this = (HackRFSourceModule*)ctx; HackRFSourceModule* _this = (HackRFSourceModule*)ctx;
if (!_this->running) { if (!_this->running) {
@ -273,3 +273,5 @@ MOD_EXPORT void _END_() {
// config.disableAutoSave(); // config.disableAutoSave();
// config.save(); // config.save();
} }
#pragma optimize( "", on )