diff options
| -rw-r--r-- | gnuradio-core/src/lib/general/Makefile.am | 3 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/general/general.i | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/general/general_generated.i | 20 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/gengen/.gitignore | 30 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/gengen/Makefile.am | 6 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/gengen/Makefile.gen | 30 | ||||
| -rwxr-xr-x | gnuradio-core/src/lib/gengen/generate_common.py | 6 | ||||
| -rw-r--r-- | gnuradio-core/src/python/gnuradio/gr/Makefile.am | 1 |
8 files changed, 92 insertions, 6 deletions
diff --git a/gnuradio-core/src/lib/general/Makefile.am b/gnuradio-core/src/lib/general/Makefile.am index 0122932cf..9de229896 100644 --- a/gnuradio-core/src/lib/general/Makefile.am +++ b/gnuradio-core/src/lib/general/Makefile.am @@ -110,7 +110,6 @@ libgeneral_la_SOURCES = \ gr_probe_avg_mag_sqrd_c.cc \ gr_probe_avg_mag_sqrd_cf.cc \ gr_probe_avg_mag_sqrd_f.cc \ - gr_probe_signal_f.cc \ gr_pwr_squelch_cc.cc \ gr_pwr_squelch_ff.cc \ gr_quadrature_demod_cf.cc \ @@ -264,7 +263,6 @@ grinclude_HEADERS = \ gr_probe_avg_mag_sqrd_c.h \ gr_probe_avg_mag_sqrd_cf.h \ gr_probe_avg_mag_sqrd_f.h \ - gr_probe_signal_f.h \ gr_pwr_squelch_cc.h \ gr_pwr_squelch_ff.h \ gr_quadrature_demod_cf.h \ @@ -420,7 +418,6 @@ swiginclude_HEADERS = \ gr_probe_avg_mag_sqrd_c.i \ gr_probe_avg_mag_sqrd_cf.i \ gr_probe_avg_mag_sqrd_f.i \ - gr_probe_signal_f.i \ gr_pwr_squelch_cc.i \ gr_pwr_squelch_ff.i \ gr_quadrature_demod_cf.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 <gr_probe_avg_mag_sqrd_c.h> #include <gr_probe_avg_mag_sqrd_cf.h> #include <gr_probe_avg_mag_sqrd_f.h> -#include <gr_probe_signal_f.h> #include <gr_regenerate_bb.h> #include <gr_pa_2x2_phase_combiner.h> #include <gr_kludge_copy.h> @@ -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" diff --git a/gnuradio-core/src/lib/general/general_generated.i b/gnuradio-core/src/lib/general/general_generated.i index a41f30a3d..6b597d7e6 100644 --- a/gnuradio-core/src/lib/general/general_generated.i +++ b/gnuradio-core/src/lib/general/general_generated.i @@ -56,6 +56,16 @@ #include <gr_packed_to_unpacked_bb.h> #include <gr_packed_to_unpacked_ii.h> #include <gr_packed_to_unpacked_ss.h> +#include <gr_probe_signal_b.h> +#include <gr_probe_signal_s.h> +#include <gr_probe_signal_i.h> +#include <gr_probe_signal_f.h> +#include <gr_probe_signal_c.h> +#include <gr_probe_signal_vb.h> +#include <gr_probe_signal_vs.h> +#include <gr_probe_signal_vi.h> +#include <gr_probe_signal_vf.h> +#include <gr_probe_signal_vc.h> #include <gr_sig_source_c.h> #include <gr_sig_source_f.h> #include <gr_sig_source_i.h> @@ -133,6 +143,16 @@ %include <gr_packed_to_unpacked_bb.i> %include <gr_packed_to_unpacked_ii.i> %include <gr_packed_to_unpacked_ss.i> +%include <gr_probe_signal_b.i> +%include <gr_probe_signal_s.i> +%include <gr_probe_signal_i.i> +%include <gr_probe_signal_f.i> +%include <gr_probe_signal_c.i> +%include <gr_probe_signal_vb.i> +%include <gr_probe_signal_vs.i> +%include <gr_probe_signal_vi.i> +%include <gr_probe_signal_vf.i> +%include <gr_probe_signal_vc.i> %include <gr_sig_source_c.i> %include <gr_sig_source_f.i> %include <gr_sig_source_i.i> diff --git a/gnuradio-core/src/lib/gengen/.gitignore b/gnuradio-core/src/lib/gengen/.gitignore index ecd4cb0d5..1d9731ed7 100644 --- a/gnuradio-core/src/lib/gengen/.gitignore +++ b/gnuradio-core/src/lib/gengen/.gitignore @@ -308,6 +308,36 @@ /gr_peak_detector_ss.h /gr_peak_detector_ss.i /gr_prefix.cc +/gr_probe_signal_b.cc +/gr_probe_signal_b.h +/gr_probe_signal_b.i +/gr_probe_signal_s.cc +/gr_probe_signal_s.h +/gr_probe_signal_s.i +/gr_probe_signal_i.cc +/gr_probe_signal_i.h +/gr_probe_signal_i.i +/gr_probe_signal_f.cc +/gr_probe_signal_f.h +/gr_probe_signal_f.i +/gr_probe_signal_c.cc +/gr_probe_signal_c.h +/gr_probe_signal_c.i +/gr_probe_signal_vb.cc +/gr_probe_signal_vb.h +/gr_probe_signal_vb.i +/gr_probe_signal_vs.cc +/gr_probe_signal_vs.h +/gr_probe_signal_vs.i +/gr_probe_signal_vi.cc +/gr_probe_signal_vi.h +/gr_probe_signal_vi.i +/gr_probe_signal_vf.cc +/gr_probe_signal_vf.h +/gr_probe_signal_vf.i +/gr_probe_signal_vc.cc +/gr_probe_signal_vc.h +/gr_probe_signal_vc.i /gr_sample_and_hold_bb.cc /gr_sample_and_hold_bb.h /gr_sample_and_hold_bb.i diff --git a/gnuradio-core/src/lib/gengen/Makefile.am b/gnuradio-core/src/lib/gengen/Makefile.am index 5fbb6f52c..e2f65c5da 100644 --- a/gnuradio-core/src/lib/gengen/Makefile.am +++ b/gnuradio-core/src/lib/gengen/Makefile.am @@ -77,6 +77,12 @@ core_generator = \ gr_peak_detector_XX.cc.t \ gr_peak_detector_XX.h.t \ gr_peak_detector_XX.i.t \ + gr_probe_signal_X.cc.t \ + gr_probe_signal_X.h.t \ + gr_probe_signal_X.i.t \ + gr_probe_signal_vX.cc.t \ + gr_probe_signal_vX.h.t \ + gr_probe_signal_vX.i.t \ gr_sample_and_hold_XX.cc.t \ gr_sample_and_hold_XX.h.t \ gr_sample_and_hold_XX.i.t \ diff --git a/gnuradio-core/src/lib/gengen/Makefile.gen b/gnuradio-core/src/lib/gengen/Makefile.gen index 1c529803c..06e781372 100644 --- a/gnuradio-core/src/lib/gengen/Makefile.gen +++ b/gnuradio-core/src/lib/gengen/Makefile.gen @@ -77,6 +77,16 @@ GENERATED_H = \ gr_peak_detector_fb.h \ gr_peak_detector_ib.h \ gr_peak_detector_sb.h \ + gr_probe_signal_b.h \ + gr_probe_signal_s.h \ + gr_probe_signal_i.h \ + gr_probe_signal_f.h \ + gr_probe_signal_c.h \ + gr_probe_signal_vb.h \ + gr_probe_signal_vs.h \ + gr_probe_signal_vi.h \ + gr_probe_signal_vf.h \ + gr_probe_signal_vc.h \ gr_sample_and_hold_bb.h \ gr_sample_and_hold_ff.h \ gr_sample_and_hold_ii.h \ @@ -182,6 +192,16 @@ GENERATED_I = \ gr_peak_detector_fb.i \ gr_peak_detector_ib.i \ gr_peak_detector_sb.i \ + gr_probe_signal_b.i \ + gr_probe_signal_s.i \ + gr_probe_signal_i.i \ + gr_probe_signal_f.i \ + gr_probe_signal_c.i \ + gr_probe_signal_vb.i \ + gr_probe_signal_vs.i \ + gr_probe_signal_vi.i \ + gr_probe_signal_vf.i \ + gr_probe_signal_vc.i \ gr_sample_and_hold_bb.i \ gr_sample_and_hold_ff.i \ gr_sample_and_hold_ii.i \ @@ -287,6 +307,16 @@ GENERATED_CC = \ gr_peak_detector_fb.cc \ gr_peak_detector_ib.cc \ gr_peak_detector_sb.cc \ + gr_probe_signal_b.cc \ + gr_probe_signal_s.cc \ + gr_probe_signal_i.cc \ + gr_probe_signal_f.cc \ + gr_probe_signal_c.cc \ + gr_probe_signal_vb.cc \ + gr_probe_signal_vs.cc \ + gr_probe_signal_vi.cc \ + gr_probe_signal_vf.cc \ + gr_probe_signal_vc.cc \ gr_sample_and_hold_bb.cc \ gr_sample_and_hold_ff.cc \ gr_sample_and_hold_ii.cc \ diff --git a/gnuradio-core/src/lib/gengen/generate_common.py b/gnuradio-core/src/lib/gengen/generate_common.py index 9bd6bcc9c..cfb3d15eb 100755 --- a/gnuradio-core/src/lib/gengen/generate_common.py +++ b/gnuradio-core/src/lib/gengen/generate_common.py @@ -33,7 +33,9 @@ ss_roots = [ 'gr_vector_source_X', 'gr_vector_sink_X', 'gr_noise_source_X', - 'gr_sig_source_X' + 'gr_sig_source_X', + 'gr_probe_signal_X', + 'gr_probe_signal_vX' ] # regular blocks @@ -83,6 +85,8 @@ def generate (): expand_h_cc_i ('gr_add_const_XX', 'sf') # for MC4020 expand_h_cc_i ('gr_vector_sink_X', 'b') expand_h_cc_i ('gr_vector_source_X', 'b') + expand_h_cc_i ('gr_probe_signal_X', 'b') + expand_h_cc_i ('gr_probe_signal_vX', 'b') for r in ss_roots: for s in ss_signatures: expand_h_cc_i (r, s) diff --git a/gnuradio-core/src/python/gnuradio/gr/Makefile.am b/gnuradio-core/src/python/gnuradio/gr/Makefile.am index f5af80c78..4871290b3 100644 --- a/gnuradio-core/src/python/gnuradio/gr/Makefile.am +++ b/gnuradio-core/src/python/gnuradio/gr/Makefile.am @@ -86,6 +86,7 @@ noinst_PYTHON = \ qa_pll_freqdet.py \ qa_pll_refout.py \ qa_pn_correlator_cc.py \ + qa_probe_signal.py \ qa_rational_resampler.py \ qa_sig_source.py \ qa_single_pole_iir.py \ |