From 5d69a524f81f234b3fbc41d49ba18d6f6886baba Mon Sep 17 00:00:00 2001 From: jcorgan Date: Thu, 3 Aug 2006 04:51:51 +0000 Subject: Houston, we have a trunk. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3122 221aa14e-8319-0410-a670-987f0aec2ac5 --- gnuradio-core/src/lib/general/general.i | 203 ++++++++++++++++++++++++++++++++ 1 file changed, 203 insertions(+) create mode 100644 gnuradio-core/src/lib/general/general.i (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i new file mode 100644 index 000000000..3f410a9ea --- /dev/null +++ b/gnuradio-core/src/lib/general/general.i @@ -0,0 +1,203 @@ +/* -*- c++ -*- */ +/* + * Copyright 2004,2005,2006 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 2, 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., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +%{ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +%} + +%include "gr_sync_block.i" +%include "gr_sync_decimator.i" +%include "gr_sync_interpolator.i" +%include "gr_nop.i" +%include "gr_null_sink.i" +%include "gr_null_source.i" +%include "gr_head.i" +%include "gr_skiphead.i" +%include "gr_sig_source_waveform.h" +%include "gr_noise_type.h" +%include "gr_quadrature_demod_cf.i" +%include "gr_remez.i" +%include "gr_float_to_complex.i" +%include "gr_check_counting_s.i" +%include "gr_lfsr_32k_source_s.i" +%include "gr_check_lfsr_32k_s.i" +%include "gr_stream_to_vector.i" +%include "gr_vector_to_stream.i" +%include "gr_keep_one_in_n.i" +%include "gr_fft_vcc.i" +%include "gr_fft_vfc.i" +%include "gr_float_to_short.i" +%include "gr_float_to_char.i" +%include "gr_float_to_uchar.i" +%include "gr_short_to_float.i" +%include "gr_char_to_float.i" +%include "gr_uchar_to_float.i" +%include "gr_frequency_modulator_fc.i" +%include "gr_phase_modulator_fc.i" +%include "gr_bytes_to_syms.i" +%include "gr_simple_correlator.i" +%include "gr_simple_framer.i" +%include "gr_align_on_samplenumbers_ss.i" +%include "gr_complex_to_xxx.i" +%include "gr_complex_to_interleaved_short.i" +%include "gr_endianness.i" +%include "gr_interleaved_short_to_complex.i" +%include "gr_firdes.i" +%include "gr_interleave.i" +%include "gr_deinterleave.i" +%include "gr_simple_squelch_cc.i" +%include "gr_agc_ff.i" +%include "gr_agc_cc.i" +%include "gr_rms_cf.i" +%include "gr_rms_ff.i" +%include "gr_nlog10_ff.i" +%include "gr_fake_channel_coder_pp.i" +%include "gr_throttle.i" +%include "gr_stream_to_streams.i" +%include "gr_streams_to_stream.i" +%include "gr_streams_to_vector.i" +%include "gr_vector_to_streams.i" +%include "gr_conjugate_cc.i" +%include "gr_vco_f.i" +%include "gr_crc32.i" +%include "gr_threshold_ff.i" +%include "gr_clock_recovery_mm_ff.i" +%include "gr_clock_recovery_mm_cc.i" +%include "gr_dd_mpsk_sync_cc.i" +%include "gr_packet_sink.i" +%include "gr_lms_dfe_cc.i" +%include "gr_lms_dfe_ff.i" +%include "gr_pll_freqdet_cf.i" +%include "gr_pll_refout_cc.i" +%include "gr_pll_carriertracking_cc.i" +%include "gr_probe_avg_mag_sqrd_c.i" +%include "gr_probe_avg_mag_sqrd_f.i" +%include "gr_probe_signal_f.i" +%include "gr_costas_loop_cc.i" +%include "gr_pa_2x2_phase_combiner.i" +%include "gr_kludge_copy.i" +%include "gr_prefs.i" +%include "gr_prefix.i" +%include "gr_test_types.h" +%include "gr_test.i" +%include "gr_unpack_k_bits_bb.i" +%include "gr_correlate_access_code_bb.i" +%include "gr_diff_phasor_cc.i" +%include "gr_constellation_decoder_cb.i" +%include "gr_binary_slicer_fb.i" +%include "gr_diff_encoder_bb.i" +%include "gr_diff_decoder_bb.i" +%include "gr_framer_sink_1.i" +%include "gr_map_bb.i" +%include "gr_feval.i" +%include "gr_pwr_squelch_cc.i" +%include "gr_pwr_squelch_ff.i" +%include "gr_ctcss_squelch_ff.i" + +%include "general_generated.i" -- cgit From 86f5c92427b3f4bb30536d76cf63c3fca388fb2f Mon Sep 17 00:00:00 2001 From: eb Date: Wed, 13 Sep 2006 21:30:04 +0000 Subject: Updated FSF address in all files. Fixes ticket:51 git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3534 221aa14e-8319-0410-a670-987f0aec2ac5 --- gnuradio-core/src/lib/general/general.i | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 3f410a9ea..2247a3e61 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -16,8 +16,8 @@ * * 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., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. */ %{ -- cgit From f1c41f807cb29472d0924149e39d6ec8ad90e6a2 Mon Sep 17 00:00:00 2001 From: eb Date: Wed, 27 Sep 2006 05:14:03 +0000 Subject: Merged changes from eb/digital-wip into trunk. This includes: * renaming gnuradio-examples/python/gmsk2 to gnuradio-examples/python/digital * refactoring the digital data tx and rx test code into benchmark_tx and benchmark_rx. These accept a -m argument. can currently be selected from gmsk, dbpsk, dqpsk * Two new AGC blocks: gr_agc2: separate attack and delay rates; gr_feedforward_agc: FIR-ish compressor. Normalizes to peak envelope. * Working DBPSK mod/demod (works fine) * Working DQPSK mod/demod (works, but still needs more work) git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3662 221aa14e-8319-0410-a670-987f0aec2ac5 --- gnuradio-core/src/lib/general/general.i | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 2247a3e61..691cd8332 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -64,6 +64,8 @@ #include #include #include +#include +#include #include #include #include @@ -109,6 +111,7 @@ #include #include #include +#include %} %include "gr_sync_block.i" @@ -154,6 +157,8 @@ %include "gr_simple_squelch_cc.i" %include "gr_agc_ff.i" %include "gr_agc_cc.i" +%include "gr_agc2_ff.i" +%include "gr_agc2_cc.i" %include "gr_rms_cf.i" %include "gr_rms_ff.i" %include "gr_nlog10_ff.i" @@ -199,5 +204,6 @@ %include "gr_pwr_squelch_cc.i" %include "gr_pwr_squelch_ff.i" %include "gr_ctcss_squelch_ff.i" +%include "gr_feedforward_agc_cc.i" %include "general_generated.i" -- cgit From 2c1032480d2874f38af9b5b9d18e753e968619e5 Mon Sep 17 00:00:00 2001 From: eb Date: Tue, 31 Oct 2006 16:07:47 +0000 Subject: Merged eb/binstats -r3848:3906 into trunk. These changes (1) fix a problem with gr_feval* where when called from a live flowgraph, they resulted in the call back into Python occuring without holding the Global Interpreter Lock causing a SIGSEGV. (2) add gr_bin_statistics_f which combines statistics gathering with a control state machine that allows spectrum sensing or related applications that need to step through the spectrum to be built. (3) usrp_spectrum_sense.py which ties all this together in an application which steps through the spectrum a chunk at a time and gathers statistics. In the current version, the stats are gathered by nothing is done with them. Think of this as the framework for a real application. This code may require tuning of the --tune-delay and --dwell-delay timeouts to ensure that the samples being processed are associated with the given center frequency. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3907 221aa14e-8319-0410-a670-987f0aec2ac5 --- gnuradio-core/src/lib/general/general.i | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 691cd8332..01cadcc0d 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -112,6 +112,7 @@ #include #include #include +#include %} %include "gr_sync_block.i" @@ -205,5 +206,6 @@ %include "gr_pwr_squelch_ff.i" %include "gr_ctcss_squelch_ff.i" %include "gr_feedforward_agc_cc.i" +%include "gr_bin_statistics_f.i" %include "general_generated.i" -- cgit From cbe1628f2eb1a1a3c8b0b96a3b1334a039074def Mon Sep 17 00:00:00 2001 From: eb Date: Sat, 13 Jan 2007 04:14:56 +0000 Subject: SWIG compilation speedup! Fixes ticket:9. Merged -r4203:4254 from eb/swig-split into trunk. This refactors gnuradio_swig_python.{cc,py} into 5 separate .so's These correspond to the runtime, general, filter and io directories, and also includes a new directory, gengen. gengen contains that part of general that was machine generated. This split is arbitrary, but was useful for getting size of the swig generated glue code for general down to about 2MB. In addition, the swig glue is now compiled with -g1 -O1 instead of -g -O2. With this change all the swig code now compiles in about 60% of the time that it used to take. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@4255 221aa14e-8319-0410-a670-987f0aec2ac5 --- gnuradio-core/src/lib/general/general.i | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 01cadcc0d..1bf752998 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -22,15 +22,12 @@ %{ -#include -#include -#include #include #include #include #include #include -#include +#include #include #include #include @@ -115,15 +112,11 @@ #include %} -%include "gr_sync_block.i" -%include "gr_sync_decimator.i" -%include "gr_sync_interpolator.i" %include "gr_nop.i" %include "gr_null_sink.i" %include "gr_null_source.i" %include "gr_head.i" %include "gr_skiphead.i" -%include "gr_sig_source_waveform.h" %include "gr_noise_type.h" %include "gr_quadrature_demod_cf.i" %include "gr_remez.i" @@ -207,5 +200,3 @@ %include "gr_ctcss_squelch_ff.i" %include "gr_feedforward_agc_cc.i" %include "gr_bin_statistics_f.i" - -%include "general_generated.i" -- cgit From 01eb527e0c1f445fab7c7cef039ba623e93f8c7c Mon Sep 17 00:00:00 2001 From: eb Date: Tue, 16 Jan 2007 17:57:28 +0000 Subject: fixed problem with gr_noise_source_* caused by splitting gnuradio_swig_python git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@4280 221aa14e-8319-0410-a670-987f0aec2ac5 --- gnuradio-core/src/lib/general/general.i | 2 -- 1 file changed, 2 deletions(-) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 1bf752998..fe3ccacdf 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include @@ -117,7 +116,6 @@ %include "gr_null_source.i" %include "gr_head.i" %include "gr_skiphead.i" -%include "gr_noise_type.h" %include "gr_quadrature_demod_cf.i" %include "gr_remez.i" %include "gr_float_to_complex.i" -- cgit From a39870d9fc9c4c7b6b8f9ae5de3286c5362470f7 Mon Sep 17 00:00:00 2001 From: jcorgan Date: Fri, 23 Feb 2007 18:27:17 +0000 Subject: Merged r4605:4612 from jcorgan/glfsr branch into trunk. Implements Galois LFSR source block of degree 1 through 32. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@4613 221aa14e-8319-0410-a670-987f0aec2ac5 --- gnuradio-core/src/lib/general/general.i | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index fe3ccacdf..b659beb52 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -109,6 +109,7 @@ #include #include #include +#include %} %include "gr_nop.i" @@ -198,3 +199,4 @@ %include "gr_ctcss_squelch_ff.i" %include "gr_feedforward_agc_cc.i" %include "gr_bin_statistics_f.i" +%include "gr_glfsr_source_b.i" -- cgit From 28e086141aead2e43f958f0ae14d58cac557fa2d Mon Sep 17 00:00:00 2001 From: trondeau Date: Wed, 7 Mar 2007 04:31:19 +0000 Subject: merged trondeau/digital-wip2 r4193:4730 into trunk - improves digital receiver and fixes ticket:72 git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@4731 221aa14e-8319-0410-a670-987f0aec2ac5 --- gnuradio-core/src/lib/general/general.i | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index b659beb52..87368f81e 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -67,6 +67,7 @@ #include #include #include +#include #include #include #include @@ -157,6 +158,7 @@ %include "gr_nlog10_ff.i" %include "gr_fake_channel_coder_pp.i" %include "gr_throttle.i" +%include "gr_mpsk_receiver_cc.i" %include "gr_stream_to_streams.i" %include "gr_streams_to_stream.i" %include "gr_streams_to_vector.i" -- cgit From bae47cc41eda30e96de5e6d640f467760ae05c23 Mon Sep 17 00:00:00 2001 From: jcorgan Date: Tue, 3 Apr 2007 20:11:05 +0000 Subject: Merged r4767:4859 from developer branch jcorgan/channel, passes distcheck. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@4860 221aa14e-8319-0410-a670-987f0aec2ac5 --- gnuradio-core/src/lib/general/general.i | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 87368f81e..2c915b602 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -85,6 +85,7 @@ #include #include #include +#include #include #include #include @@ -111,6 +112,7 @@ #include #include #include +#include %} %include "gr_nop.i" @@ -176,6 +178,7 @@ %include "gr_pll_freqdet_cf.i" %include "gr_pll_refout_cc.i" %include "gr_pll_carriertracking_cc.i" +%include "gr_pn_correlator_cc.i" %include "gr_probe_avg_mag_sqrd_c.i" %include "gr_probe_avg_mag_sqrd_f.i" %include "gr_probe_signal_f.i" @@ -202,3 +205,4 @@ %include "gr_feedforward_agc_cc.i" %include "gr_bin_statistics_f.i" %include "gr_glfsr_source_b.i" +%include "gr_glfsr_source_f.i" -- cgit From 43819f0f33498239970b4479684f12aa080859e6 Mon Sep 17 00:00:00 2001 From: jcorgan Date: Thu, 26 Apr 2007 22:51:48 +0000 Subject: Merged r4518:5130 from developer branch n4hy/ofdm into trunk, passes distcheck. Adds incomplete OFDM implementation, further work to be completed in the features/ofdm branch. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@5131 221aa14e-8319-0410-a670-987f0aec2ac5 --- gnuradio-core/src/lib/general/general.i | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 2c915b602..c49a01222 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004,2005,2006 Free Software Foundation, Inc. + * Copyright 2004,2005,2006,2007 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -57,6 +57,7 @@ #include #include #include +#include #include #include #include @@ -68,6 +69,7 @@ #include #include #include +#include #include #include #include @@ -82,6 +84,7 @@ #include #include #include +#include #include #include #include @@ -89,6 +92,11 @@ #include #include #include +#include +#include +#include +#include +#include #include #include #include @@ -150,6 +158,7 @@ %include "gr_firdes.i" %include "gr_interleave.i" %include "gr_deinterleave.i" +%include "gr_delay.i" %include "gr_simple_squelch_cc.i" %include "gr_agc_ff.i" %include "gr_agc_cc.i" @@ -161,6 +170,7 @@ %include "gr_fake_channel_coder_pp.i" %include "gr_throttle.i" %include "gr_mpsk_receiver_cc.i" +%include "gr_stream_mux.i" %include "gr_stream_to_streams.i" %include "gr_streams_to_stream.i" %include "gr_streams_to_vector.i" @@ -175,6 +185,7 @@ %include "gr_packet_sink.i" %include "gr_lms_dfe_cc.i" %include "gr_lms_dfe_ff.i" +%include "gr_dpll_ff.i" %include "gr_pll_freqdet_cf.i" %include "gr_pll_refout_cc.i" %include "gr_pll_carriertracking_cc.i" @@ -182,6 +193,11 @@ %include "gr_probe_avg_mag_sqrd_c.i" %include "gr_probe_avg_mag_sqrd_f.i" %include "gr_probe_signal_f.i" +%include "gr_ofdm_correlator.i" +%include "gr_ofdm_cyclic_prefixer.i" +%include "gr_ofdm_bpsk_demapper.i" +%include "gr_ofdm_bpsk_mapper.i" +%include "gr_ofdm_sampler.i" %include "gr_costas_loop_cc.i" %include "gr_pa_2x2_phase_combiner.i" %include "gr_kludge_copy.i" -- cgit From c95b26a7d8f04140d2371c075016c39c45b92580 Mon Sep 17 00:00:00 2001 From: jcorgan Date: Sat, 12 May 2007 23:50:46 +0000 Subject: Added ability to log receive path power to file in digital examples. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@5461 221aa14e-8319-0410-a670-987f0aec2ac5 --- gnuradio-core/src/lib/general/general.i | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index c49a01222..64144a05a 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -90,6 +90,7 @@ #include #include #include +#include #include #include #include @@ -191,6 +192,7 @@ %include "gr_pll_carriertracking_cc.i" %include "gr_pn_correlator_cc.i" %include "gr_probe_avg_mag_sqrd_c.i" +%include "gr_probe_avg_mag_sqrd_cf.i" %include "gr_probe_avg_mag_sqrd_f.i" %include "gr_probe_signal_f.i" %include "gr_ofdm_correlator.i" -- cgit From c7dbfcc7d78275f76d8c2a8ef21e3100721874be Mon Sep 17 00:00:00 2001 From: trondeau Date: Mon, 4 Jun 2007 16:08:44 +0000 Subject: merge ordm/receiver branch -r5574:5659. Reworks OFDM receiver with refactored OFDM blocks. A few bug fixes for other blocks have also been slipped in. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@5661 221aa14e-8319-0410-a670-987f0aec2ac5 --- gnuradio-core/src/lib/general/general.i | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 64144a05a..1fdb4239a 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -84,7 +84,7 @@ #include #include #include -#include +#include #include #include #include @@ -97,6 +97,7 @@ #include #include #include +#include #include #include #include @@ -186,7 +187,7 @@ %include "gr_packet_sink.i" %include "gr_lms_dfe_cc.i" %include "gr_lms_dfe_ff.i" -%include "gr_dpll_ff.i" +%include "gr_dpll_bb.i" %include "gr_pll_freqdet_cf.i" %include "gr_pll_refout_cc.i" %include "gr_pll_carriertracking_cc.i" @@ -199,6 +200,7 @@ %include "gr_ofdm_cyclic_prefixer.i" %include "gr_ofdm_bpsk_demapper.i" %include "gr_ofdm_bpsk_mapper.i" +%include "gr_ofdm_frame_sink.i" %include "gr_ofdm_sampler.i" %include "gr_costas_loop_cc.i" %include "gr_pa_2x2_phase_combiner.i" -- cgit From a663f5b481679d8a352c668825cee92f548f3fcc Mon Sep 17 00:00:00 2001 From: trondeau Date: Sun, 10 Jun 2007 18:16:11 +0000 Subject: Merging OFDM features branch r5661:5759 into trunk. OFDM works over the air with BPSK and QPSK modulations on subcarriers. Passes make distcheck. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@5761 221aa14e-8319-0410-a670-987f0aec2ac5 --- gnuradio-core/src/lib/general/general.i | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 1fdb4239a..b362d24d0 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -97,8 +97,12 @@ #include #include #include +#include +#include #include +#include #include +#include #include #include #include @@ -200,8 +204,12 @@ %include "gr_ofdm_cyclic_prefixer.i" %include "gr_ofdm_bpsk_demapper.i" %include "gr_ofdm_bpsk_mapper.i" +%include "gr_ofdm_qpsk_mapper.i" +%include "gr_ofdm_qam_mapper.i" %include "gr_ofdm_frame_sink.i" +%include "gr_ofdm_insert_preamble.i" %include "gr_ofdm_sampler.i" +%include "gr_regenerate_bb.i" %include "gr_costas_loop_cc.i" %include "gr_pa_2x2_phase_combiner.i" %include "gr_kludge_copy.i" -- cgit From 937b719d2e57d0497293d603da10cac2532346f6 Mon Sep 17 00:00:00 2001 From: eb Date: Sat, 21 Jul 2007 03:44:38 +0000 Subject: Updated license from GPL version 2 or later to GPL version 3 or later. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@6044 221aa14e-8319-0410-a670-987f0aec2ac5 --- gnuradio-core/src/lib/general/general.i | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index b362d24d0..a6a356f4e 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -6,7 +6,7 @@ * * 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 2, or (at your option) + * 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, -- cgit From 9967e2e7664dbc96a5d1587c194cc648d01cf487 Mon Sep 17 00:00:00 2001 From: trondeau Date: Sat, 4 Aug 2007 15:21:34 +0000 Subject: merged -r5966:6112 on trondeau/ofdm_mod. Allows for generic constellations (supports bpsk, qpsk, 8psk, qam16, qam64, and qam256 currently), fixes some bugs in the correlation and altered default parameters for over-the-air operation. This merge fixes ticket:156 and ticket:157. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@6113 221aa14e-8319-0410-a670-987f0aec2ac5 --- gnuradio-core/src/lib/general/general.i | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index a6a356f4e..e9780ea13 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -96,6 +96,7 @@ #include #include #include +#include #include #include #include @@ -203,6 +204,7 @@ %include "gr_ofdm_correlator.i" %include "gr_ofdm_cyclic_prefixer.i" %include "gr_ofdm_bpsk_demapper.i" +%include "gr_ofdm_mapper_bcv.i" %include "gr_ofdm_bpsk_mapper.i" %include "gr_ofdm_qpsk_mapper.i" %include "gr_ofdm_qam_mapper.i" -- cgit From ce16514534e5d7ebbc4fe46e2b09a25ccc5fdafd Mon Sep 17 00:00:00 2001 From: trondeau Date: Wed, 2 Jan 2008 17:35:35 +0000 Subject: Merging ofdm2 branch -r7047:7321 into trunk. This updates the OFDM code to hier_block2 in blks2impl and removed from blksimpl. The new code implements a decision feedback sync loop to lock the phase/freq, removes two unnecessary premables and performs frame sync and equalization off single preamble symbol. Also adds/updates Python plotting tools and a branchless clip algorithm in gr_math.h. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@7324 221aa14e-8319-0410-a670-987f0aec2ac5 --- gnuradio-core/src/lib/general/general.i | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index e9780ea13..0eab24f1a 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -93,7 +93,7 @@ #include #include #include -#include +#include #include #include #include @@ -128,6 +128,7 @@ #include #include #include +#include %} %include "gr_nop.i" @@ -201,7 +202,7 @@ %include "gr_probe_avg_mag_sqrd_cf.i" %include "gr_probe_avg_mag_sqrd_f.i" %include "gr_probe_signal_f.i" -%include "gr_ofdm_correlator.i" +%include "gr_ofdm_frame_acquisition.i" %include "gr_ofdm_cyclic_prefixer.i" %include "gr_ofdm_bpsk_demapper.i" %include "gr_ofdm_mapper_bcv.i" @@ -236,3 +237,4 @@ %include "gr_bin_statistics_f.i" %include "gr_glfsr_source_b.i" %include "gr_glfsr_source_f.i" +%include "gr_peak_detector2_fb.i" -- cgit From c989df7703fb0c2869dc1de7e18df311e2bf626a Mon Sep 17 00:00:00 2001 From: jcorgan Date: Fri, 11 Apr 2008 21:31:25 +0000 Subject: Adds gr.repeat(), an interpolating block to repeat a sample N times on the output. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@8186 221aa14e-8319-0410-a670-987f0aec2ac5 --- gnuradio-core/src/lib/general/general.i | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 0eab24f1a..64aa2d889 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -129,6 +129,7 @@ #include #include #include +#include %} %include "gr_nop.i" @@ -238,3 +239,4 @@ %include "gr_glfsr_source_b.i" %include "gr_glfsr_source_f.i" %include "gr_peak_detector2_fb.i" +%include "gr_repeat.i" -- cgit From ccea950c146d2f724fb37f18e27fc2857d191cfe Mon Sep 17 00:00:00 2001 From: jcorgan Date: Sat, 12 Apr 2008 20:03:11 +0000 Subject: Addes gr.cpfsk_bc(), a continuous phase frequency shift keying modulator block. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@8193 221aa14e-8319-0410-a670-987f0aec2ac5 --- gnuradio-core/src/lib/general/general.i | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 64aa2d889..724ea0316 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004,2005,2006,2007 Free Software Foundation, Inc. + * Copyright 2004,2005,2006,2007,2008 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -130,6 +130,7 @@ #include #include #include +#include %} %include "gr_nop.i" @@ -240,3 +241,4 @@ %include "gr_glfsr_source_f.i" %include "gr_peak_detector2_fb.i" %include "gr_repeat.i" +%include "gr_cpfsk_bc.i" -- cgit From a52f9a19581901beabc9111917965b9817231014 Mon Sep 17 00:00:00 2001 From: jcorgan Date: Tue, 15 Apr 2008 21:31:29 +0000 Subject: Merged r8195:8205 from jcorgan/ecc into trunk. Adds convolutional encoder and decoder corresponding to the R=1/2, K=7 CCSDS standard ("Voyager"). This code is a GNU Radio wrapper around a 1995-era KA9Q portable-C implementation, and is designed for continuous streaming data, not packets. The encoder takes MSB packed bytes and outputs channel symbols 0 or 1. The decoder uses soft-decision Viterbi decoding on a floating point stream of (possibly noise corrupted) [1.0, 1.0] symbols, and outputs MSB packed decoded bytes. Benchmarking on a 2.16 GHz Intel Core 2 Duo shows 4.7 Mbps decoding rate at 100% CPU usage (single core). (There is a newer KA9Q library that implements SIMD speed ups with correspondingly faster performance.) The KA9Q library is placed into src/lib/viterbi. It could use some cleanup, file/function renaming, and refactoring, or even replacement with the newer libfec code that is available. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@8206 221aa14e-8319-0410-a670-987f0aec2ac5 --- gnuradio-core/src/lib/general/general.i | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 724ea0316..21bbdb2c5 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -131,6 +131,8 @@ #include #include #include +#include +#include %} %include "gr_nop.i" @@ -242,3 +244,5 @@ %include "gr_peak_detector2_fb.i" %include "gr_repeat.i" %include "gr_cpfsk_bc.i" +%include "gr_encode_ccsds_27_bb.i" +%include "gr_decode_ccsds_27_fb.i" -- cgit From 231f1bcb9aa9f431a61869c9f2c5b6194b4768b9 Mon Sep 17 00:00:00 2001 From: trondeau Date: Mon, 8 Sep 2008 03:43:36 +0000 Subject: merging branch -r9485:9498 to fix some warnings. This merge removes some of the old OFDM mappers that were specific to BPSK, QPSK, and QAM constellations. These were never really used and should not be. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9531 221aa14e-8319-0410-a670-987f0aec2ac5 --- gnuradio-core/src/lib/general/general.i | 8 -------- 1 file changed, 8 deletions(-) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 21bbdb2c5..435271f79 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -95,11 +95,7 @@ #include #include #include -#include #include -#include -#include -#include #include #include #include @@ -208,11 +204,7 @@ %include "gr_probe_signal_f.i" %include "gr_ofdm_frame_acquisition.i" %include "gr_ofdm_cyclic_prefixer.i" -%include "gr_ofdm_bpsk_demapper.i" %include "gr_ofdm_mapper_bcv.i" -%include "gr_ofdm_bpsk_mapper.i" -%include "gr_ofdm_qpsk_mapper.i" -%include "gr_ofdm_qam_mapper.i" %include "gr_ofdm_frame_sink.i" %include "gr_ofdm_insert_preamble.i" %include "gr_ofdm_sampler.i" -- cgit From c4763fb9f73df6832a015d84111cd2573a7b9bc6 Mon Sep 17 00:00:00 2001 From: jcorgan Date: Fri, 12 Sep 2008 02:54:22 +0000 Subject: Merged -r9556:9560 from jcorgan/scr into trunk. Adds gr.scrambler_bb and gr.descrambler_bb, using updated gri_lfsr. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9561 221aa14e-8319-0410-a670-987f0aec2ac5 --- gnuradio-core/src/lib/general/general.i | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 435271f79..8326b27b0 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -129,6 +129,8 @@ #include #include #include +#include +#include %} %include "gr_nop.i" @@ -238,3 +240,5 @@ %include "gr_cpfsk_bc.i" %include "gr_encode_ccsds_27_bb.i" %include "gr_decode_ccsds_27_fb.i" +%include "gr_descrambler_bb.i" +%include "gr_scrambler_bb.i" -- cgit From c4b73c460d21b3f0f6c608d38144eb7ae09c43ae Mon Sep 17 00:00:00 2001 From: jcorgan Date: Sat, 13 Sep 2008 23:43:19 +0000 Subject: Merged r9564:9568 from jcorgan/bert into trunk. Adds BPSK bit error testing examples and support blocks. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9569 221aa14e-8319-0410-a670-987f0aec2ac5 --- gnuradio-core/src/lib/general/general.i | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 8326b27b0..542bf6064 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -131,6 +131,8 @@ #include #include #include +#include +#include %} %include "gr_nop.i" @@ -242,3 +244,5 @@ %include "gr_decode_ccsds_27_fb.i" %include "gr_descrambler_bb.i" %include "gr_scrambler_bb.i" +%include "gr_probe_mpsk_snr_c.i" +%include "gr_probe_density_b.i" -- cgit From 8b9d8612e3e32a8037782e027690e14b29254335 Mon Sep 17 00:00:00 2001 From: eb Date: Mon, 27 Oct 2008 07:05:13 +0000 Subject: Added basic wavelet classifier blocks. GSL is now a prerequisite for gnuradio-core. Merged from eb/frank -r9627:9868 to trunk. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9870 221aa14e-8319-0410-a670-987f0aec2ac5 --- gnuradio-core/src/lib/general/general.i | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 542bf6064..e7d9e978e 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -133,6 +133,12 @@ #include #include #include +#include +#include +#include +#include +#include + %} %include "gr_nop.i" @@ -246,3 +252,8 @@ %include "gr_scrambler_bb.i" %include "gr_probe_mpsk_snr_c.i" %include "gr_probe_density_b.i" +%include "gr_rail_ff.i" +%include "gr_squash_ff.i" +%include "gr_stretch_ff.i" +%include "gr_wavelet_ff.i" +%include "gr_wvps_ff.i" -- cgit From 58bd4ceaee4884652a682297a49957137cafa56d Mon Sep 17 00:00:00 2001 From: n4hy Date: Wed, 15 Apr 2009 02:21:52 +0000 Subject: new fm detector added based on FIR derivative detector. Stereo sep better than pll based one and more efficient. Tweaking probably needed, usrp_wfm_rcv_fmdet added to demo git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10847 221aa14e-8319-0410-a670-987f0aec2ac5 --- gnuradio-core/src/lib/general/general.i | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index e7d9e978e..0cb54870e 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -85,6 +85,7 @@ #include #include #include +#include #include #include #include @@ -204,6 +205,7 @@ %include "gr_lms_dfe_cc.i" %include "gr_lms_dfe_ff.i" %include "gr_dpll_bb.i" +%include "gr_fmdet_cf.i" %include "gr_pll_freqdet_cf.i" %include "gr_pll_refout_cc.i" %include "gr_pll_carriertracking_cc.i" -- cgit From 3b0db38361d6ff50d62d814e72eb1fdd0e5d762d Mon Sep 17 00:00:00 2001 From: jcorgan Date: Sat, 11 Jul 2009 02:34:31 +0000 Subject: Implements ticket:401 and ticket:402. Adds several API functions to determine build constants at runtime, and a convenience command line program to display them: From C++: const std::string gr_prefix(); const std::string gr_sysconfdir(); const std::string gr_prefsdir(); const std::string gr_build_date(); const std::string gr_svn_date(); const std::string gr_svn_version(); const std::string gr_version(); From Python: gr.prefix() gr.sysconfdir() gr.prefsdir() gr.build_date() gr.svn_date() gr.svn_version() gr.version() The new binary is 'gnuradio' and installed on the path: $ gnuradio Program options: gnuradio [options]: -h [ --help ] print help message --prefix print gnuradio installation prefix --sysconfdir print gnuradio system configuration directory --prefsdir print gnuradio preferences directory --builddate print gnuradio build date (RFC2822 format) -v [ --version ] print gnuradio version --svnversion print SVN repository version (SVN format) --svndate print SVN repository date $ git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11418 221aa14e-8319-0410-a670-987f0aec2ac5 --- gnuradio-core/src/lib/general/general.i | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 0cb54870e..0684e63a5 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -105,7 +105,7 @@ #include #include #include -#include +#include #include #include #include @@ -225,7 +225,7 @@ %include "gr_pa_2x2_phase_combiner.i" %include "gr_kludge_copy.i" %include "gr_prefs.i" -%include "gr_prefix.i" +%include "gr_constants.i" %include "gr_test_types.h" %include "gr_test.i" %include "gr_unpack_k_bits_bb.i" -- cgit From 075cdb9903a47bec0695e996e44e017a7d3720e7 Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Thu, 8 Oct 2009 20:53:16 -0700 Subject: Added gr.copy(itemsize) block set_enabled(bool) will either copy from input to output (True) or drop the input on the floor (False). --- gnuradio-core/src/lib/general/general.i | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 0684e63a5..e1161c8eb 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004,2005,2006,2007,2008 Free Software Foundation, Inc. + * Copyright 2004,2005,2006,2007,2008,2009 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -139,7 +139,7 @@ #include #include #include - +#include %} %include "gr_nop.i" @@ -259,3 +259,4 @@ %include "gr_stretch_ff.i" %include "gr_wavelet_ff.i" %include "gr_wvps_ff.i" +%include "gr_copy.i" -- cgit From 691209a1fd00052002af42d79d7a8aff56b7df27 Mon Sep 17 00:00:00 2001 From: Tom Date: Wed, 9 Dec 2009 23:58:17 -0500 Subject: Adding a band-edge based frequency lock loop. --- gnuradio-core/src/lib/general/general.i | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index e1161c8eb..2c26b59cd 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -140,6 +140,7 @@ #include #include #include +#include %} %include "gr_nop.i" @@ -260,3 +261,4 @@ %include "gr_wavelet_ff.i" %include "gr_wvps_ff.i" %include "gr_copy.i" +%include "gr_fll_band_edge_cc.i" -- cgit From 1ae689ff9238dcffbf65881b8ca03aa8df3844aa Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Sun, 21 Mar 2010 16:17:15 -0700 Subject: Add new block gr.additive_scrambler_bb() This block performs scrambling by XORing the input sequence with the output of an LFSR. Repeating this operation restores the original sequence. (This differs from gr.scrambler_bb(), which convolves the input sequence with the LFSR output.) The additive scrambler allows an optional bit count after which the LFSR is reset to its initial seed. This allows use with, e.g., packetized fixed length payloads. --- gnuradio-core/src/lib/general/general.i | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 2c26b59cd..6929f1e6e 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -141,6 +141,7 @@ #include #include #include +#include %} %include "gr_nop.i" @@ -262,3 +263,4 @@ %include "gr_wvps_ff.i" %include "gr_copy.i" %include "gr_fll_band_edge_cc.i" +%include "gr_additive_scrambler_bb.i" -- cgit From fefb71787e7e365049743f210b18a6f04f13d47b Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Tue, 18 May 2010 13:22:29 -0700 Subject: gnuradio-core: removed gr.dd_mpsk_sync_cc block as obsolete --- gnuradio-core/src/lib/general/general.i | 2 -- 1 file changed, 2 deletions(-) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 6929f1e6e..68cafce2e 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -80,7 +80,6 @@ #include #include #include -#include #include #include #include @@ -202,7 +201,6 @@ %include "gr_threshold_ff.i" %include "gr_clock_recovery_mm_ff.i" %include "gr_clock_recovery_mm_cc.i" -%include "gr_dd_mpsk_sync_cc.i" %include "gr_packet_sink.i" %include "gr_lms_dfe_cc.i" %include "gr_lms_dfe_ff.i" -- cgit From 8579841a28eb07fdfc72cb9bb594f76e71465902 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Fri, 29 Oct 2010 03:56:17 -0700 Subject: Remove duplicate include of gr_endianness.i from general.i --- gnuradio-core/src/lib/general/general.i | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 68cafce2e..3ad40b218 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -53,7 +53,7 @@ #include #include #include -#include +//#include #include #include #include @@ -173,7 +173,7 @@ %include "gr_align_on_samplenumbers_ss.i" %include "gr_complex_to_xxx.i" %include "gr_complex_to_interleaved_short.i" -%include "gr_endianness.i" +//%include "gr_endianness.i" %include "gr_interleaved_short_to_complex.i" %include "gr_firdes.i" %include "gr_interleave.i" -- cgit From 9aaf98cff5e03ec2821da492f3857780a767258f Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Thu, 11 Nov 2010 15:55:04 -0500 Subject: Renaming random_annotator to annotator_1toall that moves tags from single input to all outputs. --- gnuradio-core/src/lib/general/general.i | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 68cafce2e..0dce5f68d 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -141,6 +141,8 @@ #include #include #include +#include +#include %} %include "gr_nop.i" @@ -262,3 +264,5 @@ %include "gr_copy.i" %include "gr_fll_band_edge_cc.i" %include "gr_additive_scrambler_bb.i" +%include "gr_annotator_1toall.i" +%include "gr_annotator_1to1.i" -- cgit From 7ca96ad8b48b3426b470e87042c8e982664f3b9b Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Sat, 13 Nov 2010 14:26:39 -0500 Subject: Renamed annotator block that goes all-to-all now so that it can take in arbitrary number of inputs and pass tags on that way. --- gnuradio-core/src/lib/general/general.i | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 0dce5f68d..400f0b9b6 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -141,7 +141,7 @@ #include #include #include -#include +#include #include %} @@ -264,5 +264,5 @@ %include "gr_copy.i" %include "gr_fll_band_edge_cc.i" %include "gr_additive_scrambler_bb.i" -%include "gr_annotator_1toall.i" +%include "gr_annotator_alltoall.i" %include "gr_annotator_1to1.i" -- cgit From f2d5299a3f7dd5baa795a27c2864b2cfe67edb37 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Sun, 14 Nov 2010 13:26:59 -0800 Subject: Add tests that show that vector> is not working... --- gnuradio-core/src/lib/general/general.i | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 3ad40b218..2c86a6240 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -141,6 +141,7 @@ #include #include #include +#include %} %include "gr_nop.i" @@ -262,3 +263,4 @@ %include "gr_copy.i" %include "gr_fll_band_edge_cc.i" %include "gr_additive_scrambler_bb.i" +%include "complex_vec_test.i" -- cgit From e6751f477ba006923e9f0d2454ff870c52a6f0a5 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Tue, 16 Nov 2010 22:32:46 -0800 Subject: Adding a burst tagger that creates a tag when a signal is observed on line 1. --- gnuradio-core/src/lib/general/general.i | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 400f0b9b6..0f8b57a44 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -143,6 +143,7 @@ #include #include #include +#include %} %include "gr_nop.i" @@ -266,3 +267,4 @@ %include "gr_additive_scrambler_bb.i" %include "gr_annotator_alltoall.i" %include "gr_annotator_1to1.i" +%include "gr_burst_tagger.i" -- cgit From 144ef2dbe12de3f1f784fb2e76771b1e174deb41 Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Thu, 9 Dec 2010 13:54:22 +0100 Subject: All CPM stuff included (C++/GRC/Python), tests pass --- gnuradio-core/src/lib/general/general.i | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 68cafce2e..8c7f31c62 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004,2005,2006,2007,2008,2009 Free Software Foundation, Inc. + * Copyright 2004,2005,2006,2007,2008,2009,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -141,6 +141,7 @@ #include #include #include +#include %} %include "gr_nop.i" @@ -262,3 +263,4 @@ %include "gr_copy.i" %include "gr_fll_band_edge_cc.i" %include "gr_additive_scrambler_bb.i" +%include "gr_cpm.i" -- cgit From 2863f40d5d0bca8713252bb3618f9844fccf673c Mon Sep 17 00:00:00 2001 From: Ben Reynwar Date: Thu, 9 Dec 2010 15:12:14 -0700 Subject: Added support for modulation/demodulation of a generic constellation. Not yet robust enough. Inefficient QAM modulation/demodulation also added (via the generic implementation). --- gnuradio-core/src/lib/general/general.i | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 68cafce2e..f758211cc 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -69,6 +69,7 @@ #include #include #include +#include #include #include #include @@ -190,6 +191,7 @@ %include "gr_fake_channel_coder_pp.i" %include "gr_throttle.i" %include "gr_mpsk_receiver_cc.i" +%include "gr_constellation_receiver_cb.i" %include "gr_stream_mux.i" %include "gr_stream_to_streams.i" %include "gr_streams_to_stream.i" -- cgit From 493cd2e48eee4850f2ceef20c9dd487b93ea6b9e Mon Sep 17 00:00:00 2001 From: Ben Reynwar Date: Sat, 1 Jan 2011 15:31:55 -0700 Subject: Worked on generic demodulation. --- gnuradio-core/src/lib/general/general.i | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index f758211cc..47cc3b7fa 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -70,6 +70,7 @@ #include #include #include +#include #include #include #include @@ -192,6 +193,7 @@ %include "gr_throttle.i" %include "gr_mpsk_receiver_cc.i" %include "gr_constellation_receiver_cb.i" +%include "gr_constellation.i" %include "gr_stream_mux.i" %include "gr_stream_to_streams.i" %include "gr_streams_to_stream.i" -- cgit From 8f81162fbd94c708e71caf2f402588db4d1d82c6 Mon Sep 17 00:00:00 2001 From: Ben Reynwar Date: Sun, 30 Jan 2011 21:58:09 -0700 Subject: Added ofdm_frame_sink2. Like ofdm_frame_sink but uses constellation object. --- gnuradio-core/src/lib/general/general.i | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 7e845cb21..aa7d95ff2 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -99,6 +99,7 @@ #include #include #include +#include #include #include #include @@ -226,6 +227,7 @@ %include "gr_ofdm_cyclic_prefixer.i" %include "gr_ofdm_mapper_bcv.i" %include "gr_ofdm_frame_sink.i" +%include "gr_ofdm_frame_sink2.i" %include "gr_ofdm_insert_preamble.i" %include "gr_ofdm_sampler.i" %include "gr_regenerate_bb.i" -- cgit From 0c7d7678defe24eb2a20ef6726c9aa57cf012d38 Mon Sep 17 00:00:00 2001 From: Ben Reynwar Date: Sun, 13 Feb 2011 19:39:50 -0700 Subject: Added gr_constellation_decoder2_cb block. --- gnuradio-core/src/lib/general/general.i | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index aa7d95ff2..dddda60af 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -114,6 +114,7 @@ #include #include #include +#include #include #include #include @@ -242,6 +243,7 @@ %include "gr_correlate_access_code_bb.i" %include "gr_diff_phasor_cc.i" %include "gr_constellation_decoder_cb.i" +%include "gr_constellation_decoder2_cb.i" %include "gr_binary_slicer_fb.i" %include "gr_diff_encoder_bb.i" %include "gr_diff_decoder_bb.i" -- cgit From e36dc98e5f5aa82b146007c0379b6e55eca40578 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Thu, 7 Apr 2011 11:09:51 -0400 Subject: core: adding a type converter - int -> float. --- gnuradio-core/src/lib/general/general.i | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index fb9c4c0f2..e8a18ab19 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -42,6 +42,7 @@ #include #include #include +#include #include #include #include @@ -167,6 +168,7 @@ %include "gr_float_to_char.i" %include "gr_float_to_uchar.i" %include "gr_short_to_float.i" +%include "gr_int_to_float.i" %include "gr_char_to_float.i" %include "gr_uchar_to_float.i" %include "gr_frequency_modulator_fc.i" -- cgit From c6d7be41abc63a9e5b52a12ef05d578f09797054 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Fri, 8 Apr 2011 21:44:52 -0400 Subject: gr-digital: updating build for consetellation object move. --- gnuradio-core/src/lib/general/general.i | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index d9648ef64..5a5534129 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -70,8 +70,6 @@ #include #include #include -#include -#include #include #include #include @@ -100,7 +98,7 @@ #include #include #include -#include + //#include #include #include #include @@ -115,7 +113,6 @@ #include #include #include -#include #include #include #include @@ -200,8 +197,6 @@ %include "gr_fake_channel_coder_pp.i" %include "gr_throttle.i" %include "gr_mpsk_receiver_cc.i" -%include "gr_constellation_receiver_cb.i" -%include "gr_constellation.i" %include "gr_stream_mux.i" %include "gr_stream_to_streams.i" %include "gr_streams_to_stream.i" @@ -230,7 +225,7 @@ %include "gr_ofdm_cyclic_prefixer.i" %include "gr_ofdm_mapper_bcv.i" %include "gr_ofdm_frame_sink.i" -%include "gr_ofdm_frame_sink2.i" + //%include "gr_ofdm_frame_sink2.i" %include "gr_ofdm_insert_preamble.i" %include "gr_ofdm_sampler.i" %include "gr_regenerate_bb.i" @@ -245,7 +240,6 @@ %include "gr_correlate_access_code_bb.i" %include "gr_diff_phasor_cc.i" %include "gr_constellation_decoder_cb.i" -%include "gr_constellation_decoder2_cb.i" %include "gr_binary_slicer_fb.i" %include "gr_diff_encoder_bb.i" %include "gr_diff_decoder_bb.i" -- cgit From 3f94d49bae62301349f31959c34c690b5c47fc2b Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Tue, 19 Jul 2011 21:30:19 -0400 Subject: digital: moved gr_binary_slicer_fb to digital_binary_slicer_fb and added QA code. Removed constellation_decoder and everything that dependedon it. Must switch everything to digital_constellation_decoder now. Also moved gmsk to gr-digital. Make check passes. --- gnuradio-core/src/lib/general/general.i | 4 ---- 1 file changed, 4 deletions(-) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 5a5534129..0dde39a66 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -112,8 +112,6 @@ #include #include #include -#include -#include #include #include #include @@ -239,8 +237,6 @@ %include "gr_unpack_k_bits_bb.i" %include "gr_correlate_access_code_bb.i" %include "gr_diff_phasor_cc.i" -%include "gr_constellation_decoder_cb.i" -%include "gr_binary_slicer_fb.i" %include "gr_diff_encoder_bb.i" %include "gr_diff_decoder_bb.i" %include "gr_framer_sink_1.i" -- cgit From 7b54b63c58dd4474a3f8192b43f0799447f79ee8 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Tue, 19 Jul 2011 22:07:27 -0400 Subject: digital: moved clock_recovery_ff/cc to gr-digital. --- gnuradio-core/src/lib/general/general.i | 4 ---- 1 file changed, 4 deletions(-) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 0dde39a66..7b735f2db 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -79,8 +79,6 @@ #include #include #include -#include -#include #include #include #include @@ -204,8 +202,6 @@ %include "gr_vco_f.i" %include "gr_crc32.i" %include "gr_threshold_ff.i" -%include "gr_clock_recovery_mm_ff.i" -%include "gr_clock_recovery_mm_cc.i" %include "gr_packet_sink.i" %include "gr_lms_dfe_cc.i" %include "gr_lms_dfe_ff.i" -- cgit From 059720cc223e839ffa411a5974dcdec2b631ffe1 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Tue, 19 Jul 2011 23:34:49 -0400 Subject: digital: removed gr_costas_loop from gnuradio-core that is replaced in gr-digital. --- gnuradio-core/src/lib/general/general.i | 2 -- 1 file changed, 2 deletions(-) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 7b735f2db..1c3ebeae4 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -100,7 +100,6 @@ #include #include #include -#include #include #include #include @@ -223,7 +222,6 @@ %include "gr_ofdm_insert_preamble.i" %include "gr_ofdm_sampler.i" %include "gr_regenerate_bb.i" -%include "gr_costas_loop_cc.i" %include "gr_pa_2x2_phase_combiner.i" %include "gr_kludge_copy.i" %include "gr_prefs.i" -- cgit From f7185e3468e7d24b8f726dd717157cf2fed4b19a Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Wed, 20 Jul 2011 21:35:31 -0400 Subject: digital: removed LMS and CMA equalizers from core that are supplanted in gr-digital. --- gnuradio-core/src/lib/general/general.i | 4 ---- 1 file changed, 4 deletions(-) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 1c3ebeae4..37e304481 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -80,8 +80,6 @@ #include #include #include -#include -#include #include #include #include @@ -202,8 +200,6 @@ %include "gr_crc32.i" %include "gr_threshold_ff.i" %include "gr_packet_sink.i" -%include "gr_lms_dfe_cc.i" -%include "gr_lms_dfe_ff.i" %include "gr_dpll_bb.i" %include "gr_fmdet_cf.i" %include "gr_pll_freqdet_cf.i" -- cgit From a444c2a5cf19333f981d007be7f6ecb96f85bb6a Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Thu, 21 Jul 2011 23:35:03 -0400 Subject: digital: moving correlate_access_code to gr-digital. --- gnuradio-core/src/lib/general/general.i | 2 -- 1 file changed, 2 deletions(-) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 37e304481..d4bad60b8 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -105,7 +105,6 @@ #include #include #include -#include #include #include #include @@ -225,7 +224,6 @@ %include "gr_test_types.h" %include "gr_test.i" %include "gr_unpack_k_bits_bb.i" -%include "gr_correlate_access_code_bb.i" %include "gr_diff_phasor_cc.i" %include "gr_diff_encoder_bb.i" %include "gr_diff_decoder_bb.i" -- cgit From 1cb52da49230c64c3719b4ab944ba1cf5a9abb92 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Sun, 24 Jul 2011 13:25:27 -0400 Subject: digital: moved CRC32 from gnuradio-core to gr-digital. Also added QA code for it. --- gnuradio-core/src/lib/general/general.i | 2 -- 1 file changed, 2 deletions(-) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index d4bad60b8..d10b6ecfb 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -77,7 +77,6 @@ #include #include #include -#include #include #include #include @@ -196,7 +195,6 @@ %include "gr_vector_to_streams.i" %include "gr_conjugate_cc.i" %include "gr_vco_f.i" -%include "gr_crc32.i" %include "gr_threshold_ff.i" %include "gr_packet_sink.i" %include "gr_dpll_bb.i" -- cgit From 58915e7c595b8acf4cc33ca1ff4c04fa2522ba10 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Sun, 24 Jul 2011 14:26:07 -0400 Subject: digital: moving mpsk_receiver from gnuradio-core to gr-digital. Added QA code for it. --- gnuradio-core/src/lib/general/general.i | 2 -- 1 file changed, 2 deletions(-) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index d10b6ecfb..c43622400 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -69,7 +69,6 @@ #include #include #include -#include #include #include #include @@ -187,7 +186,6 @@ %include "gr_nlog10_ff.i" %include "gr_fake_channel_coder_pp.i" %include "gr_throttle.i" -%include "gr_mpsk_receiver_cc.i" %include "gr_stream_mux.i" %include "gr_stream_to_streams.i" %include "gr_streams_to_stream.i" -- cgit From 0eb52f1683ea6c5869e1c8141a3f756e1dc8997a Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Sat, 30 Jul 2011 12:40:03 -0400 Subject: digital: moved fll_band_edge out of gnruadio-core. --- gnuradio-core/src/lib/general/general.i | 2 -- 1 file changed, 2 deletions(-) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index c43622400..08b5ad98c 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -131,7 +131,6 @@ #include #include #include -#include #include #include #include @@ -248,7 +247,6 @@ %include "gr_wavelet_ff.i" %include "gr_wvps_ff.i" %include "gr_copy.i" -%include "gr_fll_band_edge_cc.i" %include "gr_additive_scrambler_bb.i" %include "complex_vec_test.i" %include "gr_annotator_alltoall.i" -- cgit From 6bd1605b265b5dff8cbdca0b20b0c5685c752ec7 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Sun, 14 Aug 2011 22:05:48 -0400 Subject: Adding a control_loop class that takes care of setting the loop gains and the standard loop advance function. This should be used as a parent class of any block that uses a 2nd order control loop (like the PLL, clock recovery, etc blocks). --- gnuradio-core/src/lib/general/general.i | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 08b5ad98c..f9adff3fa 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -22,6 +22,7 @@ %{ +#include #include #include #include @@ -138,6 +139,7 @@ #include %} +%include "gri_control_loop.i" %include "gr_nop.i" %include "gr_null_sink.i" %include "gr_null_source.i" -- cgit From ba176952d750565b55112310b4d22820bbfc04f9 Mon Sep 17 00:00:00 2001 From: Nick Foster Date: Mon, 25 Jul 2011 18:48:36 -0700 Subject: Add gr_correlate_access_code_tag_bb, issues tags instead of annotating samples correlate_access_code_tag_bb: modified to account for correlator lag. --- gnuradio-core/src/lib/general/general.i | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index e8a18ab19..fd158cd1f 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -146,6 +146,7 @@ #include #include #include +#include %} %include "gr_nop.i" @@ -272,3 +273,4 @@ %include "gr_annotator_alltoall.i" %include "gr_annotator_1to1.i" %include "gr_burst_tagger.i" +%include "gr_correlate_access_code_tag_bb.i" -- cgit From 60b3bd32aa145522a1eaf9978e594ed13b9a6bc5 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Wed, 12 Oct 2011 19:02:47 -0400 Subject: digital: moved over all c++ blocks to gr-digital. Benchmark tx/rx still working. --- gnuradio-core/src/lib/general/general.i | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 107f5c9ea..3e9a01a66 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -89,13 +89,6 @@ #include #include #include -#include -#include -#include -#include - //#include -#include -#include #include #include #include @@ -208,13 +201,6 @@ %include "gr_probe_avg_mag_sqrd_cf.i" %include "gr_probe_avg_mag_sqrd_f.i" %include "gr_probe_signal_f.i" -%include "gr_ofdm_frame_acquisition.i" -%include "gr_ofdm_cyclic_prefixer.i" -%include "gr_ofdm_mapper_bcv.i" -%include "gr_ofdm_frame_sink.i" - //%include "gr_ofdm_frame_sink2.i" -%include "gr_ofdm_insert_preamble.i" -%include "gr_ofdm_sampler.i" %include "gr_regenerate_bb.i" %include "gr_pa_2x2_phase_combiner.i" %include "gr_kludge_copy.i" -- cgit From f76eab20ff3811690f5dcbaa04d2c4e41f4b298b Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Tue, 18 Oct 2011 16:16:04 -0700 Subject: added transcendental block from jblum/transcendental (reworked for master branch). --- gnuradio-core/src/lib/general/general.i | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index fd158cd1f..beedeb0a9 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -69,6 +69,7 @@ #include #include #include +#include #include #include #include @@ -196,6 +197,7 @@ %include "gr_nlog10_ff.i" %include "gr_fake_channel_coder_pp.i" %include "gr_throttle.i" +%include "gr_transcendental.i" %include "gr_mpsk_receiver_cc.i" %include "gr_stream_mux.i" %include "gr_stream_to_streams.i" -- cgit From 7112e308a6b0b84387c73460c4c8d1e8ff9f3b5a Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Sun, 23 Oct 2011 17:12:32 -0400 Subject: core: Added type conversion int->float (issue #192). Added with a gri file and also added a gri file for float->int to perform function inside gr_float_to_int. Also added QA code for the new block. --- gnuradio-core/src/lib/general/general.i | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 0a3200741..5a701bf80 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include @@ -152,6 +153,7 @@ %include "gr_keep_one_in_n.i" %include "gr_fft_vcc.i" %include "gr_fft_vfc.i" +%include "gr_float_to_int.i" %include "gr_float_to_short.i" %include "gr_float_to_char.i" %include "gr_float_to_uchar.i" -- cgit From f6075ca94945510eddc5581b552f5e61ce1d0c46 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Sat, 28 Jan 2012 19:25:41 -0500 Subject: core: more type converters in Volk; adding char_to_short converter. --- gnuradio-core/src/lib/general/general.i | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 5a701bf80..ec90e40e5 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -44,8 +44,10 @@ #include #include #include +#include #include #include +#include #include #include #include @@ -104,6 +106,7 @@ #include #include #include +#include #include #include #include @@ -158,8 +161,10 @@ %include "gr_float_to_char.i" %include "gr_float_to_uchar.i" %include "gr_short_to_float.i" +%include "gr_short_to_char.i" %include "gr_int_to_float.i" %include "gr_char_to_float.i" +%include "gr_char_to_short.i" %include "gr_uchar_to_float.i" %include "gr_frequency_modulator_fc.i" %include "gr_phase_modulator_fc.i" @@ -218,6 +223,7 @@ %include "gr_diff_decoder_bb.i" %include "gr_framer_sink_1.i" %include "gr_map_bb.i" +%include "gr_multiply_cc.i" %include "gr_feval.i" %include "gr_pwr_squelch_cc.i" %include "gr_pwr_squelch_ff.i" -- cgit From e8089db25b2e28824f11d27c9d98a4adef191736 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Thu, 2 Feb 2012 16:36:47 -0500 Subject: core: moving multiply_cc and multiply_const_cc out of gengen and into general so they can make use of volk calls. QA code now explicitly tests the cc versions of these blocks. --- gnuradio-core/src/lib/general/general.i | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index ec90e40e5..7de13258e 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -107,6 +107,7 @@ #include #include #include +#include #include #include #include @@ -224,6 +225,7 @@ %include "gr_framer_sink_1.i" %include "gr_map_bb.i" %include "gr_multiply_cc.i" +%include "gr_multiply_const_cc.i" %include "gr_feval.i" %include "gr_pwr_squelch_cc.i" %include "gr_pwr_squelch_ff.i" -- cgit From ae663decab658be25ac01072fa2f5c8454bd6167 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Thu, 2 Feb 2012 17:26:39 -0500 Subject: core: moving multiply_const_ff from gengen to general to take advantage of volk. Also adds SSE and AVX and unaligned Volk versions for this. --- gnuradio-core/src/lib/general/general.i | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 7de13258e..ac3fef84c 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -108,6 +108,7 @@ #include #include #include +#include #include #include #include @@ -226,6 +227,7 @@ %include "gr_map_bb.i" %include "gr_multiply_cc.i" %include "gr_multiply_const_cc.i" +%include "gr_multiply_const_ff.i" %include "gr_feval.i" %include "gr_pwr_squelch_cc.i" %include "gr_pwr_squelch_ff.i" -- cgit From 47c390286d49e00498a3443a3dcb9f83d11c7ecc Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Sat, 4 Feb 2012 11:05:25 -0500 Subject: core: new multiply_const_ff and multiply_ff blocks done using Volk. --- gnuradio-core/src/lib/general/general.i | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index ac3fef84c..8e1be02f9 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -107,6 +107,7 @@ #include #include #include +#include #include #include #include @@ -226,6 +227,7 @@ %include "gr_framer_sink_1.i" %include "gr_map_bb.i" %include "gr_multiply_cc.i" +%include "gr_multiply_ff.i" %include "gr_multiply_const_cc.i" %include "gr_multiply_const_ff.i" %include "gr_feval.i" -- cgit From fb2a84add9706a046b4761021707d6bb97496a2e Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Mon, 6 Feb 2012 10:32:18 -0500 Subject: core: added volk version of add_ff. --- gnuradio-core/src/lib/general/general.i | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 8e1be02f9..c384ecfbb 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -140,6 +140,7 @@ #include #include #include +#include %} %include "gri_control_loop.i" @@ -260,3 +261,4 @@ %include "gr_burst_tagger.i" %include "gr_cpm.i" %include "gr_correlate_access_code_tag_bb.i" +%include "gr_add_ff.i" -- cgit From f34b496341ceb73baffee6f8bf84ed197ffeeaf0 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Mon, 6 Feb 2012 22:02:56 -0500 Subject: core: added Volk-optimized gr_multiply_conjugate_cc at one block with QA code. --- gnuradio-core/src/lib/general/general.i | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index c384ecfbb..89738b01a 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -110,6 +110,7 @@ #include #include #include +#include #include #include #include @@ -231,6 +232,7 @@ %include "gr_multiply_ff.i" %include "gr_multiply_const_cc.i" %include "gr_multiply_const_ff.i" +%include "gr_multiply_conjugate_cc.i" %include "gr_feval.i" %include "gr_pwr_squelch_cc.i" %include "gr_pwr_squelch_ff.i" -- cgit From b872e23b66b70784c38ecb78f606420c459e36db Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Tue, 13 Mar 2012 10:28:57 -0400 Subject: core: adding new probe_signal from gengen into autotools build. --- gnuradio-core/src/lib/general/general.i | 2 -- 1 file changed, 2 deletions(-) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 5a701bf80..f921a59cc 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -90,7 +90,6 @@ #include #include #include -#include #include #include #include @@ -204,7 +203,6 @@ %include "gr_probe_avg_mag_sqrd_c.i" %include "gr_probe_avg_mag_sqrd_cf.i" %include "gr_probe_avg_mag_sqrd_f.i" -%include "gr_probe_signal_f.i" %include "gr_regenerate_bb.i" %include "gr_pa_2x2_phase_combiner.i" %include "gr_kludge_copy.i" -- cgit From f9b73b1710f19529b99f8f69c8e3a06839ad68bc Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Sun, 1 Apr 2012 13:23:06 -0700 Subject: wavelet: move wavelet blocks to new top-level component --- gnuradio-core/src/lib/general/general.i | 6 ------ 1 file changed, 6 deletions(-) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index fcf60c927..bf8bc163f 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -128,10 +128,7 @@ #include #include #include -#include #include -#include -#include #include #include #include @@ -249,10 +246,7 @@ %include "gr_probe_mpsk_snr_c.i" %include "gr_probe_density_b.i" %include "gr_rail_ff.i" -%include "gr_squash_ff.i" %include "gr_stretch_ff.i" -%include "gr_wavelet_ff.i" -%include "gr_wvps_ff.i" %include "gr_copy.i" %include "gr_additive_scrambler_bb.i" %include "complex_vec_test.i" -- cgit From 5b11e7e7f69ef1ebe34c24c6a97da0450ab2e419 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Thu, 5 Apr 2012 13:10:01 -0400 Subject: core: removing old MPSK SNR probe; replaced in gr-digital. --- gnuradio-core/src/lib/general/general.i | 2 -- 1 file changed, 2 deletions(-) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index bf8bc163f..f7759c614 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -125,7 +125,6 @@ #include #include #include -#include #include #include #include @@ -243,7 +242,6 @@ %include "gr_decode_ccsds_27_fb.i" %include "gr_descrambler_bb.i" %include "gr_scrambler_bb.i" -%include "gr_probe_mpsk_snr_c.i" %include "gr_probe_density_b.i" %include "gr_rail_ff.i" %include "gr_stretch_ff.i" -- cgit From f919f9dcbb54a08e6e26d6c229ce92fb784fa1b2 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Fri, 13 Apr 2012 18:36:53 -0400 Subject: 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. --- gnuradio-core/src/lib/general/general.i | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index f7759c614..cd8c279c9 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2004,2005,2006,2007,2008,2009,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, -- cgit From 30ea41c48215af4c50049aefb4ff0e59f14decfe Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Tue, 17 Apr 2012 22:14:05 -0700 Subject: this is squashed python blocks support --- gnuradio-core/src/lib/general/general.i | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index cd8c279c9..7e4e47d32 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004,2005,2006,2007,2008,2009,2010 Free Software Foundation, Inc. + * Copyright 2004-2012 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -254,3 +254,4 @@ %include "gr_cpm.i" %include "gr_correlate_access_code_tag_bb.i" %include "gr_add_ff.i" +%include "gr_block_gateway.i" -- cgit From ae75ab750c2210a880684c3ce82bc152dd591ab3 Mon Sep 17 00:00:00 2001 From: Ben Reynwar Date: Thu, 17 May 2012 11:37:20 -0700 Subject: gr: Added vector_map block. --- gnuradio-core/src/lib/general/general.i | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index cd8c279c9..54d9a8670 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -137,6 +137,7 @@ #include #include #include +#include %} %include "gri_control_loop.i" @@ -254,3 +255,4 @@ %include "gr_cpm.i" %include "gr_correlate_access_code_tag_bb.i" %include "gr_add_ff.i" +%include "gr_vector_map.i" -- cgit From f2ab263b6fc9c24adc88fb55f2c210dd88e9345a Mon Sep 17 00:00:00 2001 From: Tim O'Shea Date: Sat, 7 Jan 2012 17:52:31 -0500 Subject: Block Modifications: digital.mpsk_receiver_cc: Set reasonable default parameter values for GRC definition digital.ofdm_insert_preamble: Expose enter_preamble() as public, to allow external state changes Cleanup of incorrect forecast behavior Make the flag port optional, incase external preamble triggers are preferred to in-band gr_vector_source: added set_data( data ) and rewind() public methods gr_head: added set_length(int) method to modify head length New Blocks Added: gr_keep_m_in_n: Allows periodic extraction of M items instead of 1 (in keep_1_in_n) gr_pack_k_bits: Complementary block fo gr_unpack_k_bits gr_vector_insert_x: Complement to the gr_head block, inserts a vector into a stream then becomes a pass through --- gnuradio-core/src/lib/general/general.i | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 54d9a8670..0696addbd 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -100,6 +101,7 @@ #include #include #include +#include #include #include #include @@ -155,6 +157,7 @@ %include "gr_stream_to_vector.i" %include "gr_vector_to_stream.i" %include "gr_keep_one_in_n.i" +%include "gr_keep_m_in_n.i" %include "gr_fft_vcc.i" %include "gr_fft_vfc.i" %include "gr_float_to_int.i" @@ -218,6 +221,7 @@ %include "gr_test_types.h" %include "gr_test.i" %include "gr_unpack_k_bits_bb.i" +%include "gr_pack_k_bits_bb.i" %include "gr_diff_phasor_cc.i" %include "gr_diff_encoder_bb.i" %include "gr_diff_decoder_bb.i" -- cgit From 403103de15cc60e73d38b56cbc16004123eeeda1 Mon Sep 17 00:00:00 2001 From: Tim O'Shea Date: Tue, 12 Jun 2012 17:36:34 -0400 Subject: new block, gr_annotator_raw allows passing a raw pmt k->v pair from outside the flowgraph/python in at exact samples also added GRUEL autogenerated .i files to gnuradio-core-swig include line --- gnuradio-core/src/lib/general/general.i | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 0696addbd..fe2cbdb82 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -135,6 +135,7 @@ #include #include #include +#include #include #include #include @@ -255,6 +256,7 @@ %include "complex_vec_test.i" %include "gr_annotator_alltoall.i" %include "gr_annotator_1to1.i" +%include "gr_annotator_raw.i" %include "gr_burst_tagger.i" %include "gr_cpm.i" %include "gr_correlate_access_code_tag_bb.i" -- cgit From 93a4677fa127317910ec5868cc5e22a52d4d7240 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Fri, 22 Jun 2012 12:30:40 -0400 Subject: core: adds a tag debug sink to display all tags coming into it. This block is meant to help debug applications that use stream tags. --- gnuradio-core/src/lib/general/general.i | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index fe2cbdb82..c0ce65527 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -141,6 +141,7 @@ #include #include #include +#include %} %include "gri_control_loop.i" @@ -262,3 +263,4 @@ %include "gr_correlate_access_code_tag_bb.i" %include "gr_add_ff.i" %include "gr_vector_map.i" +%include "gr_tag_debug.i" -- cgit From 3a142bebafdc018bccc80cf124a375b53db03581 Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Sat, 7 Jul 2012 08:34:38 -0700 Subject: Revert "Merge remote branch 'jblum-github/python_blocks2' into master" This reverts commit f8581fb475267e1a97eaab962e423559fb4bfce2, reversing changes made to 73800434abfb8c6efcf069222b5f0fea9c86870b. --- gnuradio-core/src/lib/general/general.i | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 31acaefb8..c0ce65527 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004-2012 Free Software Foundation, Inc. + * Copyright 2004,2005,2006,2007,2008,2009,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -264,4 +264,3 @@ %include "gr_add_ff.i" %include "gr_vector_map.i" %include "gr_tag_debug.i" -%include "gr_block_gateway.i" -- cgit From 0e2f0c6473530ef6823a27f4f294826c777afe06 Mon Sep 17 00:00:00 2001 From: Tim O'Shea Date: Wed, 29 Aug 2012 20:27:18 -0400 Subject: adding gr_endian_swap block --- gnuradio-core/src/lib/general/general.i | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index c0ce65527..790549c4d 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -60,6 +60,7 @@ #include #include //#include +#include #include #include #include @@ -181,6 +182,7 @@ %include "gr_complex_to_xxx.i" %include "gr_complex_to_interleaved_short.i" //%include "gr_endianness.i" +%include "gr_endian_swap.i" %include "gr_interleaved_short_to_complex.i" %include "gr_firdes.i" %include "gr_interleave.i" -- cgit From 61b99449eeaaebe5ccc10758549add9c9e23f710 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Tue, 27 Nov 2012 17:18:28 -0800 Subject: Revert "Revert "Merge remote branch 'jblum-github/python_blocks2' into master"" This reverts commit 3a142bebafdc018bccc80cf124a375b53db03581. Since updating __init__.py for ticket 181, we should have fixed the same bug that was being seen here. Conflicts: gnuradio-core/src/python/gnuradio/gr/CMakeLists.txt --- gnuradio-core/src/lib/general/general.i | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 790549c4d..e5a9e970d 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004,2005,2006,2007,2008,2009,2010 Free Software Foundation, Inc. + * Copyright 2004-2012 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -266,3 +266,4 @@ %include "gr_add_ff.i" %include "gr_vector_map.i" %include "gr_tag_debug.i" +%include "gr_block_gateway.i" -- cgit From 6cc818260128df57c51a41e4e6aa459de5faf4fe Mon Sep 17 00:00:00 2001 From: Tim O'Shea Date: Fri, 30 Nov 2012 22:31:43 -0800 Subject: core: gr_blocks can now have only message ports with no general_work() * msg only blocks now get thread context * added blocking msg queue delete call * added gr_message_strobe block * added grc definitions for message_debug, message_strobe, pdu_to_tagged_stream, tagged_stream_to_pdu. * allow message fan-in connections in GRC --- gnuradio-core/src/lib/general/general.i | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index e5a9e970d..1446088a2 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -143,6 +143,7 @@ #include #include #include +#include %} %include "gri_control_loop.i" @@ -267,3 +268,4 @@ %include "gr_vector_map.i" %include "gr_tag_debug.i" %include "gr_block_gateway.i" +%include "gr_message_strobe.i" -- cgit From d56898de3f3515b43afd93b56304f9e0b99b13f8 Mon Sep 17 00:00:00 2001 From: Tim O'Shea Date: Thu, 10 Jan 2013 11:39:05 -0500 Subject: core: adding gr_random_pdu message passing block --- gnuradio-core/src/lib/general/general.i | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnuradio-core/src/lib/general/general.i') diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 1446088a2..b727bc8a6 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -70,6 +70,7 @@ #include #include #include +#include #include #include #include @@ -194,6 +195,7 @@ %include "gr_agc_cc.i" %include "gr_agc2_ff.i" %include "gr_agc2_cc.i" +%include "gr_random_pdu.i" %include "gr_rms_cf.i" %include "gr_rms_ff.i" %include "gr_nlog10_ff.i" -- cgit