Correctly show channel frequencies in spectrum view when swapping SDR links
This commit is contained in:
parent
7fa5f85731
commit
86d4523cc7
|
@ -28,6 +28,9 @@
|
||||||
#include "../libdebug/debug.h"
|
#include "../libdebug/debug.h"
|
||||||
#include "sender.h"
|
#include "sender.h"
|
||||||
#include "../libtimer/timer.h"
|
#include "../libtimer/timer.h"
|
||||||
|
#ifdef HAVE_SDR
|
||||||
|
#include "../libsdr/sdr_config.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
/* debug time consumption of audio processing */
|
/* debug time consumption of audio processing */
|
||||||
//#define DEBUG_TIME_CONSUMPTION
|
//#define DEBUG_TIME_CONSUMPTION
|
||||||
|
@ -237,7 +240,7 @@ int sender_open_audio(int buffer_size, double interval)
|
||||||
/* in case of initialized spectrum display (SDR), we add all channels.
|
/* in case of initialized spectrum display (SDR), we add all channels.
|
||||||
* if spectrum display was not initialized (sound card), function call is ignored */
|
* if spectrum display was not initialized (sound card), function call is ignored */
|
||||||
for (inst = sender_head; inst; inst = inst->next)
|
for (inst = sender_head; inst; inst = inst->next)
|
||||||
display_spectrum_add_mark(inst->kanal, inst->empfangsfrequenz);
|
display_spectrum_add_mark(inst->kanal, (sdr_config->swap_links) ? inst->sendefrequenz : inst->empfangsfrequenz);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -267,6 +267,15 @@ void *sdr_open(const char __attribute__((__unused__)) *device, double *tx_freque
|
||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* swap links, if required */
|
||||||
|
if (sdr_config->swap_links) {
|
||||||
|
double *temp;
|
||||||
|
PDEBUG(DSDR, DEBUG_NOTICE, "Sapping RX and TX frequencies!\n");
|
||||||
|
temp = rx_frequency;
|
||||||
|
rx_frequency = tx_frequency;
|
||||||
|
tx_frequency = temp;
|
||||||
|
}
|
||||||
|
|
||||||
if (tx_frequency) {
|
if (tx_frequency) {
|
||||||
/* calculate required bandwidth (IQ rate) */
|
/* calculate required bandwidth (IQ rate) */
|
||||||
|
|
||||||
|
@ -458,14 +467,6 @@ void *sdr_open(const char __attribute__((__unused__)) *device, double *tx_freque
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (sdr_config->swap_links) {
|
|
||||||
double temp;
|
|
||||||
PDEBUG(DSDR, DEBUG_NOTICE, "Sapping RX and TX frequencies!\n");
|
|
||||||
temp = rx_center_frequency;
|
|
||||||
rx_center_frequency = tx_center_frequency;
|
|
||||||
tx_center_frequency = temp;
|
|
||||||
}
|
|
||||||
|
|
||||||
display_iq_init(samplerate);
|
display_iq_init(samplerate);
|
||||||
display_spectrum_init(samplerate, rx_center_frequency);
|
display_spectrum_init(samplerate, rx_center_frequency);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue