mirror/SDRPlusPlus
0
0
Fork 0
mirror of https://github.com/AlexandreRouma/SDRPlusPlus.git synced 2025-02-08 23:28:43 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed airspy hf+ module bug

Browse Source
This commit is contained in:
Ryzerth 2020-12-16 01:45:17 +01:00
parent 5099c16a12
commit e90b6656c3
5 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -14,7 +14,6 @@ add_subdirectory("rtl_tcp_source")
add_subdirectory("audio_sink") add_subdirectory("audio_sink")
#add_subdirectory("rx888_source") #add_subdirectory("rx888_source")
add_subdirectory("plutosdr_source") add_subdirectory("plutosdr_source")
#add_subdirectory("demo")
if (MSVC) if (MSVC)
set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc") set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")

2
airspyhf_source/src/main.cpp
View File

@ -113,6 +113,8 @@ public:
int n = sampleRates[0]; int n = sampleRates[0];
airspyhf_get_samplerates(dev, sampleRates, n); airspyhf_get_samplerates(dev, sampleRates, n);
char buf[1024]; char buf[1024];
sampleRateList.clear();
sampleRateListTxt = "";
for (int i = 0; i < n; i++) { for (int i = 0; i < n; i++) {
sampleRateList.push_back(sampleRates[i]); sampleRateList.push_back(sampleRates[i]);
sprintf(buf, "%d", sampleRates[i]); sprintf(buf, "%d", sampleRates[i]);

5
core/src/dsp/routing.h
View File

@ -158,6 +158,7 @@ namespace dsp {
int readCount = std::min<int>(_keep + _skip, _keep); int readCount = std::min<int>(_keep + _skip, _keep);
int skip = std::max<int>(_skip, 0); int skip = std::max<int>(_skip, 0);
int delaySize = (-_skip) * sizeof(complex_t); int delaySize = (-_skip) * sizeof(complex_t);
int delayCount = (-_skip);
complex_t* start = &buf[std::max<int>(-_skip, 0)]; complex_t* start = &buf[std::max<int>(-_skip, 0)];
complex_t* delayStart = &buf[_keep + _skip]; complex_t* delayStart = &buf[_keep + _skip];
@ -165,6 +166,10 @@ namespace dsp {
while (true) { while (true) {
if (delay) { if (delay) {
memmove(buf, delayStart, delaySize); memmove(buf, delayStart, delaySize);
for (int i = 0; i < delayCount; i++) {
buf[i].i /= 10.0f;
buf[i].q /= 10.0f;
}
} }
if (ringBuf.readAndSkip(start, readCount, skip) < 0) { break; }; if (ringBuf.readAndSkip(start, readCount, skip) < 0) { break; };
if (out.aquire() < 0) { break; } if (out.aquire() < 0) { break; }

10
root_dev/config.json
View File

@ -3,9 +3,9 @@
"bandPlanEnabled": true, "bandPlanEnabled": true,
"centerTuning": false, "centerTuning": false,
"fftHeight": 300, "fftHeight": 300,
"frequency": 7375000, "frequency": 7350000,
"max": -20.588237762451172, "max": -25.0,
"maximized": false, "maximized": true,
"menuOrder": [ "menuOrder": [
"Source", "Source",
"Radio", "Radio",
@ -17,7 +17,7 @@
"Display" "Display"
], ],
"menuWidth": 300, "menuWidth": 300,
"min": -54.41176986694336, "min": -63.235294342041016,
"moduleInstances": { "moduleInstances": {
"AirspyHF+ Source": "airspyhf_source", "AirspyHF+ Source": "airspyhf_source",
"Audio Sink": "audio_sink", "Audio Sink": "audio_sink",
@ -43,7 +43,7 @@
"Radio": { "Radio": {
"muted": false, "muted": false,
"sink": "Audio", "sink": "Audio",
"volume": 0.12755101919174194 "volume": 0.13265305757522583
}, },
"Radio 1": { "Radio 1": {
"muted": false, "muted": false,

5
root_dev/soapy_source_config.json
View File

@ -1,5 +1,5 @@
{ {
"device": "", "device": "AirSpy HF+ [c852435de0224af7]",
"devices": { "devices": {
"": { "": {
"agc": true, "agc": true,
@ -39,7 +39,8 @@
"sampleRate": 8000000.0 "sampleRate": 8000000.0
}, },
"Microphone (Realtek High Definition Audio)": { "Microphone (Realtek High Definition Audio)": {
"sampleRate": 96000.0 "agc": false,
"sampleRate": 44100.0
}, },
"PulseAudio": { "PulseAudio": {
"sampleRate": 96000.0 "sampleRate": 96000.0