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/block_tree.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'grc/blocks/block_tree.xml') diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml index 610a88102..644841884 100644 --- a/grc/blocks/block_tree.xml +++ b/grc/blocks/block_tree.xml @@ -47,6 +47,7 @@ wxgui_waterfallsink2 wxgui_histosink2 wxgui_termsink + qtgui_sink_x Operators -- 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/block_tree.xml | 5 ----- 1 file changed, 5 deletions(-) (limited to 'grc/blocks/block_tree.xml') diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml index 644841884..782d6ca9b 100644 --- a/grc/blocks/block_tree.xml +++ b/grc/blocks/block_tree.xml @@ -286,11 +286,6 @@ Variables variable - variable_slider - variable_chooser - variable_check_box - variable_text_box - variable_static_text variable_config parameter -- 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/block_tree.xml | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'grc/blocks/block_tree.xml') diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml index 782d6ca9b..50c463f55 100644 --- a/grc/blocks/block_tree.xml +++ b/grc/blocks/block_tree.xml @@ -38,17 +38,6 @@ pad_sink virtual_sink - - Graphical Sinks - wxgui_numbersink2 - wxgui_scopesink2 - wxgui_fftsink2 - wxgui_constellationsink2 - wxgui_waterfallsink2 - wxgui_histosink2 - wxgui_termsink - qtgui_sink_x - Operators gr_add_xx @@ -139,7 +128,7 @@ gr_pll_freqdet_cf gr_pll_refout_cc - gr_fll_band_edge_cc + gr_fll_band_edge_cc gr_correlate_access_code_bb gr_pn_correlator_cc @@ -263,7 +252,7 @@ gr_additive_scrambler_bb - Vocoders + Vocoders blks2_cvsd_encode blks2_cvsd_decode @@ -311,7 +300,5 @@ xmlrpc_server xmlrpc_client - - notebook -- 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/block_tree.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'grc/blocks/block_tree.xml') diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml index 50c463f55..e9a0c1591 100644 --- a/grc/blocks/block_tree.xml +++ b/grc/blocks/block_tree.xml @@ -26,7 +26,6 @@ Sinks - blks2_variable_sink_x gr_vector_sink_x gr_null_sink gr_file_sink @@ -261,7 +260,7 @@ gr_probe_avg_mag_sqrd_x gr_probe_density_b gr_probe_mpsk_snr_c - probe_function + gr_probe_signal_f USRP @@ -276,6 +275,7 @@ Variables variable variable_config + variable_function_probe parameter -- 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/block_tree.xml | 2 -- 1 file changed, 2 deletions(-) (limited to 'grc/blocks/block_tree.xml') diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml index 610a88102..82b9e58f3 100644 --- a/grc/blocks/block_tree.xml +++ b/grc/blocks/block_tree.xml @@ -18,7 +18,6 @@ gr_file_source blks2_tcp_source gr_udp_source - audio_source gr_wavfile_source gr_message_source pad_source @@ -32,7 +31,6 @@ gr_file_sink blks2_tcp_sink gr_udp_sink - audio_sink gr_wavfile_sink gr_message_sink pad_sink -- 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/block_tree.xml | 9 --------- 1 file changed, 9 deletions(-) (limited to 'grc/blocks/block_tree.xml') diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml index 610a88102..e18944bce 100644 --- a/grc/blocks/block_tree.xml +++ b/grc/blocks/block_tree.xml @@ -273,15 +273,6 @@ gr_probe_mpsk_snr_c probe_function - - USRP - usrp_simple_source_x - usrp_simple_sink_x - usrp_dual_source_x - usrp_dual_sink_x - usrp2_source_xxxx - usrp2_sink_xxxx - Variables variable -- 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/block_tree.xml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'grc/blocks/block_tree.xml') diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml index 549ffbdbf..e7aa7c810 100644 --- a/grc/blocks/block_tree.xml +++ b/grc/blocks/block_tree.xml @@ -76,6 +76,8 @@ gr_float_to_short gr_short_to_float + gr_int_to_float + gr_float_to_char gr_char_to_float -- 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/block_tree.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'grc/blocks/block_tree.xml') diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml index e7aa7c810..3eb56f82b 100644 --- a/grc/blocks/block_tree.xml +++ b/grc/blocks/block_tree.xml @@ -175,6 +175,7 @@ blks2_analysis_filterbank blks2_pfb_arb_resampler_ccf + gr_pfb_synthesis_filterbank_ccf gr_single_pole_iir_filter_xx gr_hilbert_fc -- 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/block_tree.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'grc/blocks/block_tree.xml') diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml index 3eb56f82b..66094a80d 100644 --- a/grc/blocks/block_tree.xml +++ b/grc/blocks/block_tree.xml @@ -175,6 +175,7 @@ blks2_analysis_filterbank blks2_pfb_arb_resampler_ccf + blks2_pfb_channelizer_ccf gr_pfb_synthesis_filterbank_ccf gr_single_pole_iir_filter_xx -- cgit