From 7ed83c72dbd079a50a421661a874c3ac94a34bd6 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Sun, 5 Dec 2010 17:21:07 -0500 Subject: grc: added qtgui support to grc (just added sink) --- grc/blocks/Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'grc/blocks/Makefile.am') diff --git a/grc/blocks/Makefile.am b/grc/blocks/Makefile.am index 18420a013..ea3c94cbe 100644 --- a/grc/blocks/Makefile.am +++ b/grc/blocks/Makefile.am @@ -203,6 +203,7 @@ dist_ourdata_DATA = \ pad_source.xml \ parameter.xml \ probe_function.xml \ + qtgui_sink_x.xml \ random_source_x.xml \ root_raised_cosine_filter.xml \ trellis_encoder_xx.xml \ -- cgit From 9ae8997e5f682bc16e58c0a0bba21794dbd705c5 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Mon, 6 Dec 2010 22:46:39 -0500 Subject: qtgui: created a forms module with a slider and text box, implemented in grc --- grc/blocks/Makefile.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'grc/blocks/Makefile.am') diff --git a/grc/blocks/Makefile.am b/grc/blocks/Makefile.am index ea3c94cbe..56893b46f 100644 --- a/grc/blocks/Makefile.am +++ b/grc/blocks/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2008, 2009 Free Software Foundation, Inc. +# Copyright 2008-2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -203,7 +203,6 @@ dist_ourdata_DATA = \ pad_source.xml \ parameter.xml \ probe_function.xml \ - qtgui_sink_x.xml \ random_source_x.xml \ root_raised_cosine_filter.xml \ trellis_encoder_xx.xml \ -- cgit From f0537a7da4571bd6aaab273a0588eaef04121648 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Fri, 21 Jan 2011 15:20:45 -0800 Subject: grc: moved wxgui blocks and python into gr-wxgui/grc Prefixed wxgui blocks with WX GUI in the block names. Added category to wxgui variables blocks (not in the main block tree.xml) --- grc/blocks/Makefile.am | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'grc/blocks/Makefile.am') diff --git a/grc/blocks/Makefile.am b/grc/blocks/Makefile.am index 56893b46f..40353a1fa 100644 --- a/grc/blocks/Makefile.am +++ b/grc/blocks/Makefile.am @@ -221,20 +221,8 @@ dist_ourdata_DATA = \ usrp_simple_sink_x.xml \ usrp_simple_source_x.xml \ variable.xml \ - variable_check_box.xml \ - variable_chooser.xml \ variable_config.xml \ - variable_slider.xml \ - variable_static_text.xml \ - variable_text_box.xml \ virtual_sink.xml \ virtual_source.xml \ - wxgui_constellationsink2.xml \ - wxgui_fftsink2.xml \ - wxgui_histosink2.xml \ - wxgui_numbersink2.xml \ - wxgui_scopesink2.xml \ - wxgui_termsink.xml \ - wxgui_waterfallsink2.xml \ xmlrpc_client.xml \ xmlrpc_server.xml -- cgit From 47f621a14c9a6e3696155dd5a223da40bcb7721c Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Sun, 27 Feb 2011 23:18:11 -0800 Subject: grc: work on generator for gui flowgraphs to simplify generation generator does not differentiate between notebooks and controls, they are all block, but block are now sorted by variables present in the make also adjusted categories listed in the wx and qt widget related blocks --- grc/blocks/Makefile.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'grc/blocks/Makefile.am') diff --git a/grc/blocks/Makefile.am b/grc/blocks/Makefile.am index 40353a1fa..d9ec0896e 100644 --- a/grc/blocks/Makefile.am +++ b/grc/blocks/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2008-2010 Free Software Foundation, Inc. +# Copyright 2008-2011 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -197,7 +197,6 @@ dist_ourdata_DATA = \ import.xml \ low_pass_filter.xml \ note.xml \ - notebook.xml \ options.xml \ pad_sink.xml \ pad_source.xml \ -- cgit From 7070c10d7ac59adcd597c18ec2c83b1b59ed87e9 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Sun, 6 Mar 2011 11:18:27 -0800 Subject: grc: rework the probe blocks and how they fit into grc Removed the source on all probe blocks. Advertise the probe-able function in the docs. Added missing signal probe block. Removed probe function and variable sink blocks. Removed all supporting grc_gnuradio python files. Added variable_function_probe block that can probe arbitrary functions on a block. All the code needed by the function probe is available is the make tag. To display the value of a probe block, use the variable probe block, and a gui widget. To disply the value of a stream, do the same but use the signal probe block. Simple see :-) If more types other than floats need to be read from the stream, the signal probe should be extended. --- grc/blocks/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'grc/blocks/Makefile.am') diff --git a/grc/blocks/Makefile.am b/grc/blocks/Makefile.am index d9ec0896e..15c641fbc 100644 --- a/grc/blocks/Makefile.am +++ b/grc/blocks/Makefile.am @@ -60,7 +60,6 @@ dist_ourdata_DATA = \ blks2_tcp_sink.xml \ blks2_tcp_source.xml \ blks2_valve.xml \ - blks2_variable_sink_x.xml \ blks2_wfm_rcv.xml \ blks2_wfm_rcv_pll.xml \ blks2_wfm_tx.xml \ @@ -158,6 +157,7 @@ dist_ourdata_DATA = \ gr_probe_avg_mag_sqrd_x.xml \ gr_probe_density_b.xml \ gr_probe_mpsk_snr_c.xml \ + gr_probe_signal_f.xml \ gr_pwr_squelch_xx.xml \ gr_quadrature_demod_cf.xml \ gr_rational_resampler_base_xxx.xml \ @@ -201,7 +201,6 @@ dist_ourdata_DATA = \ pad_sink.xml \ pad_source.xml \ parameter.xml \ - probe_function.xml \ random_source_x.xml \ root_raised_cosine_filter.xml \ trellis_encoder_xx.xml \ @@ -221,6 +220,7 @@ dist_ourdata_DATA = \ usrp_simple_source_x.xml \ variable.xml \ variable_config.xml \ + variable_function_probe.xml \ virtual_sink.xml \ virtual_source.xml \ xmlrpc_client.xml \ -- cgit From 0644b009591f4c63ed05a8095a0c54c1501bac71 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Wed, 9 Mar 2011 11:44:35 -0800 Subject: audio: moved the grc audio blocks into gr-audio dir --- grc/blocks/Makefile.am | 2 -- 1 file changed, 2 deletions(-) (limited to 'grc/blocks/Makefile.am') diff --git a/grc/blocks/Makefile.am b/grc/blocks/Makefile.am index 18420a013..c218a59c2 100644 --- a/grc/blocks/Makefile.am +++ b/grc/blocks/Makefile.am @@ -24,8 +24,6 @@ include $(top_srcdir)/Makefile.common ourdatadir = $(grc_blocksdir) dist_ourdata_DATA = \ block_tree.xml \ - audio_sink.xml \ - audio_source.xml \ band_pass_filter.xml \ band_reject_filter.xml \ blks2_am_demod_cf.xml \ -- cgit From 07bd878bc30f7ab54afc1e2f0055419388c3c992 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Sun, 13 Mar 2011 17:33:33 -0700 Subject: grc: moved all usrp1 and usrp2 stuff out of grc and into gr-usrp*/grc Moved grc xml files, python wrappers (USRP1 only), probe apps + freedesktop files. When the gr-usrp and gr-usrp2 directories are removed, grc will not have to change. Minor change: the freedesktop files are always installed now. This does not mean that they are installed properly with xdg, it just means that the runtime can have access to the icons. --- grc/blocks/Makefile.am | 8 -------- 1 file changed, 8 deletions(-) (limited to 'grc/blocks/Makefile.am') diff --git a/grc/blocks/Makefile.am b/grc/blocks/Makefile.am index 18420a013..517792453 100644 --- a/grc/blocks/Makefile.am +++ b/grc/blocks/Makefile.am @@ -212,14 +212,6 @@ dist_ourdata_DATA = \ trellis_siso_f.xml \ trellis_viterbi_combined_xx.xml \ trellis_viterbi_x.xml \ - usrp2_probe.xml \ - usrp2_sink_xxxx.xml \ - usrp2_source_xxxx.xml \ - usrp_dual_sink_x.xml \ - usrp_dual_source_x.xml \ - usrp_probe.xml \ - usrp_simple_sink_x.xml \ - usrp_simple_source_x.xml \ variable.xml \ variable_check_box.xml \ variable_chooser.xml \ -- cgit From ec0edceb88e9603aedd4f6dd7a8a73702ce59547 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Sat, 9 Apr 2011 14:15:05 -0500 Subject: grc: added int to float support --- grc/blocks/Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'grc/blocks/Makefile.am') diff --git a/grc/blocks/Makefile.am b/grc/blocks/Makefile.am index 6f7802169..fc2d3f161 100644 --- a/grc/blocks/Makefile.am +++ b/grc/blocks/Makefile.am @@ -119,6 +119,7 @@ dist_ourdata_DATA = \ gr_head.xml \ gr_hilbert_fc.xml \ gr_iir_filter_ffd.xml \ + gr_int_to_float.xml \ gr_integrate_xx.xml \ gr_interleave.xml \ gr_interleaved_short_to_complex.xml \ -- cgit From 1046a3301307a2d2d5ab9c3279e78e89519be101 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Tue, 12 Apr 2011 16:24:15 -0400 Subject: Adding GRC block for the PFB synthesis filterbank. --- grc/blocks/Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'grc/blocks/Makefile.am') diff --git a/grc/blocks/Makefile.am b/grc/blocks/Makefile.am index fc2d3f161..d830a1bb4 100644 --- a/grc/blocks/Makefile.am +++ b/grc/blocks/Makefile.am @@ -148,6 +148,7 @@ dist_ourdata_DATA = \ gr_peak_detector2_fb.xml \ gr_peak_detector_xb.xml \ gr_pfb_clock_sync.xml \ + gr_pfb_synthesis_filterbank.xml \ gr_phase_modulator_fc.xml \ gr_pll_carriertracking_cc.xml \ gr_pll_freqdet_cf.xml \ -- cgit From 1c6d4023303198397e0a43f2f1c68877903f3b2f Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Tue, 12 Apr 2011 16:30:46 -0400 Subject: Adding GRC block for the PFB channelizer filterbank. --- grc/blocks/Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'grc/blocks/Makefile.am') diff --git a/grc/blocks/Makefile.am b/grc/blocks/Makefile.am index d830a1bb4..81eb81182 100644 --- a/grc/blocks/Makefile.am +++ b/grc/blocks/Makefile.am @@ -48,6 +48,7 @@ dist_ourdata_DATA = \ blks2_packet_decoder.xml \ blks2_packet_encoder.xml \ blks2_pfb_arb_resampler.xml \ + blks2_pfb_channelizer.xml \ blks2_qamx_demod.xml \ blks2_qamx_mod.xml \ blks2_rational_resampler_xxx.xml \ -- cgit