summaryrefslogtreecommitdiff
path: root/gr-shd
diff options
context:
space:
mode:
authorTom Rondeau <trondeau@vt.edu>2012-04-13 18:36:53 -0400
committerTom Rondeau <trondeau@vt.edu>2012-04-13 18:36:53 -0400
commitf919f9dcbb54a08e6e26d6c229ce92fb784fa1b2 (patch)
tree7e846386b9eb1676f9a93fc4a1e55916b9accc97 /gr-shd
parent6a1e9783fec6ed827f49db27c171591d30f32933 (diff)
Removed whitespace and added dtools/bin/remove-whitespace as a tool to do this in the future.
The sed script was provided by Moritz Fischer.
Diffstat (limited to 'gr-shd')
-rw-r--r--gr-shd/CMakeLists.txt8
-rwxr-xr-xgr-shd/apps/shd_fft38
-rwxr-xr-xgr-shd/apps/shd_rx_cfile24
-rwxr-xr-xgr-shd/apps/shd_siggen20
-rw-r--r--gr-shd/grc/CMakeLists.txt8
-rw-r--r--gr-shd/include/CMakeLists.txt8
-rw-r--r--gr-shd/include/gr_shd_api.h8
-rw-r--r--gr-shd/include/gr_shd_smini_sink.h52
-rw-r--r--gr-shd/include/gr_shd_smini_source.h66
-rw-r--r--gr-shd/lib/CMakeLists.txt8
-rw-r--r--gr-shd/lib/gr_shd_smini_sink.cc78
-rw-r--r--gr-shd/lib/gr_shd_smini_source.cc38
-rw-r--r--gr-shd/swig/__init__.py8
-rwxr-xr-xgr-shd/swig/qa_shd.py12
-rw-r--r--gr-shd/swig/shd_swig.i8
15 files changed, 192 insertions, 192 deletions
diff --git a/gr-shd/CMakeLists.txt b/gr-shd/CMakeLists.txt
index a1b3b1a0b3..7dad30cd80 100644
--- a/gr-shd/CMakeLists.txt
+++ b/gr-shd/CMakeLists.txt
@@ -1,17 +1,17 @@
# Copyright 2011 Free Software Foundation, Inc.
-#
+#
# This file is part of GNU Radio
-#
+#
# GNU Radio is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3, or (at your option)
# any later version.
-#
+#
# GNU Radio is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with GNU Radio; see the file COPYING. If not, write to
# the Free Software Foundation, Inc., 51 Franklin Street,
diff --git a/gr-shd/apps/shd_fft b/gr-shd/apps/shd_fft
index 46832784d2..60d07e55ee 100755
--- a/gr-shd/apps/shd_fft
+++ b/gr-shd/apps/shd_fft
@@ -1,24 +1,24 @@
#!/usr/bin/env python
#
# Copyright 2011 Free Software Foundation, Inc.
-#
+#
# This file is part of GNU Radio
-#
+#
# GNU Radio is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3, or (at your option)
# any later version.
-#
+#
# GNU Radio is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with GNU Radio; see the file COPYING. If not, write to
# the Free Software Foundation, Inc., 51 Franklin Street,
# Boston, MA 02110-1301, USA.
-#
+#
from gnuradio import gr, gru
from gnuradio import shd
@@ -37,7 +37,7 @@ class app_top_block(stdgui2.std_top_block):
self.frame = frame
self.panel = panel
-
+
parser = OptionParser(option_class=eng_option)
parser.add_option("-a", "--address", type="string",
default="type=xmini",
@@ -66,7 +66,7 @@ class app_top_block(stdgui2.std_top_block):
sys.exit(1)
self.options = options
self.show_debug_info = True
-
+
self.src = shd.smini_source(device_addr=options.address,
io_type=shd.io_type.COMPLEX_FLOAT32,
num_channels=1)
@@ -88,7 +88,7 @@ class app_top_block(stdgui2.std_top_block):
else:
self.scope = fftsink2.fft_sink_c (panel,
fft_size=options.fft_size,
- sample_rate=input_rate,
+ sample_rate=input_rate,
ref_scale=options.ref_scale,
ref_level=20.0,
y_divs = 12,
@@ -100,7 +100,7 @@ class app_top_block(stdgui2.std_top_block):
self._build_gui(vbox)
self._setup_events()
-
+
# set initial values
if options.gain is None:
@@ -112,7 +112,7 @@ class app_top_block(stdgui2.std_top_block):
# if no freq was specified, use the mid-point
r = self.src.get_freq_range()
options.freq = float(r.start()+r.stop())/2
-
+
self.set_gain(options.gain)
if self.show_debug_info:
@@ -137,9 +137,9 @@ class app_top_block(stdgui2.std_top_block):
def _form_set_freq(kv):
return self.set_freq(kv['freq'])
-
+
vbox.Add(self.scope.win, 10, wx.EXPAND)
-
+
# add control area at the bottom
self.myform = myform = form.form()
hbox = wx.BoxSizer(wx.HORIZONTAL)
@@ -171,7 +171,7 @@ class app_top_block(stdgui2.std_top_block):
# FIXME figure out how to have this be a subpanel that is always
# created, but has its visibility controlled by foo.Show(True/False)
-
+
def _form_set_samp_rate(kv):
return self.set_samp_rate(kv['samprate'])
@@ -204,7 +204,7 @@ class app_top_block(stdgui2.std_top_block):
hbox.Add((5,0), 0)
vbox.Add(hbox, 0, wx.EXPAND)
-
+
def set_freq(self, target_freq):
"""
Set the center frequency we're interested in.
@@ -244,12 +244,12 @@ class app_top_block(stdgui2.std_top_block):
self.myform['fs@gbe'].set_value(input_rate)
# shd set_samp_rate never fails; always falls back to closest requested.
- return True
+ return True
def _setup_events(self):
if not self.options.waterfall and not self.options.oscilloscope:
self.scope.win.Bind(wx.EVT_LEFT_DCLICK, self.evt_left_dclick)
-
+
def evt_left_dclick(self, event):
(ux, uy) = self.scope.win.GetXY(event)
if event.CmdDown():
@@ -265,13 +265,13 @@ class app_top_block(stdgui2.std_top_block):
(freq, pwr) = points[ind]
target_freq = freq/self.scope.win._scale_factor
print ind, freq, pwr
- self.set_freq(target_freq)
+ self.set_freq(target_freq)
else:
# Re-center on clicked frequency
target_freq = ux/self.scope.win._scale_factor
self.set_freq(target_freq)
-
-
+
+
def main ():
app = stdgui2.stdapp(app_top_block, "SHD FFT", nstatus=1)
app.MainLoop()
diff --git a/gr-shd/apps/shd_rx_cfile b/gr-shd/apps/shd_rx_cfile
index 007bc809f2..5b4178cf7b 100755
--- a/gr-shd/apps/shd_rx_cfile
+++ b/gr-shd/apps/shd_rx_cfile
@@ -1,28 +1,28 @@
#!/usr/bin/env python
#
# Copyright 2011 Free Software Foundation, Inc.
-#
+#
# This file is part of GNU Radio
-#
+#
# GNU Radio is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3, or (at your option)
# any later version.
-#
+#
# GNU Radio is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with GNU Radio; see the file COPYING. If not, write to
# the Free Software Foundation, Inc., 51 Franklin Street,
# Boston, MA 02110-1301, USA.
-#
+#
"""
Read samples from a SHD device and write to file formatted as binary
-outputs single precision complex float values or complex short values
+outputs single precision complex float values or complex short values
(interleaved 16 bit signed short integers).
"""
@@ -50,7 +50,7 @@ class rx_cfile_block(gr.top_block):
io_type=shd.io_type.COMPLEX_FLOAT32,
num_channels=1)
self._sink = gr.file_sink(gr.sizeof_gr_complex, filename)
-
+
# Set receiver sample rate
self._src.set_samp_rate(options.samp_rate)
@@ -90,7 +90,7 @@ class rx_cfile_block(gr.top_block):
self.connect(self._src, self._head, self._sink)
input_rate = self._src.get_samp_rate()
-
+
if options.verbose:
print "Address:", options.address
print "Rx gain:", options.gain
@@ -106,7 +106,7 @@ class rx_cfile_block(gr.top_block):
else:
print "Writing 32-bit complex floats"
print "Output filename:", filename
-
+
def get_options():
usage="%prog: [options] output_filename"
parser = OptionParser(option_class=eng_option, usage=usage)
@@ -133,19 +133,19 @@ def get_options():
if len(args) != 1:
parser.print_help()
raise SystemExit, 1
-
+
if options.freq is None:
parser.print_help()
sys.stderr.write('You must specify the frequency with -f FREQ\n');
raise SystemExit, 1
-
+
return (options, args[0])
if __name__ == '__main__':
(options, filename) = get_options()
tb = rx_cfile_block(options, filename)
-
+
try:
tb.run()
except KeyboardInterrupt:
diff --git a/gr-shd/apps/shd_siggen b/gr-shd/apps/shd_siggen
index 112eeea159..9629d80d29 100755
--- a/gr-shd/apps/shd_siggen
+++ b/gr-shd/apps/shd_siggen
@@ -1,28 +1,28 @@
#!/usr/bin/env python
#
# Copyright 2011 Free Software Foundation, Inc.
-#
+#
# This file is part of GNU Radio
-#
+#
# GNU Radio is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3, or (at your option)
# any later version.
-#
+#
# GNU Radio is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with GNU Radio; see the file COPYING. If not, write to
# the Free Software Foundation, Inc., 51 Franklin Street,
# Boston, MA 02110-1301, USA.
-#
+#
"""
Read samples from a SHD device and write to file formatted as binary
-outputs single precision complex float values or complex short values
+outputs single precision complex float values or complex short values
(interleaved 16 bit signed short integers).
"""
@@ -74,14 +74,14 @@ class shd_siggen(gr.top_block):
# Create head block if needed and wire it up
self.connect(self._src, self._snk)
input_rate = self._snk.get_samp_rate()
-
+
if options.verbose:
print "Address:", options.address
print "Rx gain:", options.gain
print "Rx baseband frequency:", n2s(tr.actual_rf_freq)
print "Rx DDC frequency:", n2s(tr.actual_dsp_freq)
print "Rx Sample Rate:", n2s(input_rate)
-
+
def get_options():
usage="%prog: [options]"
parser = OptionParser(option_class=eng_option, usage=usage)
@@ -106,14 +106,14 @@ def get_options():
parser.print_help()
sys.stderr.write('You must specify the frequency with -f FREQ\n');
raise SystemExit, 1
-
+
return (options)
if __name__ == '__main__':
options = get_options()
tb = shd_siggen(options)
-
+
try:
tb.run()
except KeyboardInterrupt:
diff --git a/gr-shd/grc/CMakeLists.txt b/gr-shd/grc/CMakeLists.txt
index f35d36ba33..67a8fc13f4 100644
--- a/gr-shd/grc/CMakeLists.txt
+++ b/gr-shd/grc/CMakeLists.txt
@@ -1,17 +1,17 @@
# Copyright 2011 Free Software Foundation, Inc.
-#
+#
# This file is part of GNU Radio
-#
+#
# GNU Radio is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3, or (at your option)
# any later version.
-#
+#
# GNU Radio is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with GNU Radio; see the file COPYING. If not, write to
# the Free Software Foundation, Inc., 51 Franklin Street,
diff --git a/gr-shd/include/CMakeLists.txt b/gr-shd/include/CMakeLists.txt
index c4db1fd22f..34349841cf 100644
--- a/gr-shd/include/CMakeLists.txt
+++ b/gr-shd/include/CMakeLists.txt
@@ -1,17 +1,17 @@
# Copyright 2011 Free Software Foundation, Inc.
-#
+#
# This file is part of GNU Radio
-#
+#
# GNU Radio is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3, or (at your option)
# any later version.
-#
+#
# GNU Radio is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with GNU Radio; see the file COPYING. If not, write to
# the Free Software Foundation, Inc., 51 Franklin Street,
diff --git a/gr-shd/include/gr_shd_api.h b/gr-shd/include/gr_shd_api.h
index e6773c3f39..13b755cbdb 100644
--- a/gr-shd/include/gr_shd_api.h
+++ b/gr-shd/include/gr_shd_api.h
@@ -1,18 +1,18 @@
/*
* Copyright 2011 Free Software Foundation, Inc.
- *
+ *
* This file is part of GNU Radio
- *
+ *
* GNU Radio is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3, or (at your option)
* any later version.
- *
+ *
* GNU Radio is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street,
diff --git a/gr-shd/include/gr_shd_smini_sink.h b/gr-shd/include/gr_shd_smini_sink.h
index 9389586870..b807e5c878 100644
--- a/gr-shd/include/gr_shd_smini_sink.h
+++ b/gr-shd/include/gr_shd_smini_sink.h
@@ -1,18 +1,18 @@
/*
* Copyright 2011 Free Software Foundation, Inc.
- *
+ *
* This file is part of GNU Radio
- *
+ *
* GNU Radio is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3, or (at your option)
* any later version.
- *
+ *
* GNU Radio is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street,
@@ -34,30 +34,30 @@ GR_SHD_API boost::shared_ptr<shd_smini_sink> shd_make_smini_sink(
size_t num_channels
);
-class GR_SHD_API shd_smini_sink : virtual public gr_sync_block
+class GR_SHD_API shd_smini_sink : virtual public gr_sync_block
{
public:
-
+
/*!
* Set the subdevice specification.
* \param spec the subdev spec markup string
* \param mboard the motherboard index 0 to M-1
*/
virtual void set_subdev_spec(const std::string &spec, size_t mboard = 0) = 0;
-
+
/*!
* Set the sample rate for the smini device.
* \param rate a new rate in Sps
*/
virtual void set_samp_rate(double rate) = 0;
-
+
/*!
* Get the sample rate for the smini device.
* This is the actual sample rate and may differ from the rate set.
* \return the actual rate in Sps
*/
virtual double get_samp_rate(void) = 0;
-
+
/*!
* Tune the smini device to the desired center frequency.
* \param tune_request the tune request instructions
@@ -86,14 +86,14 @@ class GR_SHD_API shd_smini_sink : virtual public gr_sync_block
* \return the frequency in Hz
*/
virtual double get_center_freq(size_t chan = 0) = 0;
-
+
/*!
* Get the tunable frequency range.
* \param chan the channel index 0 to N-1
* \return the frequency range in Hz
*/
virtual shd::freq_range_t get_freq_range(size_t chan = 0) = 0;
-
+
/*!
* Set the gain for the dboard.
* \param gain the gain in dB
@@ -116,7 +116,7 @@ class GR_SHD_API shd_smini_sink : virtual public gr_sync_block
* \return the actual gain in dB
*/
virtual double get_gain(size_t chan = 0) = 0;
-
+
/*!
* Get the actual dboard gain setting of named stage.
* \param name the name of the gain stage
@@ -132,7 +132,7 @@ class GR_SHD_API shd_smini_sink : virtual public gr_sync_block
* \return the actual gain in dB
*/
virtual std::vector<std::string> get_gain_names(size_t chan = 0) = 0;
-
+
/*!
* Get the settable gain range.
* \param chan the channel index 0 to N-1
@@ -148,7 +148,7 @@ class GR_SHD_API shd_smini_sink : virtual public gr_sync_block
*/
virtual shd::gain_range_t get_gain_range(const std::string &name,
size_t chan = 0) = 0;
-
+
/*!
* Set the antenna to use.
* \param ant the antenna string
@@ -156,21 +156,21 @@ class GR_SHD_API shd_smini_sink : virtual public gr_sync_block
*/
virtual void set_antenna(const std::string &ant,
size_t chan = 0) = 0;
-
+
/*!
* Get the antenna in use.
* \param chan the channel index 0 to N-1
* \return the antenna string
*/
virtual std::string get_antenna(size_t chan = 0) = 0;
-
+
/*!
* Get a list of possible antennas.
* \param chan the channel index 0 to N-1
* \return a vector of antenna strings
*/
virtual std::vector<std::string> get_antennas(size_t chan = 0) = 0;
-
+
/*!
* Set the subdevice bandpass filter.
* \param chan the channel index 0 to N-1
@@ -186,14 +186,14 @@ class GR_SHD_API shd_smini_sink : virtual public gr_sync_block
*/
virtual shd::sensor_value_t get_dboard_sensor(const std::string &name,
size_t chan = 0) = 0;
-
+
/*!
* Get a list of possible daughterboard sensor names.
* \param chan the channel index 0 to N-1
* \return a vector of sensor names
*/
virtual std::vector<std::string> get_dboard_sensor_names(size_t chan = 0) = 0;
-
+
/*!
* Get a motherboard sensor value.
* \param name the name of the sensor
@@ -224,28 +224,28 @@ class GR_SHD_API shd_smini_sink : virtual public gr_sync_block
* \return the clock rate in Hz
*/
virtual double get_clock_rate(size_t mboard = 0) = 0;
-
+
/*!
* Set the master clock rate.
* \param rate the new rate in Hz
* \param mboard the motherboard index 0 to M-1
*/
virtual void set_clock_rate(double rate, size_t mboard = 0) = 0;
-
+
/*!
* Get the current time registers.
* \param mboard the motherboard index 0 to M-1
* \return the current smini time
*/
virtual shd::time_spec_t get_time_now(size_t mboard = 0) = 0;
-
+
/*!
* Get the time when the last pps pulse occured.
* \param mboard the motherboard index 0 to M-1
* \return the current smini time
*/
virtual shd::time_spec_t get_time_last_pps(size_t mboard = 0) = 0;
-
+
/*!
* Sets the time registers immediately.
* \param time_spec the new time
@@ -259,19 +259,19 @@ class GR_SHD_API shd_smini_sink : virtual public gr_sync_block
* \param time_spec the new time
*/
virtual void set_time_next_pps(const shd::time_spec_t &time_spec) = 0;
-
+
/*!
* Sync the time registers with an unknown pps edge.
* \param time_spec the new time
*/
virtual void set_time_unknown_pps(const shd::time_spec_t &time_spec) = 0;
-
+
/*!
* Get access to the underlying shd dboard iface object.
* \return the dboard_iface object
*/
virtual shd::xmini::dboard_iface::sptr get_dboard_iface(size_t chan = 0) = 0;
-
+
/*!
* Get access to the underlying shd device object.
* \return the multi smini device object
diff --git a/gr-shd/include/gr_shd_smini_source.h b/gr-shd/include/gr_shd_smini_source.h
index 3e3dbf4276..11c8563fe2 100644
--- a/gr-shd/include/gr_shd_smini_source.h
+++ b/gr-shd/include/gr_shd_smini_source.h
@@ -1,18 +1,18 @@
/*
* Copyright 2011 Free Software Foundation, Inc.
- *
+ *
* This file is part of GNU Radio
- *
+ *
* GNU Radio is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3, or (at your option)
* any later version.
- *
+ *
* GNU Radio is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street,
@@ -37,7 +37,7 @@ GR_SHD_API boost::shared_ptr<shd_smini_source> shd_make_smini_source(
class GR_SHD_API shd_smini_source : virtual public gr_sync_block
{
public:
-
+
/*!
* Set the subdevice specification.
* \param spec the subdev spec markup string
@@ -45,7 +45,7 @@ class GR_SHD_API shd_smini_source : virtual public gr_sync_block
*/
virtual void set_subdev_spec(const std::string &spec,
size_t mboard = 0) = 0;
-
+
/*!
* Set the sample rate for the smini device.
* \param rate a new rate in Sps
@@ -58,7 +58,7 @@ class GR_SHD_API shd_smini_source : virtual public gr_sync_block
* \return the actual rate in Sps
*/
virtual double get_samp_rate(void) = 0;
-
+
/*!
* Tune the smini device to the desired center frequency.
* \param tune_request the tune request instructions
@@ -69,7 +69,7 @@ class GR_SHD_API shd_smini_source : virtual public gr_sync_block
const shd::tune_request_t tune_request,
size_t chan = 0
) = 0;
-
+
/*!
* Tune the smini device to the desired center frequency.
* This is a wrapper around set center freq so that in this case,
@@ -81,28 +81,28 @@ class GR_SHD_API shd_smini_source : virtual public gr_sync_block
shd::tune_result_t set_center_freq(double freq, size_t chan = 0){
return set_center_freq(shd::tune_request_t(freq), chan);
}
-
+
/*!
* Get the center frequency.
* \param chan the channel index 0 to N-1
* \return the frequency in Hz
*/
virtual double get_center_freq(size_t chan = 0) = 0;
-
+
/*!
* Get the tunable frequency range.
* \param chan the channel index 0 to N-1
* \return the frequency range in Hz
*/
virtual shd::freq_range_t get_freq_range(size_t chan = 0) = 0;
-
+
/*!
* Set the gain for the dboard.
* \param gain the gain in dB
* \param chan the channel index 0 to N-1
*/
virtual void set_gain(double gain, size_t chan = 0) = 0;
-
+
/*!
* Set the named gain on the dboard.
* \param gain the gain in dB
@@ -111,14 +111,14 @@ class GR_SHD_API shd_smini_source : virtual public gr_sync_block
*/
virtual void set_gain(double gain, const std::string &name,
size_t chan = 0) = 0;
-
+
/*!
* Get the actual dboard gain setting.
* \param chan the channel index 0 to N-1
* \return the actual gain in dB
*/
virtual double get_gain(size_t chan = 0) = 0;
-
+
/*!
* Get the actual dboard gain setting of named stage.
* \param name the name of the gain stage
@@ -127,21 +127,21 @@ class GR_SHD_API shd_smini_source : virtual public gr_sync_block
*/
virtual double get_gain(const std::string &name,
size_t chan = 0) = 0;
-
+
/*!
* Get the actual dboard gain setting of named stage.
* \param chan the channel index 0 to N-1
* \return the actual gain in dB
*/
virtual std::vector<std::string> get_gain_names(size_t chan = 0) = 0;
-
+
/*!
* Get the settable gain range.
* \param chan the channel index 0 to N-1
* \return the gain range in dB
*/
virtual shd::gain_range_t get_gain_range(size_t chan = 0) = 0;
-
+
/*!
* Get the settable gain range.
* \param name the name of the gain stage
@@ -150,7 +150,7 @@ class GR_SHD_API shd_smini_source : virtual public gr_sync_block
*/
virtual shd::gain_range_t get_gain_range(const std::string &name,
size_t chan = 0) = 0;
-
+
/*!
* Set the antenna to use.
* \param ant the antenna string
@@ -158,21 +158,21 @@ class GR_SHD_API shd_smini_source : virtual public gr_sync_block
*/
virtual void set_antenna(const std::string &ant,
size_t chan = 0) = 0;
-
+
/*!
* Get the antenna in use.
* \param chan the channel index 0 to N-1
* \return the antenna string
*/
virtual std::string get_antenna(size_t chan = 0) = 0;
-
+
/*!
* Get a list of possible antennas.
* \param chan the channel index 0 to N-1
* \return a vector of antenna strings
*/
virtual std::vector<std::string> get_antennas(size_t chan = 0) = 0;
-
+
/*!
* Set the subdevice bandpass filter.
* \param bandwidth the filter bandwidth in Hz
@@ -180,7 +180,7 @@ class GR_SHD_API shd_smini_source : virtual public gr_sync_block
*/
virtual void set_bandwidth(double bandwidth,
size_t chan = 0) = 0;
-
+
/*!
* Get a daughterboard sensor value.
* \param name the name of the sensor
@@ -189,14 +189,14 @@ class GR_SHD_API shd_smini_source : virtual public gr_sync_block
*/
virtual shd::sensor_value_t get_dboard_sensor(const std::string &name,
size_t chan = 0) = 0;
-
+
/*!
* Get a list of possible daughterboard sensor names.
* \param chan the channel index 0 to N-1
* \return a vector of sensor names
*/
virtual std::vector<std::string> get_dboard_sensor_names(size_t chan = 0) = 0;
-
+
/*!
* Get a motherboard sensor value.
* \param name the name of the sensor
@@ -205,14 +205,14 @@ class GR_SHD_API shd_smini_source : virtual public gr_sync_block
*/
virtual shd::sensor_value_t get_mboard_sensor(const std::string &name,
size_t mboard = 0) = 0;
-
+
/*!
* Get a list of possible motherboard sensor names.
* \param mboard the motherboard index 0 to M-1
* \return a vector of sensor names
*/
virtual std::vector<std::string> get_mboard_sensor_names(size_t mboard = 0) = 0;
-
+
/*!
* Set the clock configuration.
* \param clock_config the new configuration
@@ -220,14 +220,14 @@ class GR_SHD_API shd_smini_source : virtual public gr_sync_block
*/
virtual void set_clock_config(const shd::clock_config_t &clock_config,
size_t mboard = 0) = 0;
-
+
/*!
* Get the master clock rate.
* \param mboard the motherboard index 0 to M-1
* \return the clock rate in Hz
*/
virtual double get_clock_rate(size_t mboard = 0) = 0;
-
+
/*!
* Set the master clock rate.
* \param rate the new rate in Hz
@@ -242,14 +242,14 @@ class GR_SHD_API shd_smini_source : virtual public gr_sync_block
* \return the current smini time
*/
virtual shd::time_spec_t get_time_now(size_t mboard = 0) = 0;
-
+
/*!
* Get the time when the last pps pulse occured.
* \param mboard the motherboard index 0 to M-1
* \return the current smini time
*/
virtual shd::time_spec_t get_time_last_pps(size_t mboard = 0) = 0;
-
+
/*!
* Sets the time registers immediately.
* \param time_spec the new time
@@ -263,19 +263,19 @@ class GR_SHD_API shd_smini_source : virtual public gr_sync_block
* \param time_spec the new time
*/
virtual void set_time_next_pps(const shd::time_spec_t &time_spec) = 0;
-
+
/*!
* Sync the time registers with an unknown pps edge.
* \param time_spec the new time
*/
virtual void set_time_unknown_pps(const shd::time_spec_t &time_spec) = 0;
-
+
/*!
* Get access to the underlying shd dboard iface object.
* \return the dboard_iface object
*/
virtual shd::xmini::dboard_iface::sptr get_dboard_iface(size_t chan = 0) = 0;
-
+
/*!
* Get access to the underlying shd device object.
* \return the multi smini device object
diff --git a/gr-shd/lib/CMakeLists.txt b/gr-shd/lib/CMakeLists.txt
index e8528fddb4..9ddf109af0 100644
--- a/gr-shd/lib/CMakeLists.txt
+++ b/gr-shd/lib/CMakeLists.txt
@@ -1,17 +1,17 @@
# Copyright 2011 Free Software Foundation, Inc.
-#
+#
# This file is part of GNU Radio
-#
+#
# GNU Radio is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3, or (at your option)
# any later version.
-#
+#
# GNU Radio is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with GNU Radio; see the file COPYING. If not, write to
# the Free Software Foundation, Inc., 51 Franklin Street,
diff --git a/gr-shd/lib/gr_shd_smini_sink.cc b/gr-shd/lib/gr_shd_smini_sink.cc
index c9fb222d09..658f5719ef 100644
--- a/gr-shd/lib/gr_shd_smini_sink.cc
+++ b/gr-shd/lib/gr_shd_smini_sink.cc
@@ -1,18 +1,18 @@
/*
* Copyright 2011 Free Software Foundation, Inc.
- *
+ *
* This file is part of GNU Radio
- *
+ *
* GNU Radio is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3, or (at your option)
* any later version.
- *
+ *
* GNU Radio is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street,
@@ -52,11 +52,11 @@ public:
_dev->set_tx_rate(rate);
_sample_rate = this->get_samp_rate();
}
-
+
double get_samp_rate(void){
return _dev->get_tx_rate();
}
-
+
shd::tune_result_t set_center_freq(
const shd::tune_request_t tune_request, size_t chan)
{
@@ -67,142 +67,142 @@ public:
{
return _dev->get_tx_freq(chan);
}
-
+
shd::freq_range_t get_freq_range(size_t chan)
{
return _dev->get_tx_freq_range(chan);
}
-
+
void set_gain(double gain, size_t chan)
{
return _dev->set_tx_gain(gain, chan);
}
-
+
void set_gain(double gain, const std::string &name,
size_t chan)
{
return _dev->set_tx_gain(gain, name, chan);
}
-
+
double get_gain(size_t chan){
return _dev->get_tx_gain(chan);
}
-
+
double get_gain(const std::string &name, size_t chan)
{
return _dev->get_tx_gain(name, chan);
}
-
+
std::vector<std::string> get_gain_names(size_t chan)
{
return _dev->get_tx_gain_names(chan);
}
-
+
shd::gain_range_t get_gain_range(size_t chan)
{
return _dev->get_tx_gain_range(chan);
}
-
+
shd::gain_range_t get_gain_range(const std::string &name,
size_t chan)
{
return _dev->get_tx_gain_range(name, chan);
}
-
+
void set_antenna(const std::string &ant, size_t chan)
{
return _dev->set_tx_antenna(ant, chan);
}
-
+
std::string get_antenna(size_t chan)
{
return _dev->get_tx_antenna(chan);
}
-
+
std::vector<std::string> get_antennas(size_t chan)
{
return _dev->get_tx_antennas(chan);
}
-
+
void set_bandwidth(double bandwidth, size_t chan)
{
return _dev->set_tx_bandwidth(bandwidth, chan);
}
-
+
shd::sensor_value_t get_dboard_sensor(const std::string &name,
size_t chan)
{
return _dev->get_tx_sensor(name, chan);
}
-
+
std::vector<std::string> get_dboard_sensor_names(size_t chan)
{
return _dev->get_tx_sensor_names(chan);
}
-
+
shd::sensor_value_t get_mboard_sensor(const std::string &name,
size_t mboard)
{
return _dev->get_mboard_sensor(name, mboard);
}
-
+
std::vector<std::string> get_mboard_sensor_names(size_t mboard)
{
return _dev->get_mboard_sensor_names(mboard);
}
-
+
void set_clock_config(const shd::clock_config_t &clock_config,
size_t mboard)
{
return _dev->set_clock_config(clock_config, mboard);
}
-
+
double get_clock_rate(size_t mboard)
{
return _dev->get_master_clock_rate(mboard);
}
-
+
void set_clock_rate(double rate, size_t mboard)
{
return _dev->set_master_clock_rate(rate, mboard);
}
-
+
shd::time_spec_t get_time_now(size_t mboard = 0)
{
return _dev->get_time_now(mboard);
}
-
+
shd::time_spec_t get_time_last_pps(size_t mboard)
{
return _dev->get_time_last_pps(mboard);
}
-
+
void set_time_now(const shd::time_spec_t &time_spec,
size_t mboard)
{
return _dev->set_time_now(time_spec, mboard);
}
-
+
void set_time_next_pps(const shd::time_spec_t &time_spec)
{
return _dev->set_time_next_pps(time_spec);
}
-
+
void set_time_unknown_pps(const shd::time_spec_t &time_spec)
{
return _dev->set_time_unknown_pps(time_spec);
}
-
+
shd::xmini::dboard_iface::sptr get_dboard_iface(size_t chan)
{
return _dev->get_tx_dboard_iface(chan);
}
-
+
shd::xmini::multi_xmini::sptr get_device(void)
{
return _dev;
}
-
+
/*******************************************************************
* Work
******************************************************************/
@@ -214,7 +214,7 @@ public:
_metadata.start_of_burst = false;
_metadata.end_of_burst = false;
_metadata.has_time_spec = _has_time_spec;
-
+
size_t num_sent = _dev->get_device()->send(
input_items, noutput_items, _metadata,
_type, shd::device::SEND_MODE_FULL_BUFF, 1.0);
@@ -223,7 +223,7 @@ public:
_metadata.time_spec += shd::time_spec_t(0, num_sent, _sample_rate);
return num_sent;
}
-
+
//Send an empty start-of-burst packet to begin streaming.
//Set at a time in the near future to avoid late packets.
bool start(void)
@@ -232,13 +232,13 @@ public:
_metadata.end_of_burst = false;
_metadata.has_time_spec = _has_time_spec;
_metadata.time_spec = get_time_now() + shd::time_spec_t(0.01);
-
+
_dev->get_device()->send(
gr_vector_const_void_star(_nchan), 0, _metadata,
_type, shd::device::SEND_MODE_ONE_PACKET, 1.0);
return true;
}
-
+
//Send an empty end-of-burst packet to end streaming.
//Ending the burst avoids an underflow error on stop.
bool stop(void)
@@ -246,13 +246,13 @@ public:
_metadata.start_of_burst = false;
_metadata.end_of_burst = true;
_metadata.has_time_spec = false;
-
+
_dev->get_device()->send(
gr_vector_const_void_star(_nchan), 0, _metadata,
_type, shd::device::SEND_MODE_ONE_PACKET, 1.0);
return true;
}
-
+
protected:
shd::xmini::multi_xmini::sptr _dev;
const shd::io_type_t _type;
diff --git a/gr-shd/lib/gr_shd_smini_source.cc b/gr-shd/lib/gr_shd_smini_source.cc
index caf98f3118..58559a6239 100644
--- a/gr-shd/lib/gr_shd_smini_source.cc
+++ b/gr-shd/lib/gr_shd_smini_source.cc
@@ -1,18 +1,18 @@
/*
* Copyright 2011 Free Software Foundation, Inc.
- *
+ *
* This file is part of GNU Radio
- *
+ *
* GNU Radio is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3, or (at your option)
* any later version.
- *
+ *
* GNU Radio is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street,
@@ -48,7 +48,7 @@ public:
{
_dev = shd::xmini::multi_xmini::make(device_addr);
}
-
+
void set_subdev_spec(const std::string &spec, size_t mboard)
{
return _dev->set_rx_subdev_spec(spec, mboard);
@@ -85,7 +85,7 @@ public:
return _dev->set_rx_gain(gain, chan);
}
- void set_gain(double gain, const std::string &name,
+ void set_gain(double gain, const std::string &name,
size_t chan)
{
return _dev->set_rx_gain(gain, name, chan);
@@ -100,7 +100,7 @@ public:
{
return _dev->get_rx_gain(name, chan);
}
-
+
std::vector<std::string> get_gain_names(size_t chan)
{
return _dev->get_rx_gain_names(chan);
@@ -111,7 +111,7 @@ public:
return _dev->get_rx_gain_range(chan);
}
- shd::gain_range_t get_gain_range(const std::string &name,
+ shd::gain_range_t get_gain_range(const std::string &name,
size_t chan)
{
return _dev->get_rx_gain_range(name, chan);
@@ -136,8 +136,8 @@ public:
{
return _dev->set_rx_bandwidth(bandwidth, chan);
}
-
- shd::sensor_value_t get_dboard_sensor(const std::string &name,
+
+ shd::sensor_value_t get_dboard_sensor(const std::string &name,
size_t chan)
{
return _dev->get_rx_sensor(name, chan);
@@ -147,18 +147,18 @@ public:
{
return _dev->get_rx_sensor_names(chan);
}
-
+
shd::sensor_value_t get_mboard_sensor(const std::string &name,
size_t mboard)
{
return _dev->get_mboard_sensor(name, mboard);
}
-
+
std::vector<std::string> get_mboard_sensor_names(size_t mboard)
{
return _dev->get_mboard_sensor_names(mboard);
}
-
+
void set_clock_config(const shd::clock_config_t &clock_config,
size_t mboard)
{
@@ -232,23 +232,23 @@ public:
output_items, noutput_items, _metadata,
_type, shd::device::RECV_MODE_ONE_PACKET, 1.0);
}
-
+
//handle possible errors conditions
switch(_metadata.error_code) {
case shd::rx_metadata_t::ERROR_CODE_NONE:
//TODO insert tag for time stamp
break;
-
+
case shd::rx_metadata_t::ERROR_CODE_TIMEOUT:
//Assume that the user called stop() on the flow graph.
//However, a timeout can occur under error conditions.
return WORK_DONE;
-
+
case shd::rx_metadata_t::ERROR_CODE_OVERFLOW:
//ignore overflows and try work again
//TODO insert tag for overflow
return work(noutput_items, input_items, output_items);
-
+
default:
std::cout << boost::format("SHD source block got error code 0x%x"
) % _metadata.error_code << std::endl;
@@ -257,7 +257,7 @@ public:
return num_samps;
}
-
+
bool start(void)
{
//setup a stream command that starts streaming slightly in the future
@@ -268,7 +268,7 @@ public:
_dev->issue_stream_cmd(stream_cmd);
return true;
}
-
+
bool stop(void)
{
_dev->issue_stream_cmd(shd::stream_cmd_t::STREAM_MODE_STOP_CONTINUOUS);
diff --git a/gr-shd/swig/__init__.py b/gr-shd/swig/__init__.py
index d34eb214a9..a9dea94200 100644
--- a/gr-shd/swig/__init__.py
+++ b/gr-shd/swig/__init__.py
@@ -1,18 +1,18 @@
#
# Copyright 2011 Free Software Foundation, Inc.
-#
+#
# This file is part of GNU Radio
-#
+#
# GNU Radio is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3, or (at your option)
# any later version.
-#
+#
# GNU Radio is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with GNU Radio; see the file COPYING. If not, write to
# the Free Software Foundation, Inc., 51 Franklin Street,
diff --git a/gr-shd/swig/qa_shd.py b/gr-shd/swig/qa_shd.py
index 538de918cb..a589fee432 100755
--- a/gr-shd/swig/qa_shd.py
+++ b/gr-shd/swig/qa_shd.py
@@ -1,24 +1,24 @@
#!/usr/bin/env python
#
# Copyright 2005,2008,2010 Free Software Foundation, Inc.
-#
+#
# This file is part of GNU Radio
-#
+#
# GNU Radio is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3, or (at your option)
# any later version.
-#
+#
# GNU Radio is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with GNU Radio; see the file COPYING. If not, write to
# the Free Software Foundation, Inc., 51 Franklin Street,
# Boston, MA 02110-1301, USA.
-#
+#
from gnuradio import gr, gr_unittest
import shd_swig
@@ -35,6 +35,6 @@ class test_shd(gr_unittest.TestCase):
"""Just see if we can import the module...
They may not have a SHD device connected, etc. Don't try to run anything"""
pass
-
+
if __name__ == '__main__':
gr_unittest.run(test_shd, "test_shd.xml")
diff --git a/gr-shd/swig/shd_swig.i b/gr-shd/swig/shd_swig.i
index 5f324a2697..9d5dae51cc 100644
--- a/gr-shd/swig/shd_swig.i
+++ b/gr-shd/swig/shd_swig.i
@@ -1,19 +1,19 @@
/* -*- c++ -*- */
/*
* Copyright 2011 Free Software Foundation, Inc.
- *
+ *
* This file is part of GNU Radio
- *
+ *
* GNU Radio is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3, or (at your option)
* any later version.
- *
+ *
* GNU Radio is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street,