Skip to content

Add multichannel support #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
darkstar007 wants to merge 18 commits into
base: master
Choose a base branch
from
Open

Add multichannel support #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
97ffe47
Add code to allow the setting of the antenna.
darkstar007 Mar 12, 2017
d3757a1
Start to mess around with multichannel.
Mar 12, 2017
b403682
It now compiles.
darkstar007 Mar 13, 2017
0e4f0b2
Fix a bunch of bugs.
darkstar007 Mar 16, 2017
846545a
Fix multi-channel bug.
darkstar007 Mar 16, 2017
feac5f1
Add optional bandwidth arg.
darkstar007 Mar 19, 2017
ad5f355
Make sample count a 64 bit variable.
darkstar007 Mar 19, 2017
f52eb76
Add the channel aware long options.
darkstar007 Mar 25, 2017
940fcb0
Merge branch 'master' of https://github.com/darkstar007/rx_tools
darkstar007 Mar 25, 2017
dbe51b5
Check all mallocs actually worked.
darkstar007 Mar 25, 2017
583f965
Fix issue with counting args
darkstar007 Mar 25, 2017
ab2afa5
Handle case of failed write
darkstar007 Mar 25, 2017
5704bc0
Fix indentation.
darkstar007 Mar 27, 2017
176dc79
Use right format for size_t!
darkstar007 Mar 27, 2017
e7fa186
Update error message.
darkstar007 May 20, 2017
827d78b
Fix issue if no gain selected.
darkstar007 Jun 23, 2017
6a68525
Another gain fix.
darkstar007 Jun 24, 2017
ee206f2
Turn warnings into errors.
May 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
145 changes: 95 additions & 50 deletions src/convenience/convenience.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,22 +42,22 @@
#ifdef _MSC_VER
struct tm *localtime_r (const time_t *timer, struct tm *result)
{
struct tm *local_result = localtime (timer);
if (local_result == NULL || result == NULL) return NULL;
memcpy (result, local_result, sizeof (struct tm));
return result;
struct tm *local_result = localtime (timer);
if (local_result == NULL || result == NULL) return NULL;
memcpy (result, local_result, sizeof (struct tm));
return result;
}

//http://unixpapa.com/incnote/string.html
char * strsep(char **sp, char *sep)
{
char *p, *s;
if (sp == NULL || *sp == NULL || **sp == '\0') return(NULL);
s = *sp;
p = s + strcspn(s, sep);
if (*p != '\0') *p++ = '\0';
*sp = p;
return(s);
char *p, *s;
if (sp == NULL || *sp == NULL || **sp == '\0') return(NULL);
s = *sp;
p = s + strcspn(s, sep);
if (*p != '\0') *p++ = '\0';
*sp = p;
return(s);
}
#endif

Expand Down Expand Up @@ -134,47 +134,74 @@ double atofp(char *s)
return atof(s);
}

int verbose_set_frequency(SoapySDRDevice *dev, uint32_t frequency)
int verbose_set_frequency(SoapySDRDevice *dev, uint32_t frequency, size_t chan)
{
int r;

SoapySDRKwargs args = {0};
r = (int)SoapySDRDevice_setFrequency(dev, SOAPY_SDR_RX, 0, (double)frequency, &args);
r = (int)SoapySDRDevice_setFrequency(dev, SOAPY_SDR_RX, chan, (double)frequency, &args);
if (r != 0) {
fprintf(stderr, "ERROR: Failed to set center freq. for chan %zu\n", chan);
exit(10);
} else {
fprintf(stderr, "Tuned to %u Hz on channel %zu.\n", frequency, chan);
}

return r;
}

int verbose_set_antenna(SoapySDRDevice *dev, const char * ant, size_t chan)
{
int r;
if (ant != NULL) {
r = (int)SoapySDRDevice_setAntenna(dev, SOAPY_SDR_RX, chan, ant);
} else {
r = 0;
}

if (r != 0) {
fprintf(stderr, "WARNING: Failed to set center freq.\n");
fprintf(stderr, "ERROR: Failed to set antenna for chan %zu.\n", chan);
exit(11);
} else {
fprintf(stderr, "Tuned to %u Hz.\n", frequency);
char * antval = SoapySDRDevice_getAntenna(dev, SOAPY_SDR_RX, chan);
fprintf(stderr, "****Antenna set to %s on chan %zu\n", antval, chan);
}

return r;
}

int verbose_set_sample_rate(SoapySDRDevice *dev, uint32_t samp_rate)
int verbose_set_sample_rate(SoapySDRDevice *dev, uint32_t samp_rate, size_t chan)
{
int r;
r = (int)SoapySDRDevice_setSampleRate(dev, SOAPY_SDR_RX, 0, (double)samp_rate);
r = (int)SoapySDRDevice_setSampleRate(dev, SOAPY_SDR_RX, chan, (double)samp_rate);
if (r != 0) {
fprintf(stderr, "WARNING: Failed to set sample rate.\n");
fprintf(stderr, "ERROR: Failed to set sample rate for chan %zu.\n", chan);
exit(12);
} else {
fprintf(stderr, "Sampling at %u S/s.\n", samp_rate);
fprintf(stderr, "Sampling at %u S/s on chan %zu.\n", samp_rate, chan);
}

return r;
}

int verbose_set_bandwidth(SoapySDRDevice *dev, uint32_t bandwidth)
int verbose_set_bandwidth(SoapySDRDevice *dev, uint32_t bandwidth, size_t chan)
{
int r;
r = (int)SoapySDRDevice_setBandwidth(dev, SOAPY_SDR_RX, 0, (double)bandwidth);
r = (int)SoapySDRDevice_setBandwidth(dev, SOAPY_SDR_RX, chan, (double)bandwidth);
uint32_t applied_bw = 0;
if (r != 0) {
fprintf(stderr, "WARNING: Failed to set bandwidth.\n");
fprintf(stderr, "ERROR: Failed to set bandwidth on chan %zu.\n", chan);
exit(13);
} else if (bandwidth > 0) {
applied_bw = (uint32_t)SoapySDRDevice_getBandwidth(dev, SOAPY_SDR_RX, 0);
applied_bw = (uint32_t)SoapySDRDevice_getBandwidth(dev, SOAPY_SDR_RX, chan);
if (applied_bw)
fprintf(stderr, "Bandwidth parameter %u Hz resulted in %u Hz.\n", bandwidth, applied_bw);
fprintf(stderr, "Bandwidth parameter %u Hz resulted in %u Hz on chan %zu.\n",
bandwidth, applied_bw, chan);
else
fprintf(stderr, "Set bandwidth parameter %u Hz.\n", bandwidth);
fprintf(stderr, "Set bandwidth parameter %u Hz on chan %zu.\n", bandwidth, chan);
} else {
fprintf(stderr, "Bandwidth set to automatic resulted in %u Hz.\n", applied_bw);
fprintf(stderr, "Bandwidth set to automatic resulted in %u Hz on chan %zu.\n",
applied_bw, chan);
}
return r;
}
Expand All @@ -195,8 +222,8 @@ int verbose_direct_sampling(SoapySDRDevice *dev, int on)
set_value = SoapySDRDevice_readSetting(dev, "direct_samp");

if (set_value == NULL) {
fprintf(stderr, "WARNING: Failed to set direct sampling mode.\n");
return r;
fprintf(stderr, "ERROR: Failed to set direct sampling mode.\n");
exit(14);
}
if (atoi(set_value) == 0) {
fprintf(stderr, "Direct sampling mode disabled.\n");}
Expand Down Expand Up @@ -230,7 +257,7 @@ int verbose_offset_tuning(SoapySDRDevice *dev)
return r;
}

int verbose_auto_gain(SoapySDRDevice *dev)
int verbose_auto_gain(SoapySDRDevice *dev, size_t chan)
{
int r;
r = 0;
Expand All @@ -249,7 +276,7 @@ int verbose_auto_gain(SoapySDRDevice *dev)
// For now, set 40.0 dB, high
// Note: 26.5 dB in https://github.com/librtlsdr/librtlsdr/blob/master/src/tuner_r82xx.c#L1067 - but it's not the same
// TODO: remove or change after auto-gain? https://github.com/pothosware/SoapyRTLSDR/issues/21 rtlsdr_set_tuner_gain_mode(dev, 0);
r = (int)SoapySDRDevice_setGain(dev, SOAPY_SDR_RX, 0, 40.);
r = (int)SoapySDRDevice_setGain(dev, SOAPY_SDR_RX, chan, 40.);
if (r != 0) {
fprintf(stderr, "WARNING: Failed to set tuner gain.\n");
} else {
Expand All @@ -260,15 +287,15 @@ int verbose_auto_gain(SoapySDRDevice *dev)
// even though it logs HACKRF_ERROR_INVALID_PARAM? https://github.com/rxseger/rx_tools/issues/9
// Total gain is distributed amongst all gains, 116 = 37,65,1; the LNA is OK (<40) but VGA is out of range (65 > 62)
// TODO: generic means to set all gains, of any SDR? string parsing LNA=#,VGA=#,AMP=#?
r = (int)SoapySDRDevice_setGainElement(dev, SOAPY_SDR_RX, 0, "LNA", 40.); // max 40
r = (int)SoapySDRDevice_setGainElement(dev, SOAPY_SDR_RX, chan, "LNA", 40.); // max 40
if (r != 0) {
fprintf(stderr, "WARNING: Failed to set LNA tuner gain.\n");
}
r = (int)SoapySDRDevice_setGainElement(dev, SOAPY_SDR_RX, 0, "VGA", 20.); // max 65
r = (int)SoapySDRDevice_setGainElement(dev, SOAPY_SDR_RX, chan, "VGA", 20.); // max 65
if (r != 0) {
fprintf(stderr, "WARNING: Failed to set VGA tuner gain.\n");
}
r = (int)SoapySDRDevice_setGainElement(dev, SOAPY_SDR_RX, 0, "AMP", 0.); // on or off
r = (int)SoapySDRDevice_setGainElement(dev, SOAPY_SDR_RX, chan, "AMP", 0.); // on or off
if (r != 0) {
fprintf(stderr, "WARNING: Failed to set AMP tuner gain.\n");
}
Expand All @@ -279,7 +306,7 @@ int verbose_auto_gain(SoapySDRDevice *dev)
return r;
}

int verbose_gain_str_set(SoapySDRDevice *dev, char *gain_str)
int verbose_gain_str_set(SoapySDRDevice *dev, char *gain_str, size_t chan)
{
SoapySDRKwargs args = {0};
size_t i;
Expand All @@ -301,37 +328,40 @@ int verbose_gain_str_set(SoapySDRDevice *dev, char *gain_str)
char *name = args.keys[i];
double value = atof(args.vals[i]);

fprintf(stderr, "Setting gain element %s: %f dB\n", name, value);
r = SoapySDRDevice_setGainElement(dev, SOAPY_SDR_RX, 0, name, value);
if (r != 0) {
fprintf(stderr, "WARNING: setGainElement(%s, %f) failed: %d\n", name, value, r);
}
fprintf(stderr, "Setting gain element %s: %f dB on chan %zu\n", name, value, chan);
r = SoapySDRDevice_setGainElement(dev, SOAPY_SDR_RX, chan, name, value);
if (r != 0) {
fprintf(stderr, "WARNING: setGainElement(%s, %f, %zu) failed: %d\n",
name, value, chan, r);
}

}
} else {
// Set overall gain and let SoapySDR distribute amongst components
double value = atof(gain_str);
r = SoapySDRDevice_setGain(dev, SOAPY_SDR_RX, 0, value);
r = SoapySDRDevice_setGain(dev, SOAPY_SDR_RX, chan, value);
if (r != 0) {
fprintf(stderr, "WARNING: Failed to set tuner gain.\n");
fprintf(stderr, "WARNING: Failed to set tuner gain for chan %zu.\n", chan);
} else {
fprintf(stderr, "Tuner gain set to %0.2f dB.\n", value);
fprintf(stderr, "Tuner gain set to %0.2f dB on chan %zu.\n", value, chan);
}

// TODO: read back and print each individual getGainElement()s
}

return r;
}

int verbose_ppm_set(SoapySDRDevice *dev, int ppm_error)
int verbose_ppm_set(SoapySDRDevice *dev, int ppm_error, size_t chan)
{
int r;
if (ppm_error == 0) {
return 0;}
r = (int)SoapySDRDevice_setFrequencyComponent(dev, SOAPY_SDR_RX, 0, "CORR", (double)ppm_error, NULL);
r = (int)SoapySDRDevice_setFrequencyComponent(dev, SOAPY_SDR_RX, chan, "CORR", (double)ppm_error, NULL);
if (r != 0) {
fprintf(stderr, "WARNING: Failed to set ppm error.\n");
fprintf(stderr, "WARNING: Failed to set ppm error for chan %zu.\n", chan);
} else {
fprintf(stderr, "Tuner error set to %i ppm.\n", ppm_error);
fprintf(stderr, "Tuner error set to %i ppm for chan %zu.\n", ppm_error, chan);
}
return r;
}
Expand Down Expand Up @@ -406,6 +436,14 @@ static void show_device_info(SoapySDRDevice *dev)
fprintf(stderr, "%.0f ", bandwidths[i]);
}
fprintf(stderr, "\n");

args = SoapySDRDevice_getChannelInfo(dev, direction, channel);
fprintf(stderr, "Channel info: ");
for (i = 0; i < args.size; ++i) {
fprintf(stderr, "%s=%s ", args.keys[i], args.vals[i]);
}
fprintf(stderr, "\n");

}

int suppress_stdout_start(void) {
Expand All @@ -430,7 +468,8 @@ void suppress_stdout_stop(int tmp_stdout) {
}


int verbose_device_search(char *s, SoapySDRDevice **devOut, SoapySDRStream **streamOut, const char *format)
int verbose_device_search(char *s, SoapySDRDevice **devOut, SoapySDRStream **streamOut, const char *format,
const size_t * channels, size_t nchannels)
{
size_t device_count = 0;
size_t i = 0;
Expand All @@ -448,8 +487,14 @@ int verbose_device_search(char *s, SoapySDRDevice **devOut, SoapySDRStream **str
}

show_device_info(dev);

if (SoapySDRDevice_setupStream(dev, streamOut, SOAPY_SDR_RX, format, NULL, 0, &stream_args) != 0) {
if (nchannels > SoapySDRDevice_getNumChannels(dev, SOAPY_SDR_RX)) {
fprintf(stderr, "User asked for more channels (%d) than device supports (%d)\n",
nchannels, SoapySDRDevice_getNumChannels(dev, SOAPY_SDR_RX));
return -5;
}

if (SoapySDRDevice_setupStream(dev, streamOut, SOAPY_SDR_RX, format, channels, nchannels,
&stream_args) != 0) {
fprintf(stderr, "SoapySDRDevice_setupStream failed\n");
return -3;
}
Expand Down
34 changes: 26 additions & 8 deletions src/convenience/convenience.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,27 +70,29 @@ double atofp(char *s);
* \return 0 on success
*/

int verbose_set_frequency(SoapySDRDevice *dev, uint32_t frequency);
int verbose_set_frequency(SoapySDRDevice *dev, uint32_t frequency, size_t chan);

/*!
* Set device sample rate and report status on stderr
*
* \param dev the device handle
* \param samp_rate in samples/second
* \param chan the channel humber
* \return 0 on success
*/

int verbose_set_sample_rate(SoapySDRDevice *dev, uint32_t samp_rate);
int verbose_set_sample_rate(SoapySDRDevice *dev, uint32_t samp_rate, size_t chan);

/*!
* Set device bandwidth and report status on stderr
*
* \param dev the device handle
* \param frequency in Hz
* \param chan the channel humber
* \return 0 on success
*/

int verbose_set_bandwidth(SoapySDRDevice *dev, uint32_t bandwidth);
int verbose_set_bandwidth(SoapySDRDevice *dev, uint32_t bandwidth, size_t chan);


/*!
Expand All @@ -116,39 +118,54 @@ int verbose_offset_tuning(SoapySDRDevice *dev);
* Enable auto gain and report status on stderr
*
* \param dev the device handle
* \param chan the channel humber
* \return 0 on success
*/

int verbose_auto_gain(SoapySDRDevice *dev);
int verbose_auto_gain(SoapySDRDevice *dev, size_t chan);

/*!
* Set tuner gain and report status on stderr
*
* \param dev the device handle
* \param gain in tenths of a dB
* \param chan the channel humber
* \return 0 on success
*/

int verbose_gain_set(SoapySDRDevice *dev, int gain);
int verbose_gain_set(SoapySDRDevice *dev, int gain, size_t chan);

/*!
* Set tuner gain elements by a key/value string
*
* \param dev the device handle
* \param gain_str string of gain element pairs (example LNA=40,VGA=20,AMP=0), or string of overall gain, in dB
* \param chan the channel humber
* \return 0 on success
*/
int verbose_gain_str_set(SoapySDRDevice *dev, char *gain_str);
int verbose_gain_str_set(SoapySDRDevice *dev, char *gain_str, size_t chan);

/*!
* Set the frequency correction value for the device and report status on stderr.
*
* \param dev the device handle
* \param ppm_error correction value in parts per million (ppm)
* \param chan the channel humber
* \return 0 on success
*/

int verbose_ppm_set(SoapySDRDevice *dev, int ppm_error);
int verbose_ppm_set(SoapySDRDevice *dev, int ppm_error, size_t chan);

/*!
* Set the antenna value for the device and report status on stderr.
*
* \param dev the device handle
* \param ant string name of the antenna to use
* \param chan the channel humber
* \return 0 on success
*/

int verbose_set_antenna(SoapySDRDevice *dev, const char * ant, size_t chan);

/*!
* Reset buffer
Expand All @@ -169,7 +186,8 @@ int verbose_reset_buffer(SoapySDRDevice *dev);
* \return dev 0 if successful
*/

int verbose_device_search(char *s, SoapySDRDevice **devOut, SoapySDRStream **streamOut, const char *format);
int verbose_device_search(char *s, SoapySDRDevice **devOut, SoapySDRStream **streamOut, const char *format,
const size_t * channels, size_t nchannels);

/*!
* Start redirecting stdout to stderr to avoid unwanted stdout emissions.
Expand Down
Loading