diff options
20 files changed, 797 insertions, 625 deletions
diff --git a/grc/blocks/blks2_am_demod_cf.xml b/gr-analog/grc/analog_am_demod_cf.xml index 898c613beb..b066882bda 100644 --- a/grc/blocks/blks2_am_demod_cf.xml +++ b/gr-analog/grc/analog_am_demod_cf.xml @@ -6,9 +6,9 @@ --> <block> <name>AM Demod</name> - <key>blks2_am_demod_cf</key> - <import>from gnuradio import blks2</import> - <make>blks2.am_demod_cf( + <key>analog_am_demod_cf</key> + <import>from gnuradio import analog</import> + <make>analog.am_demod_cf( channel_rate=$chan_rate, audio_decim=$audio_decim, audio_pass=$audio_pass, diff --git a/gr-analog/grc/analog_block_tree.xml b/gr-analog/grc/analog_block_tree.xml index 1c4e46c914..fdb6db27ac 100644 --- a/gr-analog/grc/analog_block_tree.xml +++ b/gr-analog/grc/analog_block_tree.xml @@ -46,6 +46,15 @@ <block>analog_frequency_modulator_fc</block> <block>analog_phase_modulator_fc</block> <block>analog_quadrature_demod_cf</block> + <block>analog_nbfm_tx</block> + <block>analog_nbfm_rx</block> + <block>analog_wfm_tx</block> + <block>analog_wfm_rcv</block> + <block>analog_wfm_rcv_pll</block> + <block>analog_am_demod_cf</block> + <block>analog_fm_demod_cf</block> + <block>analog_fm_deemph</block> + <block>analog_fm_preemph</block> </cat> <cat> <name>Sources</name> diff --git a/grc/blocks/blks2_fm_deemph.xml b/gr-analog/grc/analog_fm_deemph.xml index 6f38dab6d0..0fcb5a87d4 100644 --- a/grc/blocks/blks2_fm_deemph.xml +++ b/gr-analog/grc/analog_fm_deemph.xml @@ -6,9 +6,9 @@ --> <block> <name>FM Deemphasis</name> - <key>blks2_fm_deemph</key> - <import>from gnuradio import blks2</import> - <make>blks2.fm_deemph(fs=$samp_rate, tau=$tau)</make> + <key>analog_fm_deemph</key> + <import>from gnuradio import analog</import> + <make>analog.fm_deemph(fs=$samp_rate, tau=$tau)</make> <param> <name>Sample Rate</name> <key>samp_rate</key> diff --git a/grc/blocks/blks2_fm_demod_cf.xml b/gr-analog/grc/analog_fm_demod_cf.xml index 2ce1fb9732..c903ddfc73 100644 --- a/grc/blocks/blks2_fm_demod_cf.xml +++ b/gr-analog/grc/analog_fm_demod_cf.xml @@ -6,9 +6,9 @@ --> <block> <name>FM Demod</name> - <key>blks2_fm_demod_cf</key> - <import>from gnuradio import blks2</import> - <make>blks2.fm_demod_cf( + <key>analog_fm_demod_cf</key> + <import>from gnuradio import analog</import> + <make>analog.fm_demod_cf( channel_rate=$chan_rate, audio_decim=$audio_decim, deviation=$deviation, diff --git a/grc/blocks/blks2_fm_preemph.xml b/gr-analog/grc/analog_fm_preemph.xml index 672a7a7b28..fb898b87f3 100644 --- a/grc/blocks/blks2_fm_preemph.xml +++ b/gr-analog/grc/analog_fm_preemph.xml @@ -6,9 +6,9 @@ --> <block> <name>FM Preemphasis</name> - <key>blks2_fm_preemph</key> - <import>from gnuradio import blks2</import> - <make>blks2.fm_preemph(fs=$samp_rate, tau=$tau)</make> + <key>analog_fm_preemph</key> + <import>from gnuradio import analog</import> + <make>analog.fm_preemph(fs=$samp_rate, tau=$tau)</make> <param> <name>Sample Rate</name> <key>samp_rate</key> diff --git a/grc/blocks/blks2_nbfm_rx.xml b/gr-analog/grc/analog_nbfm_rx.xml index d332b9a6b0..cc690c7b6b 100644 --- a/grc/blocks/blks2_nbfm_rx.xml +++ b/gr-analog/grc/analog_nbfm_rx.xml @@ -6,9 +6,9 @@ --> <block> <name>NBFM Receive</name> - <key>blks2_nbfm_rx</key> - <import>from gnuradio import blks2</import> - <make>blks2.nbfm_rx( + <key>analog_nbfm_rx</key> + <import>from gnuradio import analog</import> + <make>analog.nbfm_rx( audio_rate=$audio_rate, quad_rate=$quad_rate, tau=$tau, diff --git a/grc/blocks/blks2_nbfm_tx.xml b/gr-analog/grc/analog_nbfm_tx.xml index 3aa7ede0e2..b3d3451cf7 100644 --- a/grc/blocks/blks2_nbfm_tx.xml +++ b/gr-analog/grc/analog_nbfm_tx.xml @@ -6,9 +6,9 @@ --> <block> <name>NBFM Transmit</name> - <key>blks2_nbfm_tx</key> - <import>from gnuradio import blks2</import> - <make>blks2.nbfm_tx( + <key>analog_nbfm_tx</key> + <import>from gnuradio import analog</import> + <make>analog.nbfm_tx( audio_rate=$audio_rate, quad_rate=$quad_rate, tau=$tau, diff --git a/grc/blocks/blks2_wfm_rcv.xml b/gr-analog/grc/analog_wfm_rcv.xml index 37fb3ba8c4..ce2abb92de 100644 --- a/grc/blocks/blks2_wfm_rcv.xml +++ b/gr-analog/grc/analog_wfm_rcv.xml @@ -6,9 +6,9 @@ --> <block> <name>WBFM Receive</name> - <key>blks2_wfm_rcv</key> - <import>from gnuradio import blks2</import> - <make>blks2.wfm_rcv( + <key>analog_wfm_rcv</key> + <import>from gnuradio import analog</import> + <make>analog.wfm_rcv( quad_rate=$quad_rate, audio_decimation=$audio_decimation, )</make> diff --git a/grc/blocks/blks2_wfm_rcv_pll.xml b/gr-analog/grc/analog_wfm_rcv_pll.xml index 2771350cfd..db31ed9bee 100644 --- a/grc/blocks/blks2_wfm_rcv_pll.xml +++ b/gr-analog/grc/analog_wfm_rcv_pll.xml @@ -6,9 +6,9 @@ --> <block> <name>WBFM Receive PLL</name> - <key>blks2_wfm_rcv_pll</key> - <import>from gnuradio import blks2</import> - <make>blks2.wfm_rcv_pll( + <key>analog_wfm_rcv_pll</key> + <import>from gnuradio import analog</import> + <make>analog.wfm_rcv_pll( demod_rate=$quad_rate, audio_decimation=$audio_decimation, )</make> diff --git a/grc/blocks/blks2_wfm_tx.xml b/gr-analog/grc/analog_wfm_tx.xml index cff92d8190..0e00f05fb2 100644 --- a/grc/blocks/blks2_wfm_tx.xml +++ b/gr-analog/grc/analog_wfm_tx.xml @@ -6,9 +6,9 @@ --> <block> <name>WBFM Transmit</name> - <key>blks2_wfm_tx</key> - <import>from gnuradio import blks2</import> - <make>blks2.wfm_tx( + <key>analog_wfm_tx</key> + <import>from gnuradio import analog</import> + <make>analog.wfm_tx( audio_rate=$audio_rate, quad_rate=$quad_rate, tau=$tau, diff --git a/gr-fcd/examples/grc/fcd_apt_rx.grc b/gr-fcd/examples/grc/fcd_apt_rx.grc index 41a806a102..3c88db7edd 100644 --- a/gr-fcd/examples/grc/fcd_apt_rx.grc +++ b/gr-fcd/examples/grc/fcd_apt_rx.grc @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Sun May 8 18:01:53 2011</timestamp> + <timestamp>Mon Mar 18 10:04:36 2013</timestamp> <block> <key>options</key> <param> @@ -44,6 +44,10 @@ <value>True</value> </param> <param> + <key>max_nouts</key> + <value>0</value> + </param> + <param> <key>realtime_scheduling</key> <value></value> </param> @@ -57,57 +61,42 @@ </param> </block> <block> - <key>variable</key> + <key>variable_static_text</key> <param> <key>id</key> - <value>samp_rate</value> + <value>rec_info</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>value</key> - <value>96000</value> - </param> - <param> - <key>_coordinate</key> - <value>(200, 9)</value> + <key>label</key> + <value>Recording to</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>value</key> + <value>wav_file</value> </param> - </block> - <block> - <key>audio_sink</key> <param> - <key>id</key> - <value>audio_sink</value> + <key>converver</key> + <value>str_converter</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>formatter</key> + <value>None</value> </param> <param> - <key>samp_rate</key> - <value>48000</value> + <key>grid_pos</key> + <value>1,1,1,1</value> </param> <param> - <key>device_name</key> + <key>notebook</key> <value></value> </param> <param> - <key>ok_to_block</key> - <value>True</value> - </param> - <param> - <key>num_inputs</key> - <value>1</value> - </param> - <param> <key>_coordinate</key> - <value>(794, 355)</value> + <value>(641, 14)</value> </param> <param> <key>_rotation</key> @@ -115,46 +104,54 @@ </param> </block> <block> - <key>blks2_fm_demod_cf</key> + <key>fcd_source_c</key> <param> <key>id</key> - <value>blks2_fm_demod_cf</value> + <value>fcd_source_c_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>chan_rate</key> - <value>samp_rate</value> + <key>device_name</key> + <value>hw:1</value> </param> <param> - <key>audio_decim</key> - <value>2</value> + <key>freq</key> + <value>sat_freq</value> </param> <param> - <key>deviation</key> - <value>max_dev</value> + <key>lna</key> + <value>fcd_lna_gain</value> </param> <param> - <key>audio_pass</key> - <value>5000</value> + <key>mixer</key> + <value>+12</value> </param> <param> - <key>audio_stop</key> - <value>7000</value> + <key>ppm</key> + <value>-120</value> </param> <param> - <key>gain</key> - <value>1.0</value> + <key>dci</key> + <value>0.0</value> </param> <param> - <key>tau</key> - <value>75e-6</value> + <key>dcq</key> + <value>0.0</value> + </param> + <param> + <key>iq_phase</key> + <value>0.0</value> + </param> + <param> + <key>iq_gain</key> + <value>1.0</value> </param> <param> <key>_coordinate</key> - <value>(568, 307)</value> + <value>(68, 215)</value> </param> <param> <key>_rotation</key> @@ -162,38 +159,50 @@ </param> </block> <block> - <key>blks2_rational_resampler_xxx</key> + <key>variable_chooser</key> <param> <key>id</key> - <value>blks2_rational_resampler_xxx_0</value> + <value>fcd_lna_gain</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>fff</value> + <key>label</key> + <value>LNA gain [dB]</value> </param> <param> - <key>decim</key> - <value>48000</value> + <key>value</key> + <value>20.0</value> </param> <param> - <key>interp</key> - <value>11025</value> + <key>choices</key> + <value>[30.0, 25.0, 20.0, 17.5, 15.0, 12.5, 10.0, 7.5, 5.0, 2.5, 0.0, -2.5, -5.0]</value> </param> <param> - <key>taps</key> + <key>labels</key> <value>[]</value> </param> <param> - <key>fractional_bw</key> - <value>0</value> + <key>type</key> + <value>drop_down</value> + </param> + <param> + <key>style</key> + <value>wx.RA_HORIZONTAL</value> + </param> + <param> + <key>grid_pos</key> + <value>2,0,1,1</value> + </param> + <param> + <key>notebook</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(516, 522)</value> + <value>(247, 405)</value> </param> <param> <key>_rotation</key> @@ -201,45 +210,50 @@ </param> </block> <block> - <key>variable</key> + <key>variable_chooser</key> <param> <key>id</key> - <value>wav_file</value> + <value>sat_freq</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> + <key>label</key> + <value>Satellite</value> + </param> + <param> <key>value</key> - <value>prefix + datetime.now().strftime("%Y.%m.%d.%H.%M.%S") + ".wav"</value> + <value>137500000</value> </param> <param> - <key>_coordinate</key> - <value>(762, 652)</value> + <key>choices</key> + <value>[137500000,137620000,137912500,137100000]</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>labels</key> + <value>["NOAA-15","NOAA-17","NOAA-18","NOAA-19"]</value> </param> - </block> - <block> - <key>variable</key> <param> - <key>id</key> - <value>prefix</value> + <key>type</key> + <value>drop_down</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>style</key> + <value>wx.RA_HORIZONTAL</value> </param> <param> - <key>value</key> - <value>"FCD_APT_REC-"</value> + <key>grid_pos</key> + <value>1,0,1,1</value> + </param> + <param> + <key>notebook</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(625, 653)</value> + <value>(58, 403)</value> </param> <param> <key>_rotation</key> @@ -247,108 +261,113 @@ </param> </block> <block> - <key>import</key> + <key>wxgui_fftsink2</key> <param> <key>id</key> - <value>import_0</value> + <value>fftsink</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>import</key> - <value>from datetime import datetime</value> + <key>type</key> + <value>complex</value> </param> <param> - <key>_coordinate</key> - <value>(508, 653)</value> + <key>title</key> + <value>FCD Spectrum</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>samp_rate</key> + <value>samp_rate</value> </param> - </block> - <block> - <key>blocks_wavfile_sink</key> <param> - <key>id</key> - <value>wavfile_sink</value> + <key>baseband_freq</key> + <value>sat_freq</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>y_per_div</key> + <value>10</value> </param> <param> - <key>file</key> - <value>wav_file</value> + <key>y_divs</key> + <value>10</value> </param> <param> - <key>nchan</key> - <value>1</value> + <key>ref_level</key> + <value>0.0</value> </param> <param> - <key>samp_rate</key> - <value>11025</value> + <key>ref_scale</key> + <value>1.0</value> </param> <param> - <key>bits_per_sample</key> - <value>16</value> + <key>fft_size</key> + <value>512</value> </param> <param> - <key>_coordinate</key> - <value>(805, 530)</value> + <key>fft_rate</key> + <value>15</value> </param> <param> - <key>_rotation</key> + <key>peak_hold</key> + <value>False</value> + </param> + <param> + <key>average</key> + <value>False</value> + </param> + <param> + <key>avg_alpha</key> <value>0</value> </param> - </block> - <block> - <key>variable_chooser</key> <param> - <key>id</key> - <value>sat_freq</value> + <key>win</key> + <value>None</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>win_size</key> + <value></value> </param> <param> - <key>label</key> - <value>Satellite</value> + <key>grid_pos</key> + <value>0,0,1,2</value> </param> <param> - <key>value</key> - <value>137500000</value> + <key>notebook</key> + <value></value> </param> <param> - <key>choices</key> - <value>[137500000,137620000,137912500,137100000]</value> + <key>freqvar</key> + <value>None</value> </param> <param> - <key>labels</key> - <value>["NOAA-15","NOAA-17","NOAA-18","NOAA-19"]</value> + <key>_coordinate</key> + <value>(375, 11)</value> </param> <param> - <key>type</key> - <value>drop_down</value> + <key>_rotation</key> + <value>0</value> </param> + </block> + <block> + <key>variable</key> <param> - <key>style</key> - <value>wx.RA_HORIZONTAL</value> + <key>id</key> + <value>samp_rate</value> </param> <param> - <key>grid_pos</key> - <value>1,0,1,1</value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>notebook</key> - <value></value> + <key>value</key> + <value>96000</value> </param> <param> <key>_coordinate</key> - <value>(18, 479)</value> + <value>(190, 11)</value> </param> <param> <key>_rotation</key> @@ -371,7 +390,7 @@ </param> <param> <key>_coordinate</key> - <value>(299, 10)</value> + <value>(282, 11)</value> </param> <param> <key>_rotation</key> @@ -379,50 +398,57 @@ </param> </block> <block> - <key>variable_chooser</key> + <key>blocks_wavfile_sink</key> <param> <key>id</key> - <value>fcd_lna_gain</value> + <value>wavfile_sink</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>LNA gain [dB]</value> + <key>file</key> + <value>wav_file</value> </param> <param> - <key>value</key> - <value>20.0</value> + <key>nchan</key> + <value>1</value> </param> <param> - <key>choices</key> - <value>[30.0, 25.0, 20.0, 17.5, 15.0, 12.5, 10.0, 7.5, 5.0, 2.5, 0.0, -2.5, -5.0]</value> + <key>samp_rate</key> + <value>11025</value> </param> <param> - <key>labels</key> - <value>[]</value> + <key>bits_per_sample</key> + <value>16</value> </param> <param> - <key>type</key> - <value>drop_down</value> + <key>_coordinate</key> + <value>(845, 431)</value> </param> <param> - <key>style</key> - <value>wx.RA_HORIZONTAL</value> + <key>_rotation</key> + <value>0</value> </param> + </block> + <block> + <key>import</key> <param> - <key>grid_pos</key> - <value>2,0,1,1</value> + <key>id</key> + <value>import_0</value> </param> <param> - <key>notebook</key> - <value></value> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>import</key> + <value>from datetime import datetime</value> </param> <param> <key>_coordinate</key> - <value>(207, 481)</value> + <value>(552, 523)</value> </param> <param> <key>_rotation</key> @@ -430,42 +456,45 @@ </param> </block> <block> - <key>variable_static_text</key> + <key>variable</key> <param> <key>id</key> - <value>rec_info</value> + <value>prefix</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>Recording to</value> + <key>value</key> + <value>"FCD_APT_REC-"</value> </param> <param> - <key>value</key> - <value>wav_file</value> + <key>_coordinate</key> + <value>(669, 523)</value> </param> <param> - <key>converver</key> - <value>str_converter</value> + <key>_rotation</key> + <value>0</value> </param> + </block> + <block> + <key>variable</key> <param> - <key>formatter</key> - <value>None</value> + <key>id</key> + <value>wav_file</value> </param> <param> - <key>grid_pos</key> - <value>1,1,1,1</value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>notebook</key> - <value></value> + <key>value</key> + <value>prefix + datetime.now().strftime("%Y.%m.%d.%H.%M.%S") + ".wav"</value> </param> <param> <key>_coordinate</key> - <value>(641, 14)</value> + <value>(806, 522)</value> </param> <param> <key>_rotation</key> @@ -520,7 +549,7 @@ </param> <param> <key>_coordinate</key> - <value>(334, 307)</value> + <value>(374, 231)</value> </param> <param> <key>_rotation</key> @@ -528,50 +557,34 @@ </param> </block> <block> - <key>fcd_source_c</key> + <key>audio_sink</key> <param> <key>id</key> - <value>fcd_source_c_0</value> + <value>audio_sink</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>device_name</key> - <value>hw:1</value> - </param> - <param> - <key>freq</key> - <value>sat_freq</value> - </param> - <param> - <key>lna</key> - <value>fcd_lna_gain</value> - </param> - <param> - <key>ppm</key> - <value>-120</value> - </param> - <param> - <key>dci</key> - <value>0.0</value> + <key>samp_rate</key> + <value>48000</value> </param> <param> - <key>dcq</key> - <value>0.0</value> + <key>device_name</key> + <value></value> </param> <param> - <key>iq_phase</key> - <value>0.0</value> + <key>ok_to_block</key> + <value>True</value> </param> <param> - <key>iq_gain</key> - <value>1.0</value> + <key>num_inputs</key> + <value>1</value> </param> <param> <key>_coordinate</key> - <value>(25, 299)</value> + <value>(834, 279)</value> </param> <param> <key>_rotation</key> @@ -579,10 +592,10 @@ </param> </block> <block> - <key>wxgui_fftsink2</key> + <key>rational_resampler_xxx</key> <param> <key>id</key> - <value>fftsink</value> + <value>rational_resampler_xxx_0</value> </param> <param> <key>_enabled</key> @@ -590,75 +603,74 @@ </param> <param> <key>type</key> - <value>complex</value> - </param> - <param> - <key>title</key> - <value>FCD Spectrum</value> + <value>fff</value> </param> <param> - <key>samp_rate</key> - <value>samp_rate</value> + <key>interp</key> + <value>11025</value> </param> <param> - <key>baseband_freq</key> - <value>sat_freq</value> + <key>decim</key> + <value>48000</value> </param> <param> - <key>y_per_div</key> - <value>10</value> + <key>taps</key> + <value>[]</value> </param> <param> - <key>y_divs</key> - <value>10</value> + <key>fbw</key> + <value>0</value> </param> <param> - <key>ref_level</key> - <value>0.0</value> + <key>_coordinate</key> + <value>(591, 423)</value> </param> <param> - <key>ref_scale</key> - <value>1.0</value> + <key>_rotation</key> + <value>0</value> </param> + </block> + <block> + <key>analog_fm_demod_cf</key> <param> - <key>fft_size</key> - <value>512</value> + <key>id</key> + <value>analog_fm_demod_cf_0</value> </param> <param> - <key>fft_rate</key> - <value>15</value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>peak_hold</key> - <value>False</value> + <key>chan_rate</key> + <value>samp_rate</value> </param> <param> - <key>average</key> - <value>False</value> + <key>audio_decim</key> + <value>2</value> </param> <param> - <key>avg_alpha</key> - <value>0</value> + <key>deviation</key> + <value>max_dev</value> </param> <param> - <key>win</key> - <value>None</value> + <key>audio_pass</key> + <value>5000</value> </param> <param> - <key>win_size</key> - <value></value> + <key>audio_stop</key> + <value>7000</value> </param> <param> - <key>grid_pos</key> - <value>0,0,1,2</value> + <key>gain</key> + <value>1.0</value> </param> <param> - <key>notebook</key> - <value></value> + <key>tau</key> + <value>75e-6</value> </param> <param> <key>_coordinate</key> - <value>(335, 103)</value> + <value>(605, 231)</value> </param> <param> <key>_rotation</key> @@ -666,38 +678,38 @@ </param> </block> <connection> - <source_block_id>low_pass_filter</source_block_id> - <sink_block_id>blks2_fm_demod_cf</sink_block_id> + <source_block_id>rational_resampler_xxx_0</source_block_id> + <sink_block_id>wavfile_sink</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>blks2_fm_demod_cf</source_block_id> - <sink_block_id>audio_sink</sink_block_id> + <source_block_id>fcd_source_c_0</source_block_id> + <sink_block_id>fftsink</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>blks2_rational_resampler_xxx_0</source_block_id> - <sink_block_id>wavfile_sink</sink_block_id> + <source_block_id>fcd_source_c_0</source_block_id> + <sink_block_id>low_pass_filter</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>blks2_fm_demod_cf</source_block_id> - <sink_block_id>blks2_rational_resampler_xxx_0</sink_block_id> + <source_block_id>low_pass_filter</source_block_id> + <sink_block_id>analog_fm_demod_cf_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>fcd_source_c_0</source_block_id> - <sink_block_id>low_pass_filter</sink_block_id> + <source_block_id>analog_fm_demod_cf_0</source_block_id> + <sink_block_id>audio_sink</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>fcd_source_c_0</source_block_id> - <sink_block_id>fftsink</sink_block_id> + <source_block_id>analog_fm_demod_cf_0</source_block_id> + <sink_block_id>rational_resampler_xxx_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> diff --git a/gr-fcd/examples/grc/fcd_nfm_rx.grc b/gr-fcd/examples/grc/fcd_nfm_rx.grc index 96d6f55e2e..afe343a834 100644 --- a/gr-fcd/examples/grc/fcd_nfm_rx.grc +++ b/gr-fcd/examples/grc/fcd_nfm_rx.grc @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Tue Nov 6 12:24:50 2012</timestamp> + <timestamp>Mon Mar 18 10:11:39 2013</timestamp> <block> <key>options</key> <param> @@ -379,37 +379,6 @@ </param> </block> <block> - <key>blocks_multiply_const_vxx</key> - <param> - <key>id</key> - <value>blocks_multiply_const_vxx_1</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>type</key> - <value>float</value> - </param> - <param> - <key>const</key> - <value>af_gain</value> - </param> - <param> - <key>vlen</key> - <value>1</value> - </param> - <param> - <key>_coordinate</key> - <value>(674, 507)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> <key>audio_sink</key> <param> <key>id</key> @@ -880,41 +849,6 @@ </param> </block> <block> - <key>blks2_nbfm_rx</key> - <param> - <key>id</key> - <value>nbfm_normal</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>audio_rate</key> - <value>48000</value> - </param> - <param> - <key>quad_rate</key> - <value>96000</value> - </param> - <param> - <key>tau</key> - <value>75e-6</value> - </param> - <param> - <key>max_dev</key> - <value>5e3</value> - </param> - <param> - <key>_coordinate</key> - <value>(441, 483)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> <key>low_pass_filter</key> <param> <key>id</key> @@ -962,7 +896,7 @@ </param> <param> <key>_coordinate</key> - <value>(742, 258)</value> + <value>(742, 266)</value> </param> <param> <key>_rotation</key> @@ -996,6 +930,72 @@ <value>0</value> </param> </block> + <block> + <key>blocks_multiply_const_vxx</key> + <param> + <key>id</key> + <value>blocks_multiply_const_vxx_1</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>type</key> + <value>float</value> + </param> + <param> + <key>const</key> + <value>af_gain</value> + </param> + <param> + <key>vlen</key> + <value>1</value> + </param> + <param> + <key>_coordinate</key> + <value>(674, 507)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>analog_nbfm_rx</key> + <param> + <key>id</key> + <value>analog_nbfm_rx_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>audio_rate</key> + <value>48000</value> + </param> + <param> + <key>quad_rate</key> + <value>96000</value> + </param> + <param> + <key>tau</key> + <value>75e-6</value> + </param> + <param> + <key>max_dev</key> + <value>5e3</value> + </param> + <param> + <key>_coordinate</key> + <value>(440, 483)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> <connection> <source_block_id>blocks_multiply_const_vxx_1</source_block_id> <sink_block_id>audio_sink</sink_block_id> @@ -1009,12 +1009,6 @@ <sink_key>0</sink_key> </connection> <connection> - <source_block_id>nbfm_normal</source_block_id> - <sink_block_id>blocks_multiply_const_vxx_1</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> <source_block_id>fcd_source_c_1</source_block_id> <sink_block_id>freq_xlating_fir_filter_xxx_0</sink_block_id> <source_key>0</source_key> @@ -1033,14 +1027,20 @@ <sink_key>0</sink_key> </connection> <connection> + <source_block_id>low_pass_filter</source_block_id> + <sink_block_id>analog_simple_squelch_cc_0</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> + <connection> <source_block_id>analog_simple_squelch_cc_0</source_block_id> - <sink_block_id>nbfm_normal</sink_block_id> + <sink_block_id>analog_nbfm_rx_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>low_pass_filter</source_block_id> - <sink_block_id>analog_simple_squelch_cc_0</sink_block_id> + <source_block_id>analog_nbfm_rx_0</source_block_id> + <sink_block_id>blocks_multiply_const_vxx_1</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> diff --git a/gr-filter/grc/CMakeLists.txt b/gr-filter/grc/CMakeLists.txt index 1ca23d560e..3a2af83da9 100644 --- a/gr-filter/grc/CMakeLists.txt +++ b/gr-filter/grc/CMakeLists.txt @@ -33,6 +33,7 @@ install(FILES filter_pfb_decimator.xml filter_pfb_interpolator.xml filter_pfb_synthesizer.xml + filter_rational_resampler_xxx.xml filter_rational_resampler_base_xxx.xml filter_single_pole_iir_filter_xx.xml filter_low_pass_filter.xml diff --git a/gr-filter/grc/filter_block_tree.xml b/gr-filter/grc/filter_block_tree.xml index 9b72dcf605..a9dfd56549 100644 --- a/gr-filter/grc/filter_block_tree.xml +++ b/gr-filter/grc/filter_block_tree.xml @@ -51,6 +51,7 @@ <block>pfb_decimator_ccf</block> <block>pfb_interpolator_ccf</block> <block>pfb_synthesizer_ccf</block> + <block>rational_resampler_xxx</block> <block>rational_resampler_base_xxx</block> <block>single_pole_iir_filter_xx</block> </cat> diff --git a/gr-uhd/examples/grc/uhd_const_wave.grc b/gr-uhd/examples/grc/uhd_const_wave.grc index c64721c833..46596109de 100644 --- a/gr-uhd/examples/grc/uhd_const_wave.grc +++ b/gr-uhd/examples/grc/uhd_const_wave.grc @@ -1,27 +1,59 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Sat Oct 8 10:24:27 2011</timestamp> + <timestamp>Mon Mar 18 11:04:05 2013</timestamp> <block> - <key>const_source_x</key> + <key>options</key> <param> <key>id</key> - <value>const_source_x_0</value> + <value>uhd_const_wave</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>complex</value> + <key>title</key> + <value>UHD Constant Wave</value> </param> <param> - <key>const</key> - <value>ampl</value> + <key>author</key> + <value>Example</value> + </param> + <param> + <key>description</key> + <value>Tune UHD Device</value> + </param> + <param> + <key>window_size</key> + <value>1280, 1024</value> + </param> + <param> + <key>generate_options</key> + <value>wx_gui</value> + </param> + <param> + <key>category</key> + <value>Custom</value> + </param> + <param> + <key>run_options</key> + <value>prompt</value> + </param> + <param> + <key>run</key> + <value>True</value> + </param> + <param> + <key>max_nouts</key> + <value>0</value> + </param> + <param> + <key>realtime_scheduling</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(102, 193)</value> + <value>(10, 10)</value> </param> <param> <key>_rotation</key> @@ -194,54 +226,69 @@ </param> </block> <block> - <key>options</key> + <key>parameter</key> <param> <key>id</key> - <value>uhd_const_wave</value> + <value>address</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>title</key> - <value>UHD Constant Wave</value> + <key>label</key> + <value>IP Address</value> </param> <param> - <key>author</key> - <value>Example</value> + <key>value</key> + <value>addr=192.168.11.2</value> </param> <param> - <key>description</key> - <value>Tune UHD Device</value> + <key>type</key> + <value>string</value> </param> <param> - <key>window_size</key> - <value>1280, 1024</value> + <key>short_id</key> + <value>a</value> </param> <param> - <key>generate_options</key> - <value>wx_gui</value> + <key>_coordinate</key> + <value>(188, 12)</value> </param> <param> - <key>category</key> - <value>Custom</value> + <key>_rotation</key> + <value>0</value> </param> + </block> + <block> + <key>parameter</key> <param> - <key>run_options</key> - <value>prompt</value> + <key>id</key> + <value>samp_rate</value> </param> <param> - <key>run</key> + <key>_enabled</key> <value>True</value> </param> <param> - <key>realtime_scheduling</key> - <value></value> + <key>label</key> + <value>Sample Rate</value> + </param> + <param> + <key>value</key> + <value>1e6</value> + </param> + <param> + <key>type</key> + <value>eng_float</value> + </param> + <param> + <key>short_id</key> + <value>s</value> </param> <param> <key>_coordinate</key> - <value>(10, 10)</value> + <value>(342, 14)</value> </param> <param> <key>_rotation</key> @@ -252,7 +299,7 @@ <key>parameter</key> <param> <key>id</key> - <value>address</value> + <value>freq</value> </param> <param> <key>_enabled</key> @@ -260,23 +307,23 @@ </param> <param> <key>label</key> - <value>IP Address</value> + <value>Default Frequency</value> </param> <param> <key>value</key> - <value>addr=192.168.11.2</value> + <value>2.45e9</value> </param> <param> <key>type</key> - <value>string</value> + <value>eng_float</value> </param> <param> <key>short_id</key> - <value>a</value> + <value>f</value> </param> <param> <key>_coordinate</key> - <value>(188, 12)</value> + <value>(468, 14)</value> </param> <param> <key>_rotation</key> @@ -287,7 +334,7 @@ <key>parameter</key> <param> <key>id</key> - <value>samp_rate</value> + <value>gain</value> </param> <param> <key>_enabled</key> @@ -295,11 +342,11 @@ </param> <param> <key>label</key> - <value>Sample Rate</value> + <value>Default Gain</value> </param> <param> <key>value</key> - <value>1e6</value> + <value>0</value> </param> <param> <key>type</key> @@ -307,11 +354,11 @@ </param> <param> <key>short_id</key> - <value>s</value> + <value>g</value> </param> <param> <key>_coordinate</key> - <value>(342, 14)</value> + <value>(616, 13)</value> </param> <param> <key>_rotation</key> @@ -330,7 +377,15 @@ </param> <param> <key>type</key> - <value>complex</value> + <value>fc32</value> + </param> + <param> + <key>otw</key> + <value></value> + </param> + <param> + <key>stream_args</key> + <value></value> </param> <param> <key>dev_addr</key> @@ -349,7 +404,11 @@ <value>1</value> </param> <param> - <key>ref_source0</key> + <key>clock_source0</key> + <value></value> + </param> + <param> + <key>time_source0</key> <value></value> </param> <param> @@ -357,7 +416,11 @@ <value></value> </param> <param> - <key>ref_source1</key> + <key>clock_source1</key> + <value></value> + </param> + <param> + <key>time_source1</key> <value></value> </param> <param> @@ -365,7 +428,11 @@ <value></value> </param> <param> - <key>ref_source2</key> + <key>clock_source2</key> + <value></value> + </param> + <param> + <key>time_source2</key> <value></value> </param> <param> @@ -373,7 +440,11 @@ <value></value> </param> <param> - <key>ref_source3</key> + <key>clock_source3</key> + <value></value> + </param> + <param> + <key>time_source3</key> <value></value> </param> <param> @@ -381,7 +452,11 @@ <value></value> </param> <param> - <key>ref_source4</key> + <key>clock_source4</key> + <value></value> + </param> + <param> + <key>time_source4</key> <value></value> </param> <param> @@ -389,7 +464,11 @@ <value></value> </param> <param> - <key>ref_source5</key> + <key>clock_source5</key> + <value></value> + </param> + <param> + <key>time_source5</key> <value></value> </param> <param> @@ -397,7 +476,11 @@ <value></value> </param> <param> - <key>ref_source6</key> + <key>clock_source6</key> + <value></value> + </param> + <param> + <key>time_source6</key> <value></value> </param> <param> @@ -405,7 +488,11 @@ <value></value> </param> <param> - <key>ref_source7</key> + <key>clock_source7</key> + <value></value> + </param> + <param> + <key>time_source7</key> <value></value> </param> <param> @@ -942,69 +1029,26 @@ </param> </block> <block> - <key>parameter</key> + <key>analog_const_source_x</key> <param> <key>id</key> - <value>freq</value> + <value>analog_const_source_x_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>Default Frequency</value> - </param> - <param> - <key>value</key> - <value>2.45e9</value> - </param> - <param> - <key>type</key> - <value>eng_float</value> - </param> - <param> - <key>short_id</key> - <value>f</value> - </param> - <param> - <key>_coordinate</key> - <value>(468, 14)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>parameter</key> - <param> - <key>id</key> - <value>gain</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>label</key> - <value>Default Gain</value> - </param> - <param> - <key>value</key> - <value>0</value> - </param> - <param> <key>type</key> - <value>eng_float</value> + <value>complex</value> </param> <param> - <key>short_id</key> - <value>g</value> + <key>const</key> + <value>ampl</value> </param> <param> <key>_coordinate</key> - <value>(616, 13)</value> + <value>(74, 193)</value> </param> <param> <key>_rotation</key> @@ -1012,7 +1056,7 @@ </param> </block> <connection> - <source_block_id>const_source_x_0</source_block_id> + <source_block_id>analog_const_source_x_0</source_block_id> <sink_block_id>uhd_usrp_sink_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> diff --git a/gr-uhd/examples/grc/uhd_fft.grc b/gr-uhd/examples/grc/uhd_fft.grc index 2582b5e3b1..1db98ab8aa 100644 --- a/gr-uhd/examples/grc/uhd_fft.grc +++ b/gr-uhd/examples/grc/uhd_fft.grc @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Mon Jun 18 14:20:11 2012</timestamp> + <timestamp>Mon Mar 18 11:09:57 2013</timestamp> <block> <key>options</key> <param> @@ -1146,41 +1146,6 @@ </param> </block> <block> - <key>parameter</key> - <param> - <key>id</key> - <value>address</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>label</key> - <value>IP Address</value> - </param> - <param> - <key>value</key> - <value></value> - </param> - <param> - <key>type</key> - <value>string</value> - </param> - <param> - <key>short_id</key> - <value>a</value> - </param> - <param> - <key>_coordinate</key> - <value>(190, 15)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> <key>wxgui_fftsink2</key> <param> <key>id</key> @@ -1507,6 +1472,41 @@ <value>0</value> </param> </block> + <block> + <key>parameter</key> + <param> + <key>id</key> + <value>address</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>label</key> + <value>IP Address</value> + </param> + <param> + <key>value</key> + <value></value> + </param> + <param> + <key>type</key> + <value>string</value> + </param> + <param> + <key>short_id</key> + <value>a</value> + </param> + <param> + <key>_coordinate</key> + <value>(190, 15)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> <connection> <source_block_id>uhd_usrp_source_0</source_block_id> <sink_block_id>wxgui_scopesink2_0</sink_block_id> diff --git a/gr-uhd/examples/grc/uhd_rx_dpsk.grc b/gr-uhd/examples/grc/uhd_rx_dpsk.grc index b40c541629..8a9faa4b73 100644 --- a/gr-uhd/examples/grc/uhd_rx_dpsk.grc +++ b/gr-uhd/examples/grc/uhd_rx_dpsk.grc @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Sat Oct 8 15:08:55 2011</timestamp> + <timestamp>Mon Mar 18 11:10:25 2013</timestamp> <block> <key>options</key> <param> @@ -44,6 +44,10 @@ <value>True</value> </param> <param> + <key>max_nouts</key> + <value>0</value> + </param> + <param> <key>realtime_scheduling</key> <value></value> </param> @@ -604,6 +608,10 @@ <value></value> </param> <param> + <key>freqvar</key> + <value>None</value> + </param> + <param> <key>_coordinate</key> <value>(710, 236)</value> </param> @@ -635,20 +643,20 @@ <value>0.35</value> </param> <param> - <key>phase_bw</key> + <key>freq_bw</key> <value>6.28/100.0</value> </param> <param> - <key>timing_bw</key> + <key>phase_bw</key> <value>6.28/100.0</value> </param> <param> - <key>omega_relative_limit</key> - <value>0.005</value> + <key>timing_bw</key> + <value>6.28/100.0</value> </param> <param> - <key>gray_coded</key> - <value>True</value> + <key>mod_code</key> + <value>"gray"</value> </param> <param> <key>verbose</key> @@ -793,7 +801,15 @@ </param> <param> <key>type</key> - <value>complex</value> + <value>fc32</value> + </param> + <param> + <key>otw</key> + <value></value> + </param> + <param> + <key>stream_args</key> + <value></value> </param> <param> <key>dev_addr</key> @@ -812,7 +828,11 @@ <value>1</value> </param> <param> - <key>ref_source0</key> + <key>clock_source0</key> + <value></value> + </param> + <param> + <key>time_source0</key> <value></value> </param> <param> @@ -820,7 +840,11 @@ <value></value> </param> <param> - <key>ref_source1</key> + <key>clock_source1</key> + <value></value> + </param> + <param> + <key>time_source1</key> <value></value> </param> <param> @@ -828,7 +852,11 @@ <value></value> </param> <param> - <key>ref_source2</key> + <key>clock_source2</key> + <value></value> + </param> + <param> + <key>time_source2</key> <value></value> </param> <param> @@ -836,7 +864,11 @@ <value></value> </param> <param> - <key>ref_source3</key> + <key>clock_source3</key> + <value></value> + </param> + <param> + <key>time_source3</key> <value></value> </param> <param> @@ -844,7 +876,11 @@ <value></value> </param> <param> - <key>ref_source4</key> + <key>clock_source4</key> + <value></value> + </param> + <param> + <key>time_source4</key> <value></value> </param> <param> @@ -852,7 +888,11 @@ <value></value> </param> <param> - <key>ref_source5</key> + <key>clock_source5</key> + <value></value> + </param> + <param> + <key>time_source5</key> <value></value> </param> <param> @@ -860,7 +900,11 @@ <value></value> </param> <param> - <key>ref_source6</key> + <key>clock_source6</key> + <value></value> + </param> + <param> + <key>time_source6</key> <value></value> </param> <param> @@ -868,7 +912,11 @@ <value></value> </param> <param> - <key>ref_source7</key> + <key>clock_source7</key> + <value></value> + </param> + <param> + <key>time_source7</key> <value></value> </param> <param> diff --git a/gr-uhd/examples/grc/uhd_tx_dpsk.grc b/gr-uhd/examples/grc/uhd_tx_dpsk.grc index 38318bef4b..b5f8e41054 100644 --- a/gr-uhd/examples/grc/uhd_tx_dpsk.grc +++ b/gr-uhd/examples/grc/uhd_tx_dpsk.grc @@ -1,6 +1,65 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Sat Oct 8 14:55:39 2011</timestamp> + <timestamp>Mon Mar 18 11:11:06 2013</timestamp> + <block> + <key>options</key> + <param> + <key>id</key> + <value>uhd_tx_dpsk</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>title</key> + <value>UHD TX DPSK</value> + </param> + <param> + <key>author</key> + <value></value> + </param> + <param> + <key>description</key> + <value></value> + </param> + <param> + <key>window_size</key> + <value>1280, 1024</value> + </param> + <param> + <key>generate_options</key> + <value>wx_gui</value> + </param> + <param> + <key>category</key> + <value>Custom</value> + </param> + <param> + <key>run_options</key> + <value>prompt</value> + </param> + <param> + <key>run</key> + <value>True</value> + </param> + <param> + <key>max_nouts</key> + <value>0</value> + </param> + <param> + <key>realtime_scheduling</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(10, 10)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> <block> <key>variable</key> <param> @@ -321,8 +380,8 @@ <value>0.35</value> </param> <param> - <key>gray_coded</key> - <value>True</value> + <key>mod_code</key> + <value>"gray"</value> </param> <param> <key>verbose</key> @@ -423,7 +482,15 @@ </param> <param> <key>type</key> - <value>complex</value> + <value>fc32</value> + </param> + <param> + <key>otw</key> + <value></value> + </param> + <param> + <key>stream_args</key> + <value></value> </param> <param> <key>dev_addr</key> @@ -442,7 +509,11 @@ <value>1</value> </param> <param> - <key>ref_source0</key> + <key>clock_source0</key> + <value></value> + </param> + <param> + <key>time_source0</key> <value></value> </param> <param> @@ -450,7 +521,11 @@ <value></value> </param> <param> - <key>ref_source1</key> + <key>clock_source1</key> + <value></value> + </param> + <param> + <key>time_source1</key> <value></value> </param> <param> @@ -458,7 +533,11 @@ <value></value> </param> <param> - <key>ref_source2</key> + <key>clock_source2</key> + <value></value> + </param> + <param> + <key>time_source2</key> <value></value> </param> <param> @@ -466,7 +545,11 @@ <value></value> </param> <param> - <key>ref_source3</key> + <key>clock_source3</key> + <value></value> + </param> + <param> + <key>time_source3</key> <value></value> </param> <param> @@ -474,7 +557,11 @@ <value></value> </param> <param> - <key>ref_source4</key> + <key>clock_source4</key> + <value></value> + </param> + <param> + <key>time_source4</key> <value></value> </param> <param> @@ -482,7 +569,11 @@ <value></value> </param> <param> - <key>ref_source5</key> + <key>clock_source5</key> + <value></value> + </param> + <param> + <key>time_source5</key> <value></value> </param> <param> @@ -490,7 +581,11 @@ <value></value> </param> <param> - <key>ref_source6</key> + <key>clock_source6</key> + <value></value> + </param> + <param> + <key>time_source6</key> <value></value> </param> <param> @@ -498,7 +593,11 @@ <value></value> </param> <param> - <key>ref_source7</key> + <key>clock_source7</key> + <value></value> + </param> + <param> + <key>time_source7</key> <value></value> </param> <param> @@ -1144,63 +1243,12 @@ <value></value> </param> <param> - <key>_coordinate</key> - <value>(827, 299)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>options</key> - <param> - <key>id</key> - <value>uhd_tx_dpsk</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>title</key> - <value>UHD TX DPSK</value> - </param> - <param> - <key>author</key> - <value></value> - </param> - <param> - <key>description</key> - <value></value> - </param> - <param> - <key>window_size</key> - <value>1280, 1024</value> - </param> - <param> - <key>generate_options</key> - <value>wx_gui</value> - </param> - <param> - <key>category</key> - <value>Custom</value> - </param> - <param> - <key>run_options</key> - <value>prompt</value> - </param> - <param> - <key>run</key> - <value>True</value> - </param> - <param> - <key>realtime_scheduling</key> - <value></value> + <key>freqvar</key> + <value>None</value> </param> <param> <key>_coordinate</key> - <value>(10, 10)</value> + <value>(827, 299)</value> </param> <param> <key>_rotation</key> diff --git a/gr-uhd/examples/grc/uhd_wbfm_receive.grc b/gr-uhd/examples/grc/uhd_wbfm_receive.grc index 943e82cf31..e19015a790 100644 --- a/gr-uhd/examples/grc/uhd_wbfm_receive.grc +++ b/gr-uhd/examples/grc/uhd_wbfm_receive.grc @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Tue Apr 24 16:59:09 2012</timestamp> + <timestamp>Mon Mar 18 11:13:02 2013</timestamp> <block> <key>options</key> <param> @@ -44,6 +44,10 @@ <value>True</value> </param> <param> + <key>max_nouts</key> + <value>0</value> + </param> + <param> <key>realtime_scheduling</key> <value></value> </param> @@ -1044,41 +1048,6 @@ <key>parameter</key> <param> <key>id</key> - <value>address</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>label</key> - <value>IP Address</value> - </param> - <param> - <key>value</key> - <value>addr=192.168.10.2</value> - </param> - <param> - <key>type</key> - <value>string</value> - </param> - <param> - <key>short_id</key> - <value>a</value> - </param> - <param> - <key>_coordinate</key> - <value>(199, 14)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>parameter</key> - <param> - <key>id</key> <value>samp_rate</value> </param> <param> @@ -1181,33 +1150,6 @@ </param> </block> <block> - <key>blks2_wfm_rcv</key> - <param> - <key>id</key> - <value>blks2_wfm_rcv</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>quad_rate</key> - <value>samp_rate</value> - </param> - <param> - <key>audio_decimation</key> - <value>audio_decim</value> - </param> - <param> - <key>_coordinate</key> - <value>(626, 153)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> <key>low_pass_filter</key> <param> <key>id</key> @@ -1364,6 +1306,10 @@ <value></value> </param> <param> + <key>freqvar</key> + <value>None</value> + </param> + <param> <key>_coordinate</key> <value>(624, 278)</value> </param> @@ -1372,6 +1318,68 @@ <value>0</value> </param> </block> + <block> + <key>analog_wfm_rcv</key> + <param> + <key>id</key> + <value>analog_wfm_rcv</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>quad_rate</key> + <value>samp_rate</value> + </param> + <param> + <key>audio_decimation</key> + <value>audio_decim</value> + </param> + <param> + <key>_coordinate</key> + <value>(625, 153)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>parameter</key> + <param> + <key>id</key> + <value>address</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>label</key> + <value>IP Address</value> + </param> + <param> + <key>value</key> + <value>addr=192.168.10.2</value> + </param> + <param> + <key>type</key> + <value>string</value> + </param> + <param> + <key>short_id</key> + <value>a</value> + </param> + <param> + <key>_coordinate</key> + <value>(199, 14)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> <connection> <source_block_id>blocks_multiply_const_vxx</source_block_id> <sink_block_id>audio_sink</sink_block_id> @@ -1379,14 +1387,14 @@ <sink_key>0</sink_key> </connection> <connection> - <source_block_id>blks2_wfm_rcv</source_block_id> + <source_block_id>analog_wfm_rcv</source_block_id> <sink_block_id>blocks_multiply_const_vxx</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> <source_block_id>low_pass_filter_0</source_block_id> - <sink_block_id>blks2_wfm_rcv</sink_block_id> + <sink_block_id>analog_wfm_rcv</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> diff --git a/gr-wxgui/python/constsink_gl.py b/gr-wxgui/python/constsink_gl.py index 0313e7fea0..dea76ea753 100644 --- a/gr-wxgui/python/constsink_gl.py +++ b/gr-wxgui/python/constsink_gl.py @@ -26,6 +26,7 @@ import const_window import common from gnuradio import gr from gnuradio import blocks +from gnuradio import analog from pubsub import pubsub from constants import * import sys @@ -100,7 +101,7 @@ class const_sink_c(gr.hier_block2, common.wxgui_hb): # gain_omega, # omega_limit, #) - agc = gr.feedforward_agc_cc(16, 1) + agc = analog.feedforward_agc_cc(16, 1) msgq = gr.msg_queue(2) sink = blocks.message_sink(gr.sizeof_gr_complex*const_size, msgq, True) #controller |