comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2026-07-26 03:54:15 -04:00
Code Issues Projects Releases Wiki Activity

More sample rates, unify defaults

Browse Source 
- also fix possible crash related to unlocking before queueing visual
data.
This commit is contained in:
Charles J. Cliffe
2015-06-11 17:18:36 -04:00
parent 721f775bdd
commit 6c016a7199
6 changed files with 82 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sdr/SDRPostThread.cpp
+2 -2
View File
@@ -149,9 +149,9 @@ void SDRPostThread::threadMain() {
visualDataOut->sampleRate = data_in->sampleRate;
visualDataOut->data.assign(dataOut.begin(), dataOut.begin() + num_vis_samples);
visualDataOut->busy_rw.unlock();
iqVisualQueue.load()->push(visualDataOut);
visualDataOut->busy_rw.unlock();
}
busy_demod.lock();
src/sdr/SDRThread.cpp
+11 -2
View File
@@ -141,6 +141,7 @@ void SDRThread::threadMain() {
long long frequency = DEFAULT_FREQ;
int ppm = wxGetApp().getConfig()->getDevice(devs[deviceId]->getDeviceId())->getPPM();
int direct_sampling_mode = 0;
int buf_size = BUF_SIZE;
rtlsdr_open(&dev, deviceId);
rtlsdr_set_sample_rate(dev, sampleRate);
@@ -199,6 +200,13 @@ void SDRThread::threadMain() {
case SDRThreadCommand::SDR_THREAD_CMD_SET_SAMPLERATE:
rate_changed = true;
new_rate = command.llong_value;
if (new_rate <= 250000) {
buf_size = BUF_SIZE/4;
} else if (new_rate < 1500000) {
buf_size = BUF_SIZE/2;
} else {
buf_size = BUF_SIZE;
}
std::cout << "Set sample rate: " << new_rate << std::endl;
break;
case SDRThreadCommand::SDR_THREAD_CMD_SET_DEVICE:
@@ -237,8 +245,9 @@ void SDRThread::threadMain() {
offset = new_offset;
}
if (rate_changed) {
sampleRate = new_rate;
rtlsdr_set_sample_rate(dev, new_rate);
sampleRate = rtlsdr_get_sample_rate(dev);
rtlsdr_reset_buffer(dev);
}
if (freq_changed) {
frequency = new_freq;
@@ -253,7 +262,7 @@ void SDRThread::threadMain() {
}
}
rtlsdr_read_sync(dev, buf, BUF_SIZE, &n_read);
rtlsdr_read_sync(dev, buf, buf_size, &n_read);
SDRThreadIQData *dataOut = NULL;