From ccca4c7d043bd5e14e48c67880da498c7d578734 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Tue, 6 Oct 2009 18:00:21 -0700 Subject: moved grc examples to gnuradio-examples/grc --- gnuradio-examples/Makefile.am | 4 +- gnuradio-examples/grc/.gitignore | 2 + gnuradio-examples/grc/Makefile.am | 61 + gnuradio-examples/grc/audio/.gitignore | 2 + gnuradio-examples/grc/audio/cvsd_sweep.grc | 918 +++++++++ gnuradio-examples/grc/audio/dial_tone.grc | 375 ++++ gnuradio-examples/grc/demod/mpsk_demod.grc | 586 ++++++ gnuradio-examples/grc/demod/pam_timing.grc | 616 ++++++ gnuradio-examples/grc/pam_timing.grc | 616 ------ gnuradio-examples/grc/simple/.gitignore | 2 + gnuradio-examples/grc/simple/ber_simulation.grc | 564 ++++++ gnuradio-examples/grc/simple/dpsk_loopback.grc | 450 +++++ gnuradio-examples/grc/simple/var_sink_taps.grc | 488 +++++ gnuradio-examples/grc/simple/variable_config.grc | 329 ++++ gnuradio-examples/grc/trellis/.gitignore | 2 + .../grc/trellis/interference_cancellation.grc | 2072 ++++++++++++++++++++ gnuradio-examples/grc/trellis/readme.txt | 16 + gnuradio-examples/grc/usrp/.gitignore | 2 + gnuradio-examples/grc/usrp/usrp2_const_wave.grc | 252 +++ gnuradio-examples/grc/usrp/usrp2_dpsk_mod.grc | 693 +++++++ gnuradio-examples/grc/usrp/usrp2_fft.grc | 264 +++ .../grc/usrp/usrp_two_tone_loopback.grc | 749 +++++++ gnuradio-examples/grc/usrp/usrp_wbfm_receive.grc | 466 +++++ gnuradio-examples/grc/xmlrpc/.gitignore | 2 + gnuradio-examples/grc/xmlrpc/readme.txt | 18 + gnuradio-examples/grc/xmlrpc/xmlrpc_client.grc | 312 +++ .../grc/xmlrpc/xmlrpc_client_script.py | 23 + gnuradio-examples/grc/xmlrpc/xmlrpc_server.grc | 384 ++++ 28 files changed, 9650 insertions(+), 618 deletions(-) create mode 100644 gnuradio-examples/grc/.gitignore create mode 100644 gnuradio-examples/grc/Makefile.am create mode 100644 gnuradio-examples/grc/audio/.gitignore create mode 100644 gnuradio-examples/grc/audio/cvsd_sweep.grc create mode 100644 gnuradio-examples/grc/audio/dial_tone.grc create mode 100644 gnuradio-examples/grc/demod/mpsk_demod.grc create mode 100644 gnuradio-examples/grc/demod/pam_timing.grc delete mode 100644 gnuradio-examples/grc/pam_timing.grc create mode 100644 gnuradio-examples/grc/simple/.gitignore create mode 100644 gnuradio-examples/grc/simple/ber_simulation.grc create mode 100644 gnuradio-examples/grc/simple/dpsk_loopback.grc create mode 100644 gnuradio-examples/grc/simple/var_sink_taps.grc create mode 100644 gnuradio-examples/grc/simple/variable_config.grc create mode 100644 gnuradio-examples/grc/trellis/.gitignore create mode 100644 gnuradio-examples/grc/trellis/interference_cancellation.grc create mode 100644 gnuradio-examples/grc/trellis/readme.txt create mode 100644 gnuradio-examples/grc/usrp/.gitignore create mode 100644 gnuradio-examples/grc/usrp/usrp2_const_wave.grc create mode 100644 gnuradio-examples/grc/usrp/usrp2_dpsk_mod.grc create mode 100644 gnuradio-examples/grc/usrp/usrp2_fft.grc create mode 100644 gnuradio-examples/grc/usrp/usrp_two_tone_loopback.grc create mode 100644 gnuradio-examples/grc/usrp/usrp_wbfm_receive.grc create mode 100644 gnuradio-examples/grc/xmlrpc/.gitignore create mode 100644 gnuradio-examples/grc/xmlrpc/readme.txt create mode 100644 gnuradio-examples/grc/xmlrpc/xmlrpc_client.grc create mode 100644 gnuradio-examples/grc/xmlrpc/xmlrpc_client_script.py create mode 100644 gnuradio-examples/grc/xmlrpc/xmlrpc_server.grc (limited to 'gnuradio-examples') diff --git a/gnuradio-examples/Makefile.am b/gnuradio-examples/Makefile.am index 360ae8b41..9ea890c12 100644 --- a/gnuradio-examples/Makefile.am +++ b/gnuradio-examples/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2004,2007 Free Software Foundation, Inc. +# Copyright 2004,2007,2009 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -23,5 +23,5 @@ include $(top_srcdir)/Makefile.common SUBDIRS = c++ if PYTHON -SUBDIRS += python +SUBDIRS += python grc endif diff --git a/gnuradio-examples/grc/.gitignore b/gnuradio-examples/grc/.gitignore new file mode 100644 index 000000000..b336cc7ce --- /dev/null +++ b/gnuradio-examples/grc/.gitignore @@ -0,0 +1,2 @@ +/Makefile +/Makefile.in diff --git a/gnuradio-examples/grc/Makefile.am b/gnuradio-examples/grc/Makefile.am new file mode 100644 index 000000000..97417c5a2 --- /dev/null +++ b/gnuradio-examples/grc/Makefile.am @@ -0,0 +1,61 @@ +# +# Copyright 2009 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. +# + +include $(top_srcdir)/Makefile.common + +grc_examples_prefix = $(exampledir)/grc + +audiodatadir = $(grc_examples_prefix)/audio +dist_audiodata_DATA = \ + audio/dial_tone.grc \ + audio/cvsd_sweep.grc + +demoddatadir = $(grc_examples_prefix)/demod +dist_demoddata_DATA = \ + demod/mpsk_demod.grc \ + demod/pam_timing.grc + +simpledatadir = $(grc_examples_prefix)/simple +dist_simpledata_DATA = \ + simple/ber_simulation.grc \ + simple/dpsk_loopback.grc \ + simple/variable_config.grc \ + simple/var_sink_taps.grc + +trellisdatadir = $(grc_examples_prefix)/trellis +dist_trellisdata_DATA = \ + trellis/readme.txt \ + trellis/interference_cancellation.grc + +usrpdatadir = $(grc_examples_prefix)/usrp +dist_usrpdata_DATA = \ + usrp/usrp2_const_wave.grc \ + usrp/usrp2_dpsk_mod.grc \ + usrp/usrp2_fft.grc \ + usrp/usrp_two_tone_loopback.grc \ + usrp/usrp_wbfm_receive.grc + +xmlrpcdatadir = $(grc_examples_prefix)/xmlrpc +dist_xmlrpcdata_DATA = \ + xmlrpc/readme.txt \ + xmlrpc/xmlrpc_client.grc \ + xmlrpc/xmlrpc_client_script.py\ + xmlrpc/xmlrpc_server.grc diff --git a/gnuradio-examples/grc/audio/.gitignore b/gnuradio-examples/grc/audio/.gitignore new file mode 100644 index 000000000..b336cc7ce --- /dev/null +++ b/gnuradio-examples/grc/audio/.gitignore @@ -0,0 +1,2 @@ +/Makefile +/Makefile.in diff --git a/gnuradio-examples/grc/audio/cvsd_sweep.grc b/gnuradio-examples/grc/audio/cvsd_sweep.grc new file mode 100644 index 000000000..8d0b385ce --- /dev/null +++ b/gnuradio-examples/grc/audio/cvsd_sweep.grc @@ -0,0 +1,918 @@ + + + Sat Sep 19 20:30:08 2009 + + import + + id + import_0 + + + _enabled + True + + + import + import math + + + _coordinate + (157, 11) + + + _rotation + 0 + + + + blks2_cvsd_decode + + id + blks2_cvsd_decode_0 + + + _enabled + True + + + resample + resample + + + bw + bw + + + _coordinate + (887, 340) + + + _rotation + 0 + + + + gr_sig_source_x + + id + tri_source + + + _enabled + True + + + type + float + + + samp_rate + audio_rate + + + waveform + gr.GR_TRI_WAVE + + + freq + 0.05 + + + amp + 0.5 + + + offset + 0 + + + _coordinate + (44, 316) + + + _rotation + 0 + + + + gr_throttle + + id + throttle + + + _enabled + True + + + type + float + + + samples_per_second + audio_rate + + + vlen + 1 + + + _coordinate + (238, 348) + + + _rotation + 0 + + + + gr_vco_f + + id + vco + + + _enabled + True + + + samp_rate + audio_rate + + + sensitivity + audio_rate*2*math.pi + + + amplitude + 0.9 + + + _coordinate + (427, 332) + + + _rotation + 0 + + + + blks2_cvsd_encode + + id + enc + + + _enabled + True + + + resample + resample + + + bw + bw + + + _coordinate + (655, 340) + + + _rotation + 0 + + + + gr_packed_to_unpacked_xx + + id + p2u + + + _enabled + True + + + type + byte + + + bits_per_chunk + 1 + + + endianness + gr.GR_MSB_FIRST + + + _coordinate + (648, 415) + + + _rotation + 180 + + + + gr_char_to_float + + id + c2f + + + _enabled + True + + + _coordinate + (676, 483) + + + _rotation + 0 + + + + audio_sink + + id + audio_sink + + + _enabled + True + + + samp_rate + audio_rate + + + device_name + plughw:0,0 + + + ok_to_block + True + + + num_inputs + 1 + + + _coordinate + (1127, 340) + + + _rotation + 0 + + + + variable + + id + audio_rate + + + _enabled + True + + + value + 8000 + + + _coordinate + (251, 10) + + + _rotation + 0 + + + + variable + + id + resample + + + _enabled + True + + + value + 8 + + + _coordinate + (344, 11) + + + _rotation + 0 + + + + variable + + id + bw + + + _enabled + True + + + value + 0.5 + + + _coordinate + (431, 11) + + + _rotation + 0 + + + + notebook + + id + displays + + + _enabled + True + + + style + wx.NB_TOP + + + labels + ['Original','Encoded','Decoded'] + + + grid_pos + + + + notebook + + + + _coordinate + (12, 106) + + + _rotation + 0 + + + + wxgui_fftsink2 + + id + orig_fft + + + _enabled + True + + + type + float + + + title + Original Spectrum + + + samp_rate + audio_rate + + + baseband_freq + 0 + + + y_per_div + 10 + + + y_divs + 10 + + + ref_level + 0 + + + ref_scale + 2.0 + + + fft_size + 1024 + + + fft_rate + 30 + + + peak_hold + False + + + average + False + + + avg_alpha + 0 + + + grid_pos + 0, 0, 1, 1 + + + notebook + displays, 0 + + + _coordinate + (415, 97) + + + _rotation + 180 + + + + wxgui_scopesink2 + + id + orig_scope + + + _enabled + True + + + type + float + + + title + Original Waveform + + + samp_rate + audio_rate + + + v_scale + 0 + + + t_scale + 0 + + + ac_couple + False + + + xy_mode + False + + + num_inputs + 1 + + + grid_pos + 1, 0, 1, 1 + + + notebook + displays, 0 + + + _coordinate + (414, 425) + + + _rotation + 180 + + + + wxgui_fftsink2 + + id + enc_fft + + + _enabled + True + + + type + float + + + title + Encoded Spectrum + + + samp_rate + audio_rate*resample + + + baseband_freq + 0 + + + y_per_div + 10 + + + y_divs + 8 + + + ref_level + 10 + + + ref_scale + 2.0 + + + fft_size + 1024 + + + fft_rate + 30 + + + peak_hold + False + + + average + False + + + avg_alpha + 0 + + + grid_pos + 1, 0, 1, 1 + + + notebook + displays, 1 + + + _coordinate + (610, 551) + + + _rotation + 180 + + + + wxgui_scopesink2 + + id + enc_scope + + + _enabled + True + + + type + float + + + title + Encoded Waveform + + + samp_rate + audio_rate*resample + + + v_scale + 0.5 + + + t_scale + 20.0/(audio_rate*resample) + + + ac_couple + False + + + xy_mode + False + + + num_inputs + 1 + + + grid_pos + 0, 0, 1, 1 + + + notebook + displays, 1 + + + _coordinate + (858, 591) + + + _rotation + 0 + + + + wxgui_fftsink2 + + id + dec_fft + + + _enabled + True + + + type + float + + + title + Decoded Spectrum + + + samp_rate + audio_rate + + + baseband_freq + 0 + + + y_per_div + 5 + + + y_divs + 10 + + + ref_level + 10 + + + ref_scale + 0.1 + + + fft_size + 1024 + + + fft_rate + 30 + + + peak_hold + False + + + average + False + + + avg_alpha + 0 + + + grid_pos + 0, 0, 1, 1 + + + notebook + displays, 2 + + + _coordinate + (891, 98) + + + _rotation + 180 + + + + wxgui_scopesink2 + + id + dec_scope + + + _enabled + True + + + type + float + + + title + Decoded Waveform + + + samp_rate + audio_rate + + + v_scale + 0 + + + t_scale + 0 + + + ac_couple + False + + + xy_mode + False + + + num_inputs + 1 + + + grid_pos + 1, 0, 1, 1 + + + notebook + displays, 2 + + + _coordinate + (889, 422) + + + _rotation + 180 + + + + options + + id + cvsd_sweep + + + _enabled + True + + + title + CVSD Vocoder Test + + + author + + + + description + + + + window_size + 1280, 1024 + + + generate_options + wx_gui + + + category + Custom + + + run + True + + + realtime_scheduling + + + + _coordinate + (10, 10) + + + _rotation + 0 + + + + vco + orig_fft + 0 + 0 + + + tri_source + throttle + 0 + 0 + + + throttle + vco + 0 + 0 + + + vco + enc + 0 + 0 + + + enc + blks2_cvsd_decode_0 + 0 + 0 + + + vco + orig_scope + 0 + 0 + + + blks2_cvsd_decode_0 + dec_fft + 0 + 0 + + + blks2_cvsd_decode_0 + dec_scope + 0 + 0 + + + blks2_cvsd_decode_0 + audio_sink + 0 + 0 + + + enc + p2u + 0 + 0 + + + p2u + c2f + 0 + 0 + + + c2f + enc_fft + 0 + 0 + + + c2f + enc_scope + 0 + 0 + + diff --git a/gnuradio-examples/grc/audio/dial_tone.grc b/gnuradio-examples/grc/audio/dial_tone.grc new file mode 100644 index 000000000..ac8cbef27 --- /dev/null +++ b/gnuradio-examples/grc/audio/dial_tone.grc @@ -0,0 +1,375 @@ + + + Thu Jul 24 14:27:48 2008 + + options + + id + dial_tone + + + _enabled + True + + + title + Dial Tone + + + author + Example + + + description + example flow graph + + + window_size + 1280, 1024 + + + generate_options + wx_gui + + + category + Custom + + + _coordinate + (10, 10) + + + _rotation + 0 + + + + gr_add_xx + + id + gr_add_xx + + + _enabled + True + + + type + float + + + num_inputs + 3 + + + vlen + 1 + + + _coordinate + (513, 277) + + + _rotation + 0 + + + + audio_sink + + id + audio_sink + + + _enabled + True + + + samp_rate + 32000 + + + device_name + + + + ok_to_block + True + + + num_inputs + 1 + + + _coordinate + (699, 112) + + + _rotation + 0 + + + + gr_noise_source_x + + id + gr_noise_source_x + + + _enabled + True + + + type + float + + + noise_type + gr.GR_GAUSSIAN + + + amp + noise + + + seed + 42 + + + _coordinate + (238, 380) + + + _rotation + 0 + + + + gr_sig_source_x + + id + gr_sig_source_x + + + _enabled + True + + + type + float + + + samp_rate + samp_rate + + + waveform + gr.GR_COS_WAVE + + + freq + 440 + + + amp + ampl + + + offset + 0 + + + _coordinate + (240, 208) + + + _rotation + 0 + + + + gr_sig_source_x + + id + gr_sig_source_x0 + + + _enabled + True + + + type + float + + + samp_rate + samp_rate + + + waveform + gr.GR_COS_WAVE + + + freq + 350 + + + amp + ampl + + + offset + 0 + + + _coordinate + (240, 38) + + + _rotation + 0 + + + + variable_slider + + id + ampl + + + _enabled + True + + + label + Volume + + + value + .4 + + + min + 0 + + + max + .5 + + + num_steps + 100 + + + slider_type + horizontal + + + grid_pos + 0, 0, 1, 2 + + + _coordinate + (634, 413) + + + _rotation + 0 + + + + variable_slider + + id + noise + + + _enabled + True + + + label + Noise + + + value + .005 + + + min + 0 + + + max + .2 + + + num_steps + 100 + + + slider_type + horizontal + + + grid_pos + 1, 0, 1, 2 + + + _coordinate + (443, 412) + + + _rotation + 0 + + + + variable + + id + samp_rate + + + _enabled + True + + + value + 32000 + + + _coordinate + (11, 171) + + + _rotation + 0 + + + + gr_sig_source_x0 + gr_add_xx + 0 + 0 + + + gr_sig_source_x + gr_add_xx + 0 + 1 + + + gr_noise_source_x + gr_add_xx + 0 + 2 + + + gr_add_xx + audio_sink + 0 + 0 + + diff --git a/gnuradio-examples/grc/demod/mpsk_demod.grc b/gnuradio-examples/grc/demod/mpsk_demod.grc new file mode 100644 index 000000000..08108dcba --- /dev/null +++ b/gnuradio-examples/grc/demod/mpsk_demod.grc @@ -0,0 +1,586 @@ + + + Mon Oct 5 18:34:52 2009 + + options + + id + mpsk_demod + + + _enabled + True + + + title + MPSK Demod Demo + + + author + + + + description + + + + window_size + 1280, 1024 + + + generate_options + wx_gui + + + category + Custom + + + run_options + prompt + + + run + True + + + realtime_scheduling + + + + _coordinate + (10, 10) + + + _rotation + 0 + + + + variable + + id + samp_rate + + + _enabled + True + + + value + 32000 + + + _coordinate + (10, 170) + + + _rotation + 0 + + + + random_source_x + + id + random_source_x_0 + + + _enabled + True + + + type + byte + + + min + 0 + + + max + 2**8 + + + num_samps + 10000 + + + repeat + True + + + _coordinate + (155, 160) + + + _rotation + 0 + + + + blks2_dxpsk_mod + + id + blks2_dxpsk_mod_0 + + + _enabled + True + + + type + dqpsk + + + samples_per_symbol + samps_per_sym + + + excess_bw + 0.35 + + + gray_code + True + + + verbose + False + + + log + False + + + _coordinate + (391, 54) + + + _rotation + 0 + + + + gr_throttle + + id + gr_throttle_0 + + + _enabled + True + + + type + complex + + + samples_per_second + samp_rate + + + vlen + 1 + + + _coordinate + (654, 142) + + + _rotation + 0 + + + + variable + + id + samps_per_sym + + + _enabled + True + + + value + 4 + + + _coordinate + (7, 89) + + + _rotation + 0 + + + + gr_channel_model + + id + gr_channel_model_0 + + + _enabled + True + + + noise_voltage + noise + + + freq_offset + freq_off + + + epsilon + 1.0 + + + taps + 1.0 + + + seed + 42 + + + _coordinate + (487, 282) + + + _rotation + 0 + + + + variable_slider + + id + noise + + + _enabled + True + + + label + Noise + + + value + .1 + + + min + 0 + + + max + 1 + + + num_steps + 100 + + + style + wx.SL_HORIZONTAL + + + converver + float_converter + + + grid_pos + + + + notebook + + + + _coordinate + (259, 353) + + + _rotation + 0 + + + + variable_slider + + id + freq_off + + + _enabled + True + + + label + Freq Offset + + + value + 0 + + + min + -.5 + + + max + .5 + + + num_steps + 1000 + + + style + wx.SL_HORIZONTAL + + + converver + float_converter + + + grid_pos + + + + notebook + + + + _coordinate + (126, 345) + + + _rotation + 0 + + + + notebook + + id + notebook + + + _enabled + True + + + style + wx.NB_TOP + + + labels + ['Constellation', 'Spectrum'] + + + grid_pos + + + + notebook + + + + _coordinate + (520, 407) + + + _rotation + 0 + + + + wxgui_constellationsink2 + + id + wxgui_constellationsink2_0 + + + _enabled + True + + + title + Constellation Plot + + + samp_rate + samp_rate + + + frame_rate + 5 + + + const_size + 2048 + + + M + 4 + + + theta + 0 + + + alpha + 0.005 + + + fmax + 0.06 + + + mu + 0.5 + + + gain_mu + 0.005 + + + symbol_rate + samp_rate/4. + + + omega_limit + 0.005 + + + grid_pos + + + + notebook + notebook, 0 + + + _coordinate + (824, 212) + + + _rotation + 0 + + + + wxgui_fftsink2 + + id + wxgui_fftsink2_0 + + + _enabled + True + + + type + complex + + + title + FFT Plot + + + samp_rate + samp_rate + + + baseband_freq + 0 + + + y_per_div + 10 + + + y_divs + 10 + + + ref_level + 50 + + + ref_scale + 2.0 + + + fft_size + 1024 + + + fft_rate + 30 + + + peak_hold + False + + + average + False + + + avg_alpha + 0 + + + grid_pos + + + + notebook + notebook, 1 + + + _coordinate + (847, 10) + + + _rotation + 0 + + + + random_source_x_0 + blks2_dxpsk_mod_0 + 0 + 0 + + + gr_throttle_0 + wxgui_constellationsink2_0 + 0 + 0 + + + gr_throttle_0 + wxgui_fftsink2_0 + 0 + 0 + + + blks2_dxpsk_mod_0 + gr_channel_model_0 + 0 + 0 + + + gr_channel_model_0 + gr_throttle_0 + 0 + 0 + + diff --git a/gnuradio-examples/grc/demod/pam_timing.grc b/gnuradio-examples/grc/demod/pam_timing.grc new file mode 100644 index 000000000..989c795a9 --- /dev/null +++ b/gnuradio-examples/grc/demod/pam_timing.grc @@ -0,0 +1,616 @@ + + + Tue Oct 6 14:19:10 2009 + + options + + id + top_block + + + _enabled + True + + + title + + + + author + + + + description + + + + window_size + 1280, 1024 + + + generate_options + wx_gui + + + category + Custom + + + run_options + prompt + + + run + True + + + realtime_scheduling + + + + _coordinate + (10, 10) + + + _rotation + 0 + + + + variable + + id + samp_rate + + + _enabled + True + + + value + 32000 + + + _coordinate + (128, 9) + + + _rotation + 0 + + + + gr_uchar_to_float + + id + gr_uchar_to_float_0 + + + _enabled + True + + + _coordinate + (270, 115) + + + _rotation + 0 + + + + random_source_x + + id + random_source_x_0 + + + _enabled + True + + + type + byte + + + min + 0 + + + max + 2 + + + num_samps + 1000 + + + repeat + True + + + _coordinate + (13, 80) + + + _rotation + 0 + + + + const_source_x + + id + const_source_x_0 + + + _enabled + True + + + type + float + + + const + -0.5 + + + _coordinate + (179, 160) + + + _rotation + 0 + + + + variable_chooser + + id + spb + + + _enabled + True + + + label + Samples Per Bit + + + value + 4 + + + choices + [1, 2, 3, 4, 5, 6, 7, 8] + + + labels + [] + + + type + drop_down + + + style + wx.RA_HORIZONTAL + + + grid_pos + + + + notebook + + + + _coordinate + (0, 834) + + + _rotation + 0 + + + + wxgui_scopesink2 + + id + wxgui_scopesink2_0 + + + _enabled + True + + + type + float + + + title + Scope Plot + + + samp_rate + samp_rate + + + v_scale + 0 + + + t_scale + 0 + + + ac_couple + False + + + xy_mode + False + + + num_inputs + 1 + + + grid_pos + + + + notebook + + + + _coordinate + (750, 128) + + + _rotation + 0 + + + + gr_add_xx + + id + gr_add_xx_0 + + + _enabled + True + + + type + float + + + num_inputs + 2 + + + vlen + 1 + + + _coordinate + (505, 128) + + + _rotation + 0 + + + + variable_slider + + id + noise_amp + + + _enabled + True + + + label + noise_amp + + + value + 0 + + + min + 0 + + + max + 1.0 + + + num_steps + 1000 + + + style + wx.SL_HORIZONTAL + + + converver + float_converter + + + grid_pos + + + + notebook + + + + _coordinate + (600, -1) + + + _rotation + 0 + + + + gr_throttle + + id + gr_throttle_0 + + + _enabled + True + + + type + float + + + samples_per_second + samp_rate + + + vlen + 1 + + + _coordinate + (561, 284) + + + _rotation + 0 + + + + gr_noise_source_x + + id + gr_noise_source_x_0 + + + _enabled + True + + + type + float + + + noise_type + gr.GR_GAUSSIAN + + + amp + noise_amp + + + seed + 42 + + + _coordinate + (45, 497) + + + _rotation + 0 + + + + root_raised_cosine_filter + + id + root_raised_cosine_filter_0 + + + _enabled + True + + + type + interp_fir_filter_fff + + + decim + 1 + + + interp + spb + + + gain + 2*spb + + + samp_rate + 1.0 + + + sym_rate + 1./spb + + + alpha + 0.35 + + + ntaps + 11*spb + + + _coordinate + (50, 295) + + + _rotation + 0 + + + + gr_add_xx + + id + gr_add_xx_0_0 + + + _enabled + True + + + type + float + + + num_inputs + 2 + + + vlen + 1 + + + _coordinate + (374, 389) + + + _rotation + 0 + + + + root_raised_cosine_filter + + id + root_raised_cosine_filter_0_0 + + + _enabled + True + + + type + interp_fir_filter_fff + + + decim + 1 + + + interp + 1 + + + gain + 1 + + + samp_rate + 1.0 + + + sym_rate + 1./spb + + + alpha + 0.35 + + + ntaps + 11*spb + + + _coordinate + (376, 598) + + + _rotation + 0 + + + + random_source_x_0 + gr_uchar_to_float_0 + 0 + 0 + + + gr_uchar_to_float_0 + gr_add_xx_0 + 0 + 0 + + + const_source_x_0 + gr_add_xx_0 + 0 + 1 + + + gr_add_xx_0 + root_raised_cosine_filter_0 + 0 + 0 + + + gr_throttle_0 + wxgui_scopesink2_0 + 0 + 0 + + + root_raised_cosine_filter_0 + gr_add_xx_0_0 + 0 + 0 + + + gr_noise_source_x_0 + gr_add_xx_0_0 + 0 + 1 + + + gr_add_xx_0_0 + root_raised_cosine_filter_0_0 + 0 + 0 + + + root_raised_cosine_filter_0_0 + gr_throttle_0 + 0 + 0 + + diff --git a/gnuradio-examples/grc/pam_timing.grc b/gnuradio-examples/grc/pam_timing.grc deleted file mode 100644 index 989c795a9..000000000 --- a/gnuradio-examples/grc/pam_timing.grc +++ /dev/null @@ -1,616 +0,0 @@ - - - Tue Oct 6 14:19:10 2009 - - options - - id - top_block - - - _enabled - True - - - title - - - - author - - - - description - - - - window_size - 1280, 1024 - - - generate_options - wx_gui - - - category - Custom - - - run_options - prompt - - - run - True - - - realtime_scheduling - - - - _coordinate - (10, 10) - - - _rotation - 0 - - - - variable - - id - samp_rate - - - _enabled - True - - - value - 32000 - - - _coordinate - (128, 9) - - - _rotation - 0 - - - - gr_uchar_to_float - - id - gr_uchar_to_float_0 - - - _enabled - True - - - _coordinate - (270, 115) - - - _rotation - 0 - - - - random_source_x - - id - random_source_x_0 - - - _enabled - True - - - type - byte - - - min - 0 - - - max - 2 - - - num_samps - 1000 - - - repeat - True - - - _coordinate - (13, 80) - - - _rotation - 0 - - - - const_source_x - - id - const_source_x_0 - - - _enabled - True - - - type - float - - - const - -0.5 - - - _coordinate - (179, 160) - - - _rotation - 0 - - - - variable_chooser - - id - spb - - - _enabled - True - - - label - Samples Per Bit - - - value - 4 - - - choices - [1, 2, 3, 4, 5, 6, 7, 8] - - - labels - [] - - - type - drop_down - - - style - wx.RA_HORIZONTAL - - - grid_pos - - - - notebook - - - - _coordinate - (0, 834) - - - _rotation - 0 - - - - wxgui_scopesink2 - - id - wxgui_scopesink2_0 - - - _enabled - True - - - type - float - - - title - Scope Plot - - - samp_rate - samp_rate - - - v_scale - 0 - - - t_scale - 0 - - - ac_couple - False - - - xy_mode - False - - - num_inputs - 1 - - - grid_pos - - - - notebook - - - - _coordinate - (750, 128) - - - _rotation - 0 - - - - gr_add_xx - - id - gr_add_xx_0 - - - _enabled - True - - - type - float - - - num_inputs - 2 - - - vlen - 1 - - - _coordinate - (505, 128) - - - _rotation - 0 - - - - variable_slider - - id - noise_amp - - - _enabled - True - - - label - noise_amp - - - value - 0 - - - min - 0 - - - max - 1.0 - - - num_steps - 1000 - - - style - wx.SL_HORIZONTAL - - - converver - float_converter - - - grid_pos - - - - notebook - - - - _coordinate - (600, -1) - - - _rotation - 0 - - - - gr_throttle - - id - gr_throttle_0 - - - _enabled - True - - - type - float - - - samples_per_second - samp_rate - - - vlen - 1 - - - _coordinate - (561, 284) - - - _rotation - 0 - - - - gr_noise_source_x - - id - gr_noise_source_x_0 - - - _enabled - True - - - type - float - - - noise_type - gr.GR_GAUSSIAN - - - amp - noise_amp - - - seed - 42 - - - _coordinate - (45, 497) - - - _rotation - 0 - - - - root_raised_cosine_filter - - id - root_raised_cosine_filter_0 - - - _enabled - True - - - type - interp_fir_filter_fff - - - decim - 1 - - - interp - spb - - - gain - 2*spb - - - samp_rate - 1.0 - - - sym_rate - 1./spb - - - alpha - 0.35 - - - ntaps - 11*spb - - - _coordinate - (50, 295) - - - _rotation - 0 - - - - gr_add_xx - - id - gr_add_xx_0_0 - - - _enabled - True - - - type - float - - - num_inputs - 2 - - - vlen - 1 - - - _coordinate - (374, 389) - - - _rotation - 0 - - - - root_raised_cosine_filter - - id - root_raised_cosine_filter_0_0 - - - _enabled - True - - - type - interp_fir_filter_fff - - - decim - 1 - - - interp - 1 - - - gain - 1 - - - samp_rate - 1.0 - - - sym_rate - 1./spb - - - alpha - 0.35 - - - ntaps - 11*spb - - - _coordinate - (376, 598) - - - _rotation - 0 - - - - random_source_x_0 - gr_uchar_to_float_0 - 0 - 0 - - - gr_uchar_to_float_0 - gr_add_xx_0 - 0 - 0 - - - const_source_x_0 - gr_add_xx_0 - 0 - 1 - - - gr_add_xx_0 - root_raised_cosine_filter_0 - 0 - 0 - - - gr_throttle_0 - wxgui_scopesink2_0 - 0 - 0 - - - root_raised_cosine_filter_0 - gr_add_xx_0_0 - 0 - 0 - - - gr_noise_source_x_0 - gr_add_xx_0_0 - 0 - 1 - - - gr_add_xx_0_0 - root_raised_cosine_filter_0_0 - 0 - 0 - - - root_raised_cosine_filter_0_0 - gr_throttle_0 - 0 - 0 - - diff --git a/gnuradio-examples/grc/simple/.gitignore b/gnuradio-examples/grc/simple/.gitignore new file mode 100644 index 000000000..b336cc7ce --- /dev/null +++ b/gnuradio-examples/grc/simple/.gitignore @@ -0,0 +1,2 @@ +/Makefile +/Makefile.in diff --git a/gnuradio-examples/grc/simple/ber_simulation.grc b/gnuradio-examples/grc/simple/ber_simulation.grc new file mode 100644 index 000000000..618add29c --- /dev/null +++ b/gnuradio-examples/grc/simple/ber_simulation.grc @@ -0,0 +1,564 @@ + + + Thu Mar 19 11:08:59 2009 + + options + + id + ber_sim + + + _enabled + True + + + title + BER Simulation + + + author + Example + + + description + Adjust the noise and constellation... see what happens! + + + window_size + 1280, 1024 + + + generate_options + wx_gui + + + category + Custom + + + realtime_scheduling + + + + _coordinate + (16, 10) + + + _rotation + 0 + + + + gr_noise_source_x + + id + gr_noise_source_x + + + _enabled + True + + + type + complex + + + noise_type + gr.GR_GAUSSIAN + + + amp + noise + + + seed + 42 + + + _coordinate + (235, 379) + + + _rotation + 0 + + + + gr_chunks_to_symbols_xx + + id + gr_chunks_to_symbols_xx + + + _enabled + True + + + in_type + byte + + + out_type + complex + + + symbol_table + const + + + dimension + 1 + + + _coordinate + (360, 237) + + + _rotation + 0 + + + + wxgui_numbersink2 + + id + wxgui_numbersink2 + + + _enabled + True + + + type + float + + + title + BER + + + units + % + + + samp_rate + samp_rate + + + base_value + 0.0 + + + min_value + 0.0 + + + max_value + 1.0 + + + factor + 100 + + + decimal_places + 4 + + + ref_level + 0 + + + number_rate + 15 + + + peak_hold + False + + + average + False + + + avg_alpha + 0 + + + show_gauge + False + + + grid_pos + 1, 0, 1, 1 + + + _coordinate + (1062, 11) + + + _rotation + 0 + + + + gr_throttle + + id + gr_throttle + + + _enabled + True + + + type + byte + + + samples_per_second + samp_rate + + + vlen + 1 + + + _coordinate + (397, 27) + + + _rotation + 0 + + + + blks2_error_rate + + id + blks2_error_rate + + + _enabled + True + + + type + 'BER' + + + win_size + 1000000 + + + bits_per_symbol + int(math.log(len(const))/math.log(2)) + + + _coordinate + (670, 41) + + + _rotation + 0 + + + + gr_constellation_decoder_cb + + id + gr_constellation_decoder_cb + + + _enabled + True + + + sym_position + const + + + sym_value_out + range(len(const)) + + + _coordinate + (708, 224) + + + _rotation + 0 + + + + random_source_x + + id + random_source_x + + + _enabled + True + + + type + byte + + + min + 0 + + + max + len(const) + + + num_samps + 1000000 + + + repeat + False + + + _coordinate + (15, 244) + + + _rotation + 0 + + + + variable + + id + noise + + + _enabled + True + + + value + .25 + + + _coordinate + (18, 386) + + + _rotation + 0 + + + + variable + + id + const + + + _enabled + True + + + value + 1+1j, 1-1j, -1-1j, -1+1j + + + _coordinate + (16, 461) + + + _rotation + 0 + + + + variable + + id + samp_rate + + + _enabled + True + + + value + 50e3 + + + _coordinate + (20, 168) + + + _rotation + 0 + + + + import + + id + import + + + _enabled + True + + + import + import math + + + _coordinate + (138, 168) + + + _rotation + 0 + + + + gr_add_xx + + id + gr_add_xx + + + _enabled + True + + + type + complex + + + num_inputs + 2 + + + vlen + 1 + + + _coordinate + (652, 395) + + + _rotation + 0 + + + + wxgui_scopesink2 + + id + wxgui_scopesink2_0 + + + _enabled + True + + + type + complex + + + title + "Constellation: "+str(const) + + + samp_rate + samp_rate + + + v_scale + 0 + + + t_scale + 0 + + + ac_couple + False + + + xy_mode + True + + + num_inputs + 1 + + + grid_pos + 2, 0, 1, 1 + + + _coordinate + (828, 368) + + + _rotation + 0 + + + + blks2_error_rate + wxgui_numbersink2 + 0 + 0 + + + gr_throttle + blks2_error_rate + 0 + 0 + + + gr_constellation_decoder_cb + blks2_error_rate + 0 + 1 + + + gr_add_xx + gr_constellation_decoder_cb + 0 + 0 + + + gr_chunks_to_symbols_xx + gr_add_xx + 0 + 0 + + + gr_noise_source_x + gr_add_xx + 0 + 1 + + + random_source_x + gr_throttle + 0 + 0 + + + random_source_x + gr_chunks_to_symbols_xx + 0 + 0 + + + gr_add_xx + wxgui_scopesink2_0 + 0 + 0 + + diff --git a/gnuradio-examples/grc/simple/dpsk_loopback.grc b/gnuradio-examples/grc/simple/dpsk_loopback.grc new file mode 100644 index 000000000..6a507c98d --- /dev/null +++ b/gnuradio-examples/grc/simple/dpsk_loopback.grc @@ -0,0 +1,450 @@ + + + Tue Mar 17 12:53:37 2009 + + options + + id + dpsk_loopback + + + _enabled + True + + + title + DPSK Loopback + + + author + Example + + + description + gnuradio flow graph + + + window_size + 1280, 1024 + + + generate_options + wx_gui + + + category + Custom + + + realtime_scheduling + + + + _coordinate + (10, 10) + + + _rotation + 0 + + + + blks2_dxpsk_mod + + id + blks2_dxpsk_mod_0 + + + _enabled + True + + + type + dbpsk + + + samples_per_symbol + 2 + + + excess_bw + 0.35 + + + gray_code + True + + + _coordinate + (426, 295) + + + _rotation + 0 + + + + variable + + id + samp_rate + + + _enabled + True + + + value + 10000 + + + _coordinate + (10, 170) + + + _rotation + 0 + + + + variable_slider + + id + freq + + + _enabled + True + + + label + Frequency (Hz) + + + value + 500 + + + min + 0 + + + max + samp_rate/2 + + + num_steps + 100 + + + slider_length + 200 + + + slider_type + horizontal + + + grid_pos + + + + _coordinate + (12, 257) + + + _rotation + 0 + + + + blks2_packet_encoder + + id + blks2_packet_encoder_0 + + + _enabled + True + + + type + float + + + samples_per_symbol + 2 + + + bits_per_symbol + 1 + + + access_code + + + + pad_for_usrp + True + + + payload_length + 0 + + + _coordinate + (216, 260) + + + _rotation + 0 + + + + gr_throttle + + id + gr_throttle_0_0 + + + _enabled + True + + + type + float + + + samples_per_second + samp_rate + + + vlen + 1 + + + _coordinate + (225, 174) + + + _rotation + 0 + + + + gr_sig_source_x + + id + gr_sig_source_x_0 + + + _enabled + True + + + type + float + + + samp_rate + samp_rate + + + waveform + gr.GR_COS_WAVE + + + freq + freq + + + amp + 1 + + + offset + 0 + + + _coordinate + (203, 8) + + + _rotation + 0 + + + + blks2_packet_decoder + + id + blks2_packet_decoder_0 + + + _enabled + True + + + type + float + + + access_code + + + + threshold + -1 + + + _coordinate + (551, 65) + + + _rotation + 0 + + + + wxgui_scopesink2 + + id + wxgui_scopesink2_0 + + + _enabled + True + + + type + float + + + title + Scope Plot + + + samp_rate + samp_rate + + + frame_decim + 15 + + + v_scale + 0 + + + t_scale + 1./freq + + + marker + set_format_line + + + num_inputs + 1 + + + grid_pos + + + + _coordinate + (769, 12) + + + _rotation + 0 + + + + blks2_dxpsk_demod + + id + blks2_dxpsk_demod_0 + + + _enabled + True + + + type + dbpsk + + + samples_per_symbol + 2 + + + excess_bw + 0.35 + + + costas_alpha + 0.175 + + + gain_mu + 0.175 + + + mu + 0.5 + + + omega_relative_limit + 0.005 + + + gray_code + True + + + _coordinate + (691, 219) + + + _rotation + 0 + + + + blks2_dxpsk_mod_0 + blks2_dxpsk_demod_0 + 0 + 0 + + + blks2_dxpsk_demod_0 + blks2_packet_decoder_0 + 0 + 0 + + + blks2_packet_encoder_0 + blks2_dxpsk_mod_0 + 0 + 0 + + + gr_sig_source_x_0 + gr_throttle_0_0 + 0 + 0 + + + gr_throttle_0_0 + blks2_packet_encoder_0 + 0 + 0 + + + blks2_packet_decoder_0 + wxgui_scopesink2_0 + 0 + 0 + + diff --git a/gnuradio-examples/grc/simple/var_sink_taps.grc b/gnuradio-examples/grc/simple/var_sink_taps.grc new file mode 100644 index 000000000..07207850e --- /dev/null +++ b/gnuradio-examples/grc/simple/var_sink_taps.grc @@ -0,0 +1,488 @@ + + + Tue May 19 16:45:51 2009 + + options + + id + var_sink_taps + + + _enabled + True + + + title + Variable Sink + Taps + + + author + Example + + + description + gnuradio flow graph + + + window_size + 1280, 1024 + + + generate_options + wx_gui + + + category + Custom + + + realtime_scheduling + + + + _coordinate + (10, 10) + + + _rotation + 0 + + + + gr_noise_source_x + + id + gr_noise_source_x_0 + + + _enabled + True + + + type + complex + + + noise_type + gr.GR_GAUSSIAN + + + amp + 1 + + + seed + 42 + + + _coordinate + (619, 36) + + + _rotation + 0 + + + + gr_fir_filter_xxx + + id + gr_fir_filter_xxx_0 + + + _enabled + True + + + type + ccc + + + decim + 1 + + + taps + dest_taps + + + _coordinate + (831, 47) + + + _rotation + 0 + + + + gr_throttle + + id + gr_throttle_0 + + + _enabled + True + + + type + complex + + + samples_per_second + samp_rate + + + vlen + 1 + + + _coordinate + (999, 198) + + + _rotation + 270 + + + + wxgui_fftsink2 + + id + wxgui_fftsink2_0 + + + _enabled + True + + + type + complex + + + title + FFT Plot + + + samp_rate + samp_rate + + + baseband_freq + 0 + + + y_per_div + 10 + + + y_divs + 10 + + + ref_level + 50 + + + fft_size + 1024 + + + fft_rate + 30 + + + peak_hold + False + + + average + False + + + avg_alpha + 0 + + + grid_pos + + + + _coordinate + (629, 184) + + + _rotation + 180 + + + + import + + id + import_0 + + + _enabled + True + + + import + from gnuradio.gr import firdes + + + _coordinate + (330, 120) + + + _rotation + 0 + + + + variable + + id + dest_taps + + + _enabled + True + + + value + [0] + + + _coordinate + (836, 223) + + + _rotation + 0 + + + + variable + + id + samp_rate + + + _enabled + True + + + value + 32000 + + + _coordinate + (831, 130) + + + _rotation + 0 + + + + variable + + id + source_taps + + + _enabled + True + + + value + firdes.low_pass(1, samp_rate, 4000, 2000) + + + _coordinate + (397, 191) + + + _rotation + 0 + + + + variable + + id + taps_rate + + + _enabled + True + + + value + 10 + + + _coordinate + (268, 189) + + + _rotation + 0 + + + + gr_vector_source_x + + id + gr_vector_source_x_0 + + + _enabled + True + + + type + complex + + + vector + source_taps + + + repeat + True + + + vlen + len(source_taps) + + + _coordinate + (205, 33) + + + _rotation + 0 + + + + note + + id + note_0 + + + _enabled + True + + + note + Pass the FIR taps via a variable sink. + + + _coordinate + (14, 141) + + + _rotation + 0 + + + + gr_throttle + + id + gr_throttle + + + _enabled + True + + + type + complex + + + samples_per_second + taps_rate + + + vlen + len(source_taps) + + + _coordinate + (440, 41) + + + _rotation + 0 + + + + blks2_variable_sink_x + + id + blks2_variable_sink_x_0 + + + _enabled + True + + + type + complex + + + variable + dest_taps + + + decim + 1 + + + vlen + len(source_taps) + + + _coordinate + (305, 283) + + + _rotation + 180 + + + + gr_noise_source_x_0 + gr_fir_filter_xxx_0 + 0 + 0 + + + gr_fir_filter_xxx_0 + gr_throttle_0 + 0 + 0 + + + gr_throttle_0 + wxgui_fftsink2_0 + 0 + 0 + + + gr_vector_source_x_0 + gr_throttle + 0 + 0 + + + gr_throttle + blks2_variable_sink_x_0 + 0 + 0 + + diff --git a/gnuradio-examples/grc/simple/variable_config.grc b/gnuradio-examples/grc/simple/variable_config.grc new file mode 100644 index 000000000..95c287cce --- /dev/null +++ b/gnuradio-examples/grc/simple/variable_config.grc @@ -0,0 +1,329 @@ + + + Thu Jun 25 10:56:04 2009 + + options + + id + variable_config_demo + + + _enabled + True + + + title + Variable Config Block Demonstration + + + author + Example + + + description + Save/Load freq from a config file. + + + window_size + 1280, 1024 + + + generate_options + wx_gui + + + category + Custom + + + autostart + True + + + realtime_scheduling + + + + _coordinate + (10, 10) + + + _rotation + 0 + + + + variable + + id + samp_rate + + + _enabled + True + + + value + 32000 + + + _coordinate + (10, 170) + + + _rotation + 0 + + + + variable_config + + id + freq_init + + + _enabled + True + + + value + 1000 + + + type + real + + + config_file + config.conf + + + section + main + + + option + freq + + + writeback + freq + + + _coordinate + (255, 17) + + + _rotation + 0 + + + + variable_slider + + id + freq + + + _enabled + True + + + label + Frequency (Hz) + + + value + freq_init + + + min + -samp_rate/2 + + + max + samp_rate/2 + + + num_steps + 100 + + + style + wx.SL_HORIZONTAL + + + converver + float_converter + + + grid_pos + + + + _coordinate + (429, 24) + + + _rotation + 0 + + + + gr_throttle + + id + gr_throttle_0 + + + _enabled + True + + + type + complex + + + samples_per_second + samp_rate + + + vlen + 1 + + + _coordinate + (392, 233) + + + _rotation + 0 + + + + gr_sig_source_x + + id + gr_sig_source_x_0 + + + _enabled + True + + + type + complex + + + samp_rate + samp_rate + + + waveform + gr.GR_COS_WAVE + + + freq + freq + + + amp + 1 + + + offset + 0 + + + _coordinate + (148, 233) + + + _rotation + 0 + + + + wxgui_fftsink2 + + id + wxgui_fftsink2_0 + + + _enabled + True + + + type + complex + + + title + FFT Plot + + + samp_rate + samp_rate + + + baseband_freq + 0 + + + y_per_div + 10 + + + y_divs + 10 + + + ref_level + 50 + + + fft_size + 1024 + + + fft_rate + 30 + + + peak_hold + False + + + average + False + + + avg_alpha + 0 + + + grid_pos + + + + _coordinate + (671, 233) + + + _rotation + 0 + + + + gr_sig_source_x_0 + gr_throttle_0 + 0 + 0 + + + gr_throttle_0 + wxgui_fftsink2_0 + 0 + 0 + + diff --git a/gnuradio-examples/grc/trellis/.gitignore b/gnuradio-examples/grc/trellis/.gitignore new file mode 100644 index 000000000..b336cc7ce --- /dev/null +++ b/gnuradio-examples/grc/trellis/.gitignore @@ -0,0 +1,2 @@ +/Makefile +/Makefile.in diff --git a/gnuradio-examples/grc/trellis/interference_cancellation.grc b/gnuradio-examples/grc/trellis/interference_cancellation.grc new file mode 100644 index 000000000..e93babd78 --- /dev/null +++ b/gnuradio-examples/grc/trellis/interference_cancellation.grc @@ -0,0 +1,2072 @@ + + + Thu Mar 19 11:22:40 2009 + + options + + id + int_cancellation + + + _enabled + True + + + title + Superposition Coding + + + author + AA + + + description + gnuradio flow graph + + + window_size + 2048, 2048 + + + generate_options + wx_gui + + + category + Custom + + + realtime_scheduling + + + + _coordinate + (10, 10) + + + _rotation + 0 + + + + variable_slider + + id + alpha + + + _enabled + True + + + label + P1/P + + + value + 0.6 + + + min + 0 + + + max + 1.0 + + + num_steps + 100 + + + slider_length + 200 + + + slider_type + horizontal + + + grid_pos + + + + _coordinate + (243, 11) + + + _rotation + 0 + + + + variable_slider + + id + snr_db + + + _enabled + True + + + label + P/sigma^2 (dB) + + + value + 16 + + + min + 0 + + + max + 20 + + + num_steps + 100 + + + slider_length + 200 + + + slider_type + horizontal + + + grid_pos + + + + _coordinate + (447, 14) + + + _rotation + 0 + + + + variable + + id + noisevar + + + _enabled + True + + + value + 10**(-snr_db/10) + + + _coordinate + (637, 13) + + + _rotation + 0 + + + + random_source_x + + id + random_source_x_0 + + + _enabled + True + + + type + short + + + min + 0 + + + max + 2 + + + num_samps + 1000 + + + repeat + True + + + _coordinate + (21, 170) + + + _rotation + 0 + + + + gr_chunks_to_symbols_xx + + id + gr_chunks_to_symbols_xx_0 + + + _enabled + True + + + in_type + short + + + out_type + complex + + + symbol_table + 1,1j,-1j,-1 + + + dimension + 1 + + + _coordinate + (665, 187) + + + _rotation + 0 + + + + gr_multiply_const_vxx + + id + gr_multiply_const_vxx_0 + + + _enabled + True + + + type + complex + + + const + alpha**0.5 + + + vlen + 1 + + + _coordinate + (988, 196) + + + _rotation + 0 + + + + random_source_x + + id + random_source_x_1 + + + _enabled + True + + + type + short + + + min + 0 + + + max + 2 + + + num_samps + 1000 + + + repeat + True + + + _coordinate + (25, 291) + + + _rotation + 0 + + + + gr_chunks_to_symbols_xx + + id + gr_chunks_to_symbols_xx_1 + + + _enabled + True + + + in_type + short + + + out_type + complex + + + symbol_table + 1,1j,-1j,-1 + + + dimension + 1 + + + _coordinate + (660, 311) + + + _rotation + 0 + + + + gr_multiply_const_vxx + + id + gr_multiply_const_vxx_1 + + + _enabled + True + + + type + complex + + + const + (1-alpha)**0.5 + + + vlen + 1 + + + _coordinate + (994, 319) + + + _rotation + 0 + + + + gr_add_xx + + id + gr_add_xx_0 + + + _enabled + True + + + type + complex + + + num_inputs + 2 + + + vlen + 1 + + + _coordinate + (1224, 244) + + + _rotation + 0 + + + + gr_noise_source_x + + id + gr_noise_source_x_0 + + + _enabled + True + + + type + complex + + + noise_type + gr.GR_GAUSSIAN + + + amp + noisevar + + + seed + 42 + + + _coordinate + (1146, 369) + + + _rotation + 0 + + + + gr_sub_xx + + id + gr_sub_xx_0 + + + _enabled + True + + + type + short + + + vlen + 1 + + + num_inputs + 2 + + + _coordinate + (536, 529) + + + _rotation + 0 + + + + gr_multiply_xx + + id + gr_multiply_xx_0 + + + _enabled + True + + + type + short + + + num_inputs + 2 + + + vlen + 1 + + + _coordinate + (771, 525) + + + _rotation + 0 + + + + gr_short_to_float + + id + gr_short_to_float_0 + + + _enabled + True + + + _coordinate + (994, 545) + + + _rotation + 0 + + + + gr_sub_xx + + id + gr_sub_xx_3 + + + _enabled + True + + + type + short + + + vlen + 1 + + + num_inputs + 2 + + + _coordinate + (535, 792) + + + _rotation + 0 + + + + gr_multiply_xx + + id + gr_multiply_xx_1 + + + _enabled + True + + + type + short + + + num_inputs + 2 + + + vlen + 1 + + + _coordinate + (785, 779) + + + _rotation + 0 + + + + gr_short_to_float + + id + gr_short_to_float_2 + + + _enabled + True + + + _coordinate + (1005, 798) + + + _rotation + 0 + + + + gr_chunks_to_symbols_xx + + id + gr_chunks_to_symbols_xx_2 + + + _enabled + True + + + in_type + short + + + out_type + complex + + + symbol_table + 1,1j,-1j,-1 + + + dimension + 1 + + + _coordinate + (405, 998) + + + _rotation + 0 + + + + gr_multiply_const_vxx + + id + gr_multiply_const_vxx_2 + + + _enabled + True + + + type + complex + + + const + alpha**0.5 + + + vlen + 1 + + + _coordinate + (710, 1008) + + + _rotation + 0 + + + + gr_sub_xx + + id + gr_sub_xx_2 + + + _enabled + True + + + type + complex + + + vlen + 1 + + + num_inputs + 2 + + + _coordinate + (944, 978) + + + _rotation + 0 + + + + gr_sub_xx + + id + gr_sub_xx_1 + + + _enabled + True + + + type + short + + + vlen + 1 + + + num_inputs + 2 + + + _coordinate + (540, 1141) + + + _rotation + 0 + + + + gr_multiply_xx + + id + gr_multiply_xx_2 + + + _enabled + True + + + type + short + + + num_inputs + 2 + + + vlen + 1 + + + _coordinate + (796, 1136) + + + _rotation + 0 + + + + gr_short_to_float + + id + gr_short_to_float_1 + + + _enabled + True + + + _coordinate + (1009, 1156) + + + _rotation + 0 + + + + gr_chunks_to_symbols_xx + + id + gr_chunks_to_symbols_xx_2_0 + + + _enabled + True + + + in_type + short + + + out_type + complex + + + symbol_table + 1,1j,-1j,-1 + + + dimension + 1 + + + _coordinate + (420, 1368) + + + _rotation + 0 + + + + gr_multiply_const_vxx + + id + gr_multiply_const_vxx_2_0 + + + _enabled + True + + + type + complex + + + const + (1-alpha)**0.5 + + + vlen + 1 + + + _coordinate + (733, 1374) + + + _rotation + 0 + + + + gr_sub_xx + + id + gr_sub_xx_2_0 + + + _enabled + True + + + type + complex + + + vlen + 1 + + + num_inputs + 2 + + + _coordinate + (975, 1342) + + + _rotation + 0 + + + + gr_sub_xx + + id + gr_sub_xx_1_0 + + + _enabled + True + + + type + short + + + vlen + 1 + + + num_inputs + 2 + + + _coordinate + (559, 1536) + + + _rotation + 0 + + + + gr_multiply_xx + + id + gr_multiply_xx_2_0 + + + _enabled + True + + + type + short + + + num_inputs + 2 + + + vlen + 1 + + + _coordinate + (771, 1530) + + + _rotation + 0 + + + + gr_short_to_float + + id + gr_short_to_float_1_0 + + + _enabled + True + + + _coordinate + (1010, 1551) + + + _rotation + 0 + + + + wxgui_numbersink2 + + id + wxgui_numbersink2_2 + + + _enabled + True + + + type + float + + + title + BER 2 (raw) + + + units + BER + + + samp_rate + R + + + base_value + 0.0 + + + min_value + 0 + + + max_value + 1.0 + + + factor + 1.0 + + + decimal_places + 6 + + + ref_level + 0 + + + number_rate + 15 + + + peak_hold + False + + + average + False + + + avg_alpha + 0.001 + + + show_gauge + True + + + grid_pos + 0,1,1,1 + + + _coordinate + (1260, 659) + + + _rotation + 0 + + + + wxgui_numbersink2 + + id + wxgui_numbersink2_3 + + + _enabled + True + + + type + float + + + title + BER 2 (after cancelling user 1) + + + units + BER + + + samp_rate + R + + + base_value + 0.0 + + + min_value + 0 + + + max_value + 1.0 + + + factor + 1.0 + + + decimal_places + 6 + + + ref_level + 0 + + + number_rate + 15 + + + peak_hold + False + + + average + False + + + avg_alpha + 0.001 + + + show_gauge + True + + + grid_pos + 1,1,1,1 + + + _coordinate + (1262, 1020) + + + _rotation + 0 + + + + wxgui_numbersink2 + + id + wxgui_numbersink2_3_0 + + + _enabled + True + + + type + float + + + title + BER 1 (after cancelling user 2) + + + units + BER + + + samp_rate + R + + + base_value + 0.0 + + + min_value + 0 + + + max_value + 1.0 + + + factor + 1.0 + + + decimal_places + 6 + + + ref_level + 0 + + + number_rate + 15 + + + peak_hold + False + + + average + False + + + avg_alpha + 0.001 + + + show_gauge + True + + + grid_pos + 1,0,1,1 + + + _coordinate + (1269, 1417) + + + _rotation + 0 + + + + variable + + id + R + + + _enabled + True + + + value + 10e3 + + + _coordinate + (748, 12) + + + _rotation + 0 + + + + trellis_encoder_xx + + id + trellis_encoder_xx_0 + + + _enabled + True + + + type + ss + + + fsm_args + prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_16.fsm" + + + init_state + 0 + + + _coordinate + (334, 190) + + + _rotation + 0 + + + + trellis_encoder_xx + + id + trellis_encoder_xx_1 + + + _enabled + True + + + type + ss + + + fsm_args + prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_16.fsm" + + + init_state + 0 + + + _coordinate + (336, 311) + + + _rotation + 0 + + + + trellis_viterbi_combined_xx + + id + trellis_viterbi_combined_xx_1 + + + _enabled + True + + + type + c + + + out_type + s + + + fsm_args + prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_16.fsm" + + + block_size + 1000 + + + init_state + -1 + + + final_state + -1 + + + dim + 1 + + + table + alpha**0.5*1,alpha**0.5*1j,alpha**0.5*(-1j),alpha**0.5*(-1) + + + metric_type + trellis.TRELLIS_EUCLIDEAN + + + _coordinate + (79, 501) + + + _rotation + 0 + + + + trellis_viterbi_combined_xx + + id + trellis_viterbi_combined_xx_2 + + + _enabled + True + + + type + c + + + out_type + s + + + fsm_args + prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_16.fsm" + + + block_size + 1000 + + + init_state + -1 + + + final_state + -1 + + + dim + 1 + + + table + (1-alpha)**0.5*1,(1-alpha)**0.5*1j,(1-alpha)**0.5*(-1j),(1-alpha)**0.5*(-1) + + + metric_type + trellis.TRELLIS_EUCLIDEAN + + + _coordinate + (82, 766) + + + _rotation + 0 + + + + trellis_encoder_xx + + id + trellis_encoder_xx_2 + + + _enabled + True + + + type + ss + + + fsm_args + prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_16.fsm" + + + init_state + 0 + + + _coordinate + (89, 998) + + + _rotation + 0 + + + + trellis_viterbi_combined_xx + + id + trellis_viterbi_combined_xx_0 + + + _enabled + True + + + type + c + + + out_type + s + + + fsm_args + prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_16.fsm" + + + block_size + 1000 + + + init_state + -1 + + + final_state + -1 + + + dim + 1 + + + table + (1-alpha)**0.5*1,(1-alpha)**0.5*1j,(1-alpha)**0.5*(-1j),(1-alpha)**0.5*(-1) + + + metric_type + trellis.TRELLIS_EUCLIDEAN + + + _coordinate + (83, 1111) + + + _rotation + 0 + + + + trellis_encoder_xx + + id + trellis_encoder_xx_2_0 + + + _enabled + True + + + type + ss + + + fsm_args + prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_16.fsm" + + + init_state + 0 + + + _coordinate + (105, 1367) + + + _rotation + 0 + + + + trellis_viterbi_combined_xx + + id + trellis_viterbi_combined_xx_0_0 + + + _enabled + True + + + type + c + + + out_type + s + + + fsm_args + prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_16.fsm" + + + block_size + 1000 + + + init_state + -1 + + + final_state + -1 + + + dim + 1 + + + table + alpha**0.5*1,alpha**0.5*1j,alpha**0.5*(-1j),alpha**0.5*(-1) + + + metric_type + trellis.TRELLIS_EUCLIDEAN + + + _coordinate + (75, 1495) + + + _rotation + 0 + + + + variable + + id + prefix + + + _enabled + True + + + value + "../../../" + + + _coordinate + (871, 14) + + + _rotation + 0 + + + + gr_add_xx + + id + gr_add_xx_1 + + + _enabled + True + + + type + complex + + + num_inputs + 2 + + + vlen + 1 + + + _coordinate + (1400, 262) + + + _rotation + 0 + + + + wxgui_numbersink2 + + id + wxgui_numbersink2_0 + + + _enabled + True + + + type + float + + + title + BER 1 (raw) + + + units + BER + + + samp_rate + R + + + base_value + 0.0 + + + min_value + 0 + + + max_value + 1 + + + factor + 1.0 + + + decimal_places + 6 + + + ref_level + 0 + + + number_rate + 15 + + + peak_hold + False + + + average + False + + + avg_alpha + 0.001 + + + show_gauge + True + + + grid_pos + 0,0,1,1 + + + _coordinate + (1267, 410) + + + _rotation + 0 + + + + wxgui_scopesink2 + + id + wxgui_scopesink2_0 + + + _enabled + True + + + type + complex + + + title + Scope Plot + + + samp_rate + R + + + v_scale + 0 + + + t_scale + 0 + + + ac_couple + False + + + xy_mode + True + + + num_inputs + 1 + + + grid_pos + + + + _coordinate + (1533, 149) + + + _rotation + 0 + + + + random_source_x_1 + trellis_encoder_xx_1 + 0 + 0 + + + trellis_encoder_xx_0 + gr_chunks_to_symbols_xx_0 + 0 + 0 + + + trellis_encoder_xx_1 + gr_chunks_to_symbols_xx_1 + 0 + 0 + + + gr_chunks_to_symbols_xx_0 + gr_multiply_const_vxx_0 + 0 + 0 + + + gr_multiply_const_vxx_0 + gr_add_xx_0 + 0 + 0 + + + gr_add_xx_0 + gr_add_xx_1 + 0 + 0 + + + gr_noise_source_x_0 + gr_add_xx_1 + 0 + 1 + + + gr_chunks_to_symbols_xx_1 + gr_multiply_const_vxx_1 + 0 + 0 + + + gr_multiply_const_vxx_1 + gr_add_xx_0 + 0 + 1 + + + gr_sub_xx_0 + gr_multiply_xx_0 + 0 + 0 + + + gr_sub_xx_0 + gr_multiply_xx_0 + 0 + 1 + + + gr_multiply_xx_0 + gr_short_to_float_0 + 0 + 0 + + + gr_short_to_float_0 + wxgui_numbersink2_0 + 0 + 0 + + + gr_multiply_xx_2 + gr_short_to_float_1 + 0 + 0 + + + random_source_x_0 + trellis_encoder_xx_0 + 0 + 0 + + + gr_add_xx_1 + trellis_viterbi_combined_xx_1 + 0 + 0 + + + random_source_x_0 + gr_sub_xx_0 + 0 + 0 + + + trellis_viterbi_combined_xx_1 + gr_sub_xx_0 + 0 + 1 + + + trellis_viterbi_combined_xx_0 + gr_sub_xx_1 + 0 + 1 + + + random_source_x_1 + gr_sub_xx_1 + 0 + 0 + + + gr_sub_xx_1 + gr_multiply_xx_2 + 0 + 0 + + + gr_sub_xx_1 + gr_multiply_xx_2 + 0 + 1 + + + gr_sub_xx_2 + trellis_viterbi_combined_xx_0 + 0 + 0 + + + gr_add_xx_1 + gr_sub_xx_2 + 0 + 0 + + + trellis_encoder_xx_2 + gr_chunks_to_symbols_xx_2 + 0 + 0 + + + gr_chunks_to_symbols_xx_2 + gr_multiply_const_vxx_2 + 0 + 0 + + + gr_multiply_const_vxx_2 + gr_sub_xx_2 + 0 + 1 + + + trellis_viterbi_combined_xx_1 + trellis_encoder_xx_2 + 0 + 0 + + + gr_multiply_xx_1 + gr_short_to_float_2 + 0 + 0 + + + gr_short_to_float_2 + wxgui_numbersink2_2 + 0 + 0 + + + trellis_viterbi_combined_xx_2 + gr_sub_xx_3 + 0 + 1 + + + gr_sub_xx_3 + gr_multiply_xx_1 + 0 + 0 + + + gr_sub_xx_3 + gr_multiply_xx_1 + 0 + 1 + + + gr_add_xx_1 + trellis_viterbi_combined_xx_2 + 0 + 0 + + + random_source_x_1 + gr_sub_xx_3 + 0 + 0 + + + gr_short_to_float_1 + wxgui_numbersink2_3 + 0 + 0 + + + trellis_encoder_xx_2_0 + gr_chunks_to_symbols_xx_2_0 + 0 + 0 + + + gr_chunks_to_symbols_xx_2_0 + gr_multiply_const_vxx_2_0 + 0 + 0 + + + trellis_viterbi_combined_xx_2 + trellis_encoder_xx_2_0 + 0 + 0 + + + gr_multiply_xx_2_0 + gr_short_to_float_1_0 + 0 + 0 + + + trellis_viterbi_combined_xx_0_0 + gr_sub_xx_1_0 + 0 + 1 + + + gr_sub_xx_1_0 + gr_multiply_xx_2_0 + 0 + 0 + + + gr_sub_xx_1_0 + gr_multiply_xx_2_0 + 0 + 1 + + + gr_sub_xx_2_0 + trellis_viterbi_combined_xx_0_0 + 0 + 0 + + + gr_short_to_float_1_0 + wxgui_numbersink2_3_0 + 0 + 0 + + + gr_add_xx_1 + gr_sub_xx_2_0 + 0 + 0 + + + random_source_x_0 + gr_sub_xx_1_0 + 0 + 0 + + + gr_multiply_const_vxx_2_0 + gr_sub_xx_2_0 + 0 + 1 + + + gr_add_xx_1 + wxgui_scopesink2_0 + 0 + 0 + + diff --git a/gnuradio-examples/grc/trellis/readme.txt b/gnuradio-examples/grc/trellis/readme.txt new file mode 100644 index 000000000..d620fd628 --- /dev/null +++ b/gnuradio-examples/grc/trellis/readme.txt @@ -0,0 +1,16 @@ +This is an example of using gr-trellis in grc. + +Two users are transmitting simultaneously using convolutionally encoded QPSK, each with power P1=alpha*P and P2=(1-alpha)*P. +The combined signal is observed in noise and four different receivers are considered: +1) A viterbi decoder decoding user 1 assuming user 2 is noise +2) A viterbi decoder decoding user 2 assuming user 1 is noise +3) A viterbi decoder decoding user 1 first + and then reencoding this signal, subtracting it from the observation + and then running a Viterbi decoder decoding user 2 +4) A viterbi decoder decoding user 2 first + and then reencoding this signal, subtracting it from the observation + and then running a Viterbi decoder decoding user 1 + +You can change the signal to noise ratio P/sigma^2 and the allocation of power to the two users, alpha. + +Enjoy. diff --git a/gnuradio-examples/grc/usrp/.gitignore b/gnuradio-examples/grc/usrp/.gitignore new file mode 100644 index 000000000..b336cc7ce --- /dev/null +++ b/gnuradio-examples/grc/usrp/.gitignore @@ -0,0 +1,2 @@ +/Makefile +/Makefile.in diff --git a/gnuradio-examples/grc/usrp/usrp2_const_wave.grc b/gnuradio-examples/grc/usrp/usrp2_const_wave.grc new file mode 100644 index 000000000..fdbd7c1f3 --- /dev/null +++ b/gnuradio-examples/grc/usrp/usrp2_const_wave.grc @@ -0,0 +1,252 @@ + + + Wed Apr 15 11:22:56 2009 + + const_source_x + + id + const_source_x_0 + + + _enabled + True + + + type + complex + + + const + ampl + + + _coordinate + (284, 154) + + + _rotation + 0 + + + + usrp2_sink_xxxx + + id + usrp2_sink_xxxx_0 + + + _enabled + True + + + type + complex + + + interface + + + + mac_addr + + + + interpolation + interp + + + frequency + tun_freq + + + gain + 0 + + + _coordinate + (493, 106) + + + _rotation + 0 + + + + variable + + id + interp + + + _enabled + True + + + value + 16 + + + _coordinate + (16, 255) + + + _rotation + 0 + + + + variable_slider + + id + tun_freq + + + _enabled + True + + + label + USRP2 Freq (Hz) + + + value + 2.45e9 + + + min + 2.4e9 + + + max + 2.5e9 + + + num_steps + 100 + + + slider_length + 200 + + + slider_type + horizontal + + + grid_pos + + + + _coordinate + (30, 376) + + + _rotation + 0 + + + + variable_slider + + id + ampl + + + _enabled + True + + + label + Amplitude + + + value + .1 + + + min + 0 + + + max + 1 + + + num_steps + 100 + + + slider_length + 200 + + + slider_type + horizontal + + + grid_pos + + + + _coordinate + (204, 376) + + + _rotation + 0 + + + + options + + id + usrp2_const_wave + + + _enabled + True + + + title + USRP2 Constant Wave + + + author + Example + + + description + Tune USRP2 + + + window_size + 1280, 1024 + + + generate_options + wx_gui + + + category + Custom + + + realtime_scheduling + + + + _coordinate + (10, 10) + + + _rotation + 0 + + + + const_source_x_0 + usrp2_sink_xxxx_0 + 0 + 0 + + diff --git a/gnuradio-examples/grc/usrp/usrp2_dpsk_mod.grc b/gnuradio-examples/grc/usrp/usrp2_dpsk_mod.grc new file mode 100644 index 000000000..e9f9b41ea --- /dev/null +++ b/gnuradio-examples/grc/usrp/usrp2_dpsk_mod.grc @@ -0,0 +1,693 @@ + + + Wed Apr 15 17:31:00 2009 + + options + + id + usrp2_dpsk_mod + + + _enabled + True + + + title + USRP2 DPSK Modulation + + + author + Example + + + description + Generate a DPSK signal + + + window_size + 1280, 1024 + + + generate_options + wx_gui + + + category + Custom + + + realtime_scheduling + + + + _coordinate + (10, 10) + + + _rotation + 0 + + + + variable + + id + samp_rate + + + _enabled + True + + + value + 100e6/interp + + + _coordinate + (52, 166) + + + _rotation + 0 + + + + usrp2_sink_xxxx + + id + usrp2_sink_xxxx_0 + + + _enabled + True + + + type + complex + + + interface + + + + mac_addr + + + + interpolation + interp + + + frequency + tun_freq + + + gain + 0 + + + _coordinate + (1059, 56) + + + _rotation + 0 + + + + gr_multiply_const_vxx + + id + gr_multiply_const_vxx_0 + + + _enabled + True + + + type + complex + + + const + ampl + + + vlen + 1 + + + _coordinate + (679, 58) + + + _rotation + 0 + + + + blks2_dxpsk_mod + + id + blks2_dxpsk_mod_0 + + + _enabled + True + + + type + dqpsk + + + samples_per_symbol + samps_per_sym + + + excess_bw + 0.35 + + + gray_code + True + + + _coordinate + (468, 55) + + + _rotation + 0 + + + + variable + + id + interp + + + _enabled + True + + + value + 100 + + + _coordinate + (31, 256) + + + _rotation + 0 + + + + variable + + id + samps_per_sym + + + _enabled + True + + + value + 8 + + + _coordinate + (126, 250) + + + _rotation + 0 + + + + random_source_x + + id + random_source_x_0 + + + _enabled + True + + + type + byte + + + min + 0 + + + max + 256 + + + num_samps + 1000 + + + repeat + True + + + _coordinate + (255, 39) + + + _rotation + 0 + + + + variable_slider + + id + ampl + + + _enabled + True + + + label + Amplitude + + + value + .1 + + + min + 0 + + + max + 1 + + + num_steps + 100 + + + style + wx.SL_HORIZONTAL + + + converver + float_converter + + + grid_pos + + + + _coordinate + (246, 372) + + + _rotation + 0 + + + + variable_slider + + id + rx_freq_off + + + _enabled + True + + + label + RX Freq Offset (Hz) + + + value + -20e3 + + + min + -50e3 + + + max + +50e3 + + + num_steps + 100 + + + style + wx.SL_HORIZONTAL + + + converver + float_converter + + + grid_pos + + + + _coordinate + (247, 508) + + + _rotation + 0 + + + + variable_slider + + id + tun_freq + + + _enabled + True + + + label + USRP2 Freq (Hz) + + + value + 2.45e9 + + + min + 2.4e9 + + + max + 2.5e9 + + + num_steps + 100 + + + style + wx.SL_HORIZONTAL + + + converver + float_converter + + + grid_pos + + + + _coordinate + (49, 341) + + + _rotation + 0 + + + + wxgui_constellationsink2 + + id + wxgui_constellationsink2_0 + + + _enabled + True + + + title + Constellation Plot + + + samp_rate + samp_rate + + + frame_rate + 5 + + + const_size + 2048 + + + M + 4 + + + theta + 0 + + + alpha + 0.005 + + + fmax + 0.06 + + + mu + 0.5 + + + gain_mu + 0.005 + + + symbol_rate + samp_rate/samps_per_sym + + + omega_limit + 0.005 + + + grid_pos + + + + _coordinate + (920, 202) + + + _rotation + 0 + + + + wxgui_fftsink2 + + id + wxgui_fftsink2_0 + + + _enabled + True + + + type + complex + + + title + FFT Plot + + + samp_rate + samp_rate + + + baseband_freq + tun_freq + + + y_per_div + 10 + + + ref_level + 10 + + + fft_size + 1024 + + + fft_rate + 30 + + + peak_hold + False + + + average + False + + + avg_alpha + 0 + + + grid_pos + + + + _coordinate + (691, 155) + + + _rotation + 0 + + + + wxgui_scopesink2 + + id + wxgui_scopesink2_0 + + + _enabled + False + + + type + complex + + + title + Scope Plot + + + samp_rate + samp_rate + + + v_scale + 0 + + + t_scale + 1e-6 + + + ac_couple + False + + + xy_mode + True + + + num_inputs + 1 + + + grid_pos + + + + _coordinate + (515, 272) + + + _rotation + 0 + + + + usrp2_source_xxxx + + id + usrp2_source_xxxx_0 + + + _enabled + True + + + type + complex + + + interface + eth1 + + + mac_addr + + + + decimation + interp + + + frequency + tun_freq + rx_freq_off + + + gain + 30 + + + _coordinate + (270, 200) + + + _rotation + 0 + + + + random_source_x_0 + blks2_dxpsk_mod_0 + 0 + 0 + + + blks2_dxpsk_mod_0 + gr_multiply_const_vxx_0 + 0 + 0 + + + gr_multiply_const_vxx_0 + usrp2_sink_xxxx_0 + 0 + 0 + + + usrp2_source_xxxx_0 + wxgui_constellationsink2_0 + 0 + 0 + + + usrp2_source_xxxx_0 + wxgui_scopesink2_0 + 0 + 0 + + + usrp2_source_xxxx_0 + wxgui_fftsink2_0 + 0 + 0 + + diff --git a/gnuradio-examples/grc/usrp/usrp2_fft.grc b/gnuradio-examples/grc/usrp/usrp2_fft.grc new file mode 100644 index 000000000..134bd4614 --- /dev/null +++ b/gnuradio-examples/grc/usrp/usrp2_fft.grc @@ -0,0 +1,264 @@ + + + Wed Apr 15 17:30:20 2009 + + options + + id + usrp2_fft + + + _enabled + True + + + title + USRP2 FFT Plotter + + + author + Example + + + description + FFT waveform plot + + + window_size + 1280, 1024 + + + generate_options + wx_gui + + + category + Custom + + + realtime_scheduling + + + + _coordinate + (10, 10) + + + _rotation + 0 + + + + variable + + id + samp_rate + + + _enabled + True + + + value + 100e6/decim + + + _coordinate + (10, 170) + + + _rotation + 0 + + + + variable + + id + decim + + + _enabled + True + + + value + 16 + + + _coordinate + (24, 267) + + + _rotation + 0 + + + + variable_slider + + id + tun_freq + + + _enabled + True + + + label + USRP2 Freq (Hz) + + + value + 2.45e9 + + + min + 2.4e9 + + + max + 2.5e9 + + + num_steps + 100 + + + style + wx.SL_HORIZONTAL + + + converver + float_converter + + + grid_pos + + + + _coordinate + (32, 365) + + + _rotation + 0 + + + + wxgui_fftsink2 + + id + wxgui_fftsink2_0 + + + _enabled + True + + + type + complex + + + title + FFT Plot + + + samp_rate + samp_rate + + + baseband_freq + tun_freq + + + y_per_div + 10 + + + ref_level + 10 + + + fft_size + 1024 + + + fft_rate + 30 + + + peak_hold + False + + + average + False + + + avg_alpha + 0 + + + grid_pos + + + + _coordinate + (466, 100) + + + _rotation + 0 + + + + usrp2_source_xxxx + + id + usrp2_source_xxxx_0 + + + _enabled + True + + + type + complex + + + interface + + + + mac_addr + + + + decimation + decim + + + frequency + tun_freq + + + gain + 0 + + + _coordinate + (211, 200) + + + _rotation + 0 + + + + usrp2_source_xxxx_0 + wxgui_fftsink2_0 + 0 + 0 + + diff --git a/gnuradio-examples/grc/usrp/usrp_two_tone_loopback.grc b/gnuradio-examples/grc/usrp/usrp_two_tone_loopback.grc new file mode 100644 index 000000000..3df977044 --- /dev/null +++ b/gnuradio-examples/grc/usrp/usrp_two_tone_loopback.grc @@ -0,0 +1,749 @@ + + + Fri Apr 17 18:23:35 2009 + + variable + + id + samp_rate + + + _enabled + True + + + value + 64e6/200 + + + _coordinate + (9, 166) + + + _rotation + 0 + + + + variable + + id + tun_freq + + + _enabled + True + + + value + int(100e6) + + + _coordinate + (116, 166) + + + _rotation + 0 + + + + gr_sig_source_x + + id + gr_sig_source_x + + + _enabled + True + + + type + complex + + + samp_rate + samp_rate + + + waveform + gr.GR_COS_WAVE + + + freq + tone1 + + + amp + tone_ampl + + + offset + 0 + + + _coordinate + (258, 20) + + + _rotation + 0 + + + + gr_sig_source_x + + id + gr_sig_source_x0 + + + _enabled + True + + + type + complex + + + samp_rate + samp_rate + + + waveform + gr.GR_COS_WAVE + + + freq + tone2 + + + amp + tone_ampl + + + offset + 0 + + + _coordinate + (255, 179) + + + _rotation + 0 + + + + gr_add_xx + + id + gr_add_xx + + + _enabled + True + + + type + complex + + + num_inputs + 3 + + + vlen + 1 + + + _coordinate + (528, 78) + + + _rotation + 0 + + + + parameter + + id + tx_side + + + _enabled + True + + + label + + + + value + A + + + type + string + + + _coordinate + (688, 384) + + + _rotation + 0 + + + + usrp_simple_sink_x + + id + usrp_simple_sink_x + + + _enabled + True + + + type + complex + + + format + + + + which + 0 + + + interpolation + 400 + + + frequency + tun_freq + + + gain + 0 + + + side + tx_side + + + transmit + + + + _coordinate + (835, 5) + + + _rotation + 0 + + + + usrp_simple_source_x + + id + usrp_simple_source_x + + + _enabled + True + + + type + complex + + + format + + + + which + 0 + + + decimation + 200 + + + frequency + tun_freq + + + gain + 20 + + + side + rx_side + + + rx_ant + rx_ant + + + hb_filters + + + + _coordinate + (479, 224) + + + _rotation + 0 + + + + parameter + + id + rx_ant + + + _enabled + True + + + label + + + + value + RXA + + + type + string + + + _coordinate + (802, 384) + + + _rotation + 0 + + + + wxgui_fftsink2 + + id + wxgui_fftsink2 + + + _enabled + True + + + type + complex + + + title + FFT Plot + + + samp_rate + samp_rate + + + baseband_freq + 0 + + + y_per_div + 10 + + + ref_level + 100 + + + fft_size + 512*2 + + + fft_rate + 15 + + + peak_hold + False + + + average + False + + + avg_alpha + 0 + + + grid_pos + 1, 2, 2, 4 + + + _coordinate + (746, 133) + + + _rotation + 0 + + + + parameter + + id + rx_side + + + _enabled + True + + + label + + + + value + A + + + type + string + + + _coordinate + (568, 382) + + + _rotation + 0 + + + + gr_noise_source_x + + id + gr_noise_source_x + + + _enabled + True + + + type + complex + + + noise_type + gr.GR_GAUSSIAN + + + amp + noise_ampl + + + seed + 42 + + + _coordinate + (276, 312) + + + _rotation + 0 + + + + variable_slider + + id + noise_ampl + + + _enabled + True + + + label + Noise Ampl + + + value + 2000 + + + min + 0 + + + max + 5000 + + + num_steps + 100 + + + style + wx.SL_VERTICAL + + + converver + float_converter + + + grid_pos + 1, 1, 2, 1 + + + _coordinate + (20, 243) + + + _rotation + 0 + + + + variable_slider + + id + tone_ampl + + + _enabled + True + + + label + Tone Ampl + + + value + 5000 + + + min + 0 + + + max + 10e3 + + + num_steps + 100 + + + style + wx.SL_VERTICAL + + + converver + float_converter + + + grid_pos + 1, 0, 2, 1 + + + _coordinate + (28, 437) + + + _rotation + 0 + + + + variable_slider + + id + tone1 + + + _enabled + True + + + label + Tone 1 + + + value + 50e3 + + + min + -samp_rate/2 + + + max + samp_rate/2 + + + num_steps + 100 + + + style + wx.SL_HORIZONTAL + + + converver + float_converter + + + grid_pos + 0, 0, 1, 4 + + + _coordinate + (190, 436) + + + _rotation + 0 + + + + variable_slider + + id + tone2 + + + _enabled + True + + + label + Tone 2 + + + value + 75e3 + + + min + -samp_rate/2 + + + max + samp_rate/2 + + + num_steps + 100 + + + style + wx.SL_HORIZONTAL + + + converver + float_converter + + + grid_pos + 0, 4, 1, 4 + + + _coordinate + (367, 439) + + + _rotation + 0 + + + + options + + id + usrp_two_tone_loopback + + + _enabled + True + + + title + USRP Loopback - 2 Tone + + + author + Example + + + description + Loopback test with basic rx and basic tx + + + window_size + 1280, 1024 + + + generate_options + wx_gui + + + category + Custom + + + realtime_scheduling + + + + _coordinate + (10, 10) + + + _rotation + 0 + + + + gr_sig_source_x + gr_add_xx + 0 + 0 + + + gr_sig_source_x0 + gr_add_xx + 0 + 1 + + + gr_noise_source_x + gr_add_xx + 0 + 2 + + + usrp_simple_source_x + wxgui_fftsink2 + 0 + 0 + + + gr_add_xx + usrp_simple_sink_x + 0 + 0 + + diff --git a/gnuradio-examples/grc/usrp/usrp_wbfm_receive.grc b/gnuradio-examples/grc/usrp/usrp_wbfm_receive.grc new file mode 100644 index 000000000..8f53475ab --- /dev/null +++ b/gnuradio-examples/grc/usrp/usrp_wbfm_receive.grc @@ -0,0 +1,466 @@ + + + Fri Apr 17 19:06:07 2009 + + options + + id + usrp_wbfm_receive + + + _enabled + True + + + title + USRP WBFM Receive + + + author + Example + + + description + WBFM Receive with Basic RX or TV RX + + + window_size + 1280, 1024 + + + generate_options + wx_gui + + + category + Custom + + + realtime_scheduling + + + + _coordinate + (10, 10) + + + _rotation + 0 + + + + variable + + id + decim + + + _enabled + True + + + value + 200 + + + _coordinate + (14, 173) + + + _rotation + 0 + + + + variable_slider + + id + volume + + + _enabled + True + + + label + Volume + + + value + 1 + + + min + 0 + + + max + 10 + + + num_steps + 100 + + + style + wx.SL_HORIZONTAL + + + converver + float_converter + + + grid_pos + 1, 0, 1, 4 + + + _coordinate + (991, 40) + + + _rotation + 0 + + + + usrp_simple_source_x + + id + usrp_simple_source_x + + + _enabled + True + + + type + complex + + + format + + + + which + 0 + + + decimation + decim + + + frequency + (freq+fine)*1e6 + + + gain + 20 + + + side + A + + + rx_ant + None + + + hb_filters + + + + _coordinate + (277, 29) + + + _rotation + 0 + + + + wxgui_fftsink2 + + id + wxgui_fftsink2 + + + _enabled + True + + + type + complex + + + title + FFT Plot + + + samp_rate + 64e6/decim + + + baseband_freq + (freq+fine)*1e6 + + + y_per_div + 10 + + + ref_level + 50 + + + fft_size + 512 + + + fft_rate + 15 + + + peak_hold + False + + + average + False + + + avg_alpha + 0 + + + grid_pos + 2, 0, 2, 4 + + + _coordinate + (512, 191) + + + _rotation + 0 + + + + variable_slider + + id + freq + + + _enabled + True + + + label + Frequency (MHz) + + + value + 100 + + + min + 87.5 + + + max + 108.0 + + + num_steps + 1000 + + + style + wx.SL_HORIZONTAL + + + converver + float_converter + + + grid_pos + 0, 0, 1, 2 + + + _coordinate + (104, 243) + + + _rotation + 0 + + + + variable_slider + + id + fine + + + _enabled + True + + + label + Fine Freq (MHz) + + + value + 0 + + + min + -.1 + + + max + .1 + + + num_steps + 100 + + + style + wx.SL_HORIZONTAL + + + converver + float_converter + + + grid_pos + 0, 2, 1, 2 + + + _coordinate + (275, 246) + + + _rotation + 0 + + + + blks2_wfm_rcv + + id + blks2_wfm_rcv + + + _enabled + True + + + quad_rate + 64e6/decim + + + audio_decimation + 10 + + + _coordinate + (510, 37) + + + _rotation + 0 + + + + gr_multiply_const_vxx + + id + gr_multiply_const_vxx + + + _enabled + True + + + type + float + + + const + volume + + + vlen + 1 + + + _coordinate + (764, 55) + + + _rotation + 0 + + + + audio_sink + + id + audio_sink + + + _enabled + True + + + samp_rate + 32000 + + + device_name + + + + ok_to_block + True + + + num_inputs + 1 + + + _coordinate + (703, 241) + + + _rotation + 180 + + + + usrp_simple_source_x + blks2_wfm_rcv + 0 + 0 + + + usrp_simple_source_x + wxgui_fftsink2 + 0 + 0 + + + blks2_wfm_rcv + gr_multiply_const_vxx + 0 + 0 + + + gr_multiply_const_vxx + audio_sink + 0 + 0 + + diff --git a/gnuradio-examples/grc/xmlrpc/.gitignore b/gnuradio-examples/grc/xmlrpc/.gitignore new file mode 100644 index 000000000..b336cc7ce --- /dev/null +++ b/gnuradio-examples/grc/xmlrpc/.gitignore @@ -0,0 +1,2 @@ +/Makefile +/Makefile.in diff --git a/gnuradio-examples/grc/xmlrpc/readme.txt b/gnuradio-examples/grc/xmlrpc/readme.txt new file mode 100644 index 000000000..c1f87c1cb --- /dev/null +++ b/gnuradio-examples/grc/xmlrpc/readme.txt @@ -0,0 +1,18 @@ +################################################## +# XMLRPC example +################################################## + +XMLRPC allows software to make remote function calls over http. +In the case of GRC, one can use XMLRPC to modify variables in a running flow graph. +See http://www.xmlrpc.com/ + +--- Server Example --- +Place an "XMLRPC Server" block inside of any flow graph. +The server will provide set functions for every variable in the flow graph. +If a variable is called "freq", the server will provide a function set_freq(new_freq). +Run the server example and experiment with the example client script. + +-- Client Example -- +The "XMLRPC Client" block will give a variable control over one remove function. +In the example client, there is one client block and gui control per variable. +This technique can be used to remotely control a flow graph, perhaps running on a non-gui machine. diff --git a/gnuradio-examples/grc/xmlrpc/xmlrpc_client.grc b/gnuradio-examples/grc/xmlrpc/xmlrpc_client.grc new file mode 100644 index 000000000..3bb4e7ed3 --- /dev/null +++ b/gnuradio-examples/grc/xmlrpc/xmlrpc_client.grc @@ -0,0 +1,312 @@ + + + Thu Jul 24 14:27:44 2008 + + options + + id + client_block + + + _enabled + True + + + title + XMLRPC Client + + + author + Example + + + description + example flow graph + + + window_size + 1280, 1024 + + + generate_options + wx_gui + + + category + Custom + + + _coordinate + (10, 10) + + + _rotation + 0 + + + + xmlrpc_client + + id + xmlrpc_client0 + + + _enabled + True + + + addr + localhost + + + port + 1234 + + + callback + set_ampl + + + variable + ampl + + + _coordinate + (409, 35) + + + _rotation + 0 + + + + xmlrpc_client + + id + xmlrpc_client + + + _enabled + True + + + addr + localhost + + + port + 1234 + + + callback + set_freq + + + variable + freq + + + _coordinate + (222, 34) + + + _rotation + 0 + + + + variable_slider + + id + freq + + + _enabled + True + + + label + Frequency (Hz) + + + value + 1000 + + + min + 0 + + + max + 5000 + + + num_steps + 100 + + + slider_type + horizontal + + + grid_pos + 0, 0, 1, 2 + + + _coordinate + (207, 162) + + + _rotation + 0 + + + + variable_slider + + id + ampl + + + _enabled + True + + + label + Amplitude + + + value + 1 + + + min + 0 + + + max + 2 + + + num_steps + 100 + + + slider_type + horizontal + + + grid_pos + 1, 0, 1, 2 + + + _coordinate + (397, 167) + + + _rotation + 0 + + + + variable_chooser + + id + offset + + + _enabled + True + + + label + Offset + + + value_index + 1 + + + choices + [-1, 0, 1] + + + labels + ["neg", "zero", "pos"] + + + chooser_type + radio_buttons_horizontal + + + grid_pos + 2, 0, 1, 2 + + + _coordinate + (596, 177) + + + _rotation + 0 + + + + xmlrpc_client + + id + xmlrpc_client1 + + + _enabled + True + + + addr + localhost + + + port + 1234 + + + callback + set_offset + + + variable + offset*ampl + + + _coordinate + (608, 39) + + + _rotation + 0 + + + + variable + + id + samp_rate + + + _enabled + True + + + value + 32000 + + + _coordinate + (13, 172) + + + _rotation + 0 + + + \ No newline at end of file diff --git a/gnuradio-examples/grc/xmlrpc/xmlrpc_client_script.py b/gnuradio-examples/grc/xmlrpc/xmlrpc_client_script.py new file mode 100644 index 000000000..956fa07fb --- /dev/null +++ b/gnuradio-examples/grc/xmlrpc/xmlrpc_client_script.py @@ -0,0 +1,23 @@ +#!/usr/bin/env python + +import time +import random +import xmlrpclib + +#create server object +s = xmlrpclib.Server("http://localhost:1234") + +#randomly change parameters of the sinusoid +for i in range(10): + #generate random values + new_freq = random.uniform(0, 5000) + new_ampl = random.uniform(0, 2) + new_offset = random.uniform(-1, 1) + #set new values + time.sleep(1) + s.set_freq(new_freq) + time.sleep(1) + s.set_ampl(new_ampl) + time.sleep(1) + s.set_offset(new_offset) + diff --git a/gnuradio-examples/grc/xmlrpc/xmlrpc_server.grc b/gnuradio-examples/grc/xmlrpc/xmlrpc_server.grc new file mode 100644 index 000000000..dc539ef1b --- /dev/null +++ b/gnuradio-examples/grc/xmlrpc/xmlrpc_server.grc @@ -0,0 +1,384 @@ + + + Thu Jul 24 14:27:42 2008 + + options + + id + server_block + + + _enabled + True + + + title + XMLRPC Server + + + author + Example + + + description + example flow graph + + + window_size + 1280, 1024 + + + generate_options + wx_gui + + + category + Custom + + + _coordinate + (10, 10) + + + _rotation + 0 + + + + gr_sig_source_x + + id + gr_sig_source_x + + + _enabled + True + + + type + float + + + samp_rate + samp_rate + + + waveform + gr.GR_COS_WAVE + + + freq + freq + + + amp + ampl + + + offset + offset + + + _coordinate + (162, 200) + + + _rotation + 0 + + + + variable + + id + offset + + + _enabled + True + + + value + 0 + + + _coordinate + (12, 390) + + + _rotation + 0 + + + + xmlrpc_server + + id + xmlrpc_server + + + _enabled + True + + + addr + localhost + + + port + 1234 + + + _coordinate + (395, 240) + + + _rotation + 0 + + + + gr_throttle + + id + gr_throttle + + + _enabled + True + + + type + float + + + samples_per_second + samp_rate + + + vlen + 1 + + + _coordinate + (386, 93) + + + _rotation + 0 + + + + wxgui_scopesink2 + + id + wxgui_scopesink2 + + + _enabled + True + + + type + float + + + title + Scope Plot + + + samp_rate + samp_rate + + + frame_decim + 15 + + + v_scale + 0 + + + t_scale + .001 + + + marker + set_format_line + + + num_inputs + 1 + + + grid_pos + 0, 0, 2, 4 + + + _coordinate + (623, 28) + + + _rotation + 0 + + + + wxgui_fftsink2 + + id + wxgui_fftsink2 + + + _enabled + True + + + type + float + + + title + FFT Plot + + + samp_rate + samp_rate + + + baseband_freq + 0 + + + y_per_div + 10 + + + y_divs + 8 + + + ref_level + 50 + + + fft_size + 512 + + + fft_rate + 15 + + + avg_alpha + 0 + + + average + False + + + peak_hold + False + + + grid_pos + 2, 0, 2, 4 + + + _coordinate + (630, 233) + + + _rotation + 0 + + + + variable + + id + samp_rate + + + _enabled + True + + + value + 32000 + + + _coordinate + (11, 160) + + + _rotation + 0 + + + + variable + + id + freq + + + _enabled + True + + + value + 1000 + + + _coordinate + (11, 237) + + + _rotation + 0 + + + + variable + + id + ampl + + + _enabled + True + + + value + 1 + + + _coordinate + (13, 315) + + + _rotation + 0 + + + + gr_sig_source_x + gr_throttle + 0 + 0 + + + gr_throttle + wxgui_scopesink2 + 0 + 0 + + + gr_throttle + wxgui_fftsink2 + 0 + 0 + + \ No newline at end of file -- cgit From 29fed0b4e92d862f43d75f364aa028b6658e76c3 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Tue, 6 Oct 2009 18:04:38 -0700 Subject: removed unused git ignores --- gnuradio-examples/grc/audio/.gitignore | 2 -- gnuradio-examples/grc/simple/.gitignore | 2 -- gnuradio-examples/grc/trellis/.gitignore | 2 -- gnuradio-examples/grc/usrp/.gitignore | 2 -- gnuradio-examples/grc/xmlrpc/.gitignore | 2 -- 5 files changed, 10 deletions(-) delete mode 100644 gnuradio-examples/grc/audio/.gitignore delete mode 100644 gnuradio-examples/grc/simple/.gitignore delete mode 100644 gnuradio-examples/grc/trellis/.gitignore delete mode 100644 gnuradio-examples/grc/usrp/.gitignore delete mode 100644 gnuradio-examples/grc/xmlrpc/.gitignore (limited to 'gnuradio-examples') diff --git a/gnuradio-examples/grc/audio/.gitignore b/gnuradio-examples/grc/audio/.gitignore deleted file mode 100644 index b336cc7ce..000000000 --- a/gnuradio-examples/grc/audio/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/Makefile -/Makefile.in diff --git a/gnuradio-examples/grc/simple/.gitignore b/gnuradio-examples/grc/simple/.gitignore deleted file mode 100644 index b336cc7ce..000000000 --- a/gnuradio-examples/grc/simple/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/Makefile -/Makefile.in diff --git a/gnuradio-examples/grc/trellis/.gitignore b/gnuradio-examples/grc/trellis/.gitignore deleted file mode 100644 index b336cc7ce..000000000 --- a/gnuradio-examples/grc/trellis/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/Makefile -/Makefile.in diff --git a/gnuradio-examples/grc/usrp/.gitignore b/gnuradio-examples/grc/usrp/.gitignore deleted file mode 100644 index b336cc7ce..000000000 --- a/gnuradio-examples/grc/usrp/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/Makefile -/Makefile.in diff --git a/gnuradio-examples/grc/xmlrpc/.gitignore b/gnuradio-examples/grc/xmlrpc/.gitignore deleted file mode 100644 index b336cc7ce..000000000 --- a/gnuradio-examples/grc/xmlrpc/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/Makefile -/Makefile.in -- cgit