From 0544ed5ae2c17d42e2a97ba0fcd1bf7b4a651b0d Mon Sep 17 00:00:00 2001 From: Jens Ahrensfeld Date: Tue, 8 Jan 2019 16:21:00 +0000 Subject: [PATCH] - changes git-svn-id: http://moon:8086/svn/software/trunk/projects/GnuRadio@391 b431acfa-c32f-4a4a-93f1-934dc6c82436 --- fm_rx.grc | 1068 +++++++++++++++++++++++++++++++++++++++++++++++++++- garage.grc | 2 +- kfz.grc | 2 +- 3 files changed, 1066 insertions(+), 6 deletions(-) diff --git a/fm_rx.grc b/fm_rx.grc index c3e60b0..cf47cad 100644 --- a/fm_rx.grc +++ b/fm_rx.grc @@ -359,7 +359,7 @@ value - -3e3 + 0 _enabled @@ -379,7 +379,7 @@ id - f_fine + f_fine_rx label @@ -406,6 +406,65 @@ wx.SL_HORIZONTAL + + variable_slider + + comment + + + + converver + float_converter + + + value + 0 + + + _enabled + True + + + _coordinate + (48, 868) + + + _rotation + 0 + + + grid_pos + + + + id + f_fine_tx + + + label + + + + max + samp_rate/2 + + + min + -samp_rate/2 + + + notebook + + + + num_steps + samp_rate/5000 + + + style + wx.SL_HORIZONTAL + + variable @@ -430,7 +489,7 @@ value - f_ctr + offset_Hz + f_fine + f_ctr + offset_Hz @@ -840,7 +899,7 @@ freq - offset_Hz + offset_Hz + f_fine_rx _coordinate @@ -942,6 +1001,69 @@ analog.GR_COS_WAVE + + analog_sig_source_x + + amp + 0.5 + + + alias + + + + comment + + + + affinity + + + + _enabled + True + + + freq + f_fine_tx + + + _coordinate + (112, 1012) + + + _rotation + 0 + + + id + analog_sig_source_x_0_1 + + + maxoutbuf + 0 + + + minoutbuf + 0 + + + offset + 0 + + + type + complex + + + samp_rate + samp_rate + + + waveform + analog.GR_COS_WAVE + + audio_sink @@ -2475,6 +2597,829 @@ fff + + uhd_usrp_sink + + alias + + + + ant0 + TX/RX + + + bw0 + 0 + + + center_freq0 + f_tune + + + norm_gain0 + False + + + gain0 + 40 + + + ant10 + + + + bw10 + 0 + + + center_freq10 + 0 + + + norm_gain10 + False + + + gain10 + 0 + + + ant11 + + + + bw11 + 0 + + + center_freq11 + 0 + + + norm_gain11 + False + + + gain11 + 0 + + + ant12 + + + + bw12 + 0 + + + center_freq12 + 0 + + + norm_gain12 + False + + + gain12 + 0 + + + ant13 + + + + bw13 + 0 + + + center_freq13 + 0 + + + norm_gain13 + False + + + gain13 + 0 + + + ant14 + + + + bw14 + 0 + + + center_freq14 + 0 + + + norm_gain14 + False + + + gain14 + 0 + + + ant15 + + + + bw15 + 0 + + + center_freq15 + 0 + + + norm_gain15 + False + + + gain15 + 0 + + + ant16 + + + + bw16 + 0 + + + center_freq16 + 0 + + + norm_gain16 + False + + + gain16 + 0 + + + ant17 + + + + bw17 + 0 + + + center_freq17 + 0 + + + norm_gain17 + False + + + gain17 + 0 + + + ant18 + + + + bw18 + 0 + + + center_freq18 + 0 + + + norm_gain18 + False + + + gain18 + 0 + + + ant19 + + + + bw19 + 0 + + + center_freq19 + 0 + + + norm_gain19 + False + + + gain19 + 0 + + + ant1 + + + + bw1 + 0 + + + center_freq1 + 0 + + + norm_gain1 + False + + + gain1 + 0 + + + ant20 + + + + bw20 + 0 + + + center_freq20 + 0 + + + norm_gain20 + False + + + gain20 + 0 + + + ant21 + + + + bw21 + 0 + + + center_freq21 + 0 + + + norm_gain21 + False + + + gain21 + 0 + + + ant22 + + + + bw22 + 0 + + + center_freq22 + 0 + + + norm_gain22 + False + + + gain22 + 0 + + + ant23 + + + + bw23 + 0 + + + center_freq23 + 0 + + + norm_gain23 + False + + + gain23 + 0 + + + ant24 + + + + bw24 + 0 + + + center_freq24 + 0 + + + norm_gain24 + False + + + gain24 + 0 + + + ant25 + + + + bw25 + 0 + + + center_freq25 + 0 + + + norm_gain25 + False + + + gain25 + 0 + + + ant26 + + + + bw26 + 0 + + + center_freq26 + 0 + + + norm_gain26 + False + + + gain26 + 0 + + + ant27 + + + + bw27 + 0 + + + center_freq27 + 0 + + + norm_gain27 + False + + + gain27 + 0 + + + ant28 + + + + bw28 + 0 + + + center_freq28 + 0 + + + norm_gain28 + False + + + gain28 + 0 + + + ant29 + + + + bw29 + 0 + + + center_freq29 + 0 + + + norm_gain29 + False + + + gain29 + 0 + + + ant2 + + + + bw2 + 0 + + + center_freq2 + 0 + + + norm_gain2 + False + + + gain2 + 0 + + + ant30 + + + + bw30 + 0 + + + center_freq30 + 0 + + + norm_gain30 + False + + + gain30 + 0 + + + ant31 + + + + bw31 + 0 + + + center_freq31 + 0 + + + norm_gain31 + False + + + gain31 + 0 + + + ant3 + + + + bw3 + 0 + + + center_freq3 + 0 + + + norm_gain3 + False + + + gain3 + 0 + + + ant4 + + + + bw4 + 0 + + + center_freq4 + 0 + + + norm_gain4 + False + + + gain4 + 0 + + + ant5 + + + + bw5 + 0 + + + center_freq5 + 0 + + + norm_gain5 + False + + + gain5 + 0 + + + ant6 + + + + bw6 + 0 + + + center_freq6 + 0 + + + norm_gain6 + False + + + gain6 + 0 + + + ant7 + + + + bw7 + 0 + + + center_freq7 + 0 + + + norm_gain7 + False + + + gain7 + 0 + + + ant8 + + + + bw8 + 0 + + + center_freq8 + 0 + + + norm_gain8 + False + + + gain8 + 0 + + + ant9 + + + + bw9 + 0 + + + center_freq9 + 0 + + + norm_gain9 + False + + + gain9 + 0 + + + clock_rate + 0.0 + + + comment + + + + affinity + + + + dev_addr + "" + + + dev_args + "" + + + _enabled + True + + + _coordinate + (336, 996) + + + _rotation + 0 + + + id + uhd_usrp_sink_0 + + + type + fc32 + + + clock_source0 + + + + sd_spec0 + + + + time_source0 + + + + clock_source1 + + + + sd_spec1 + + + + time_source1 + + + + clock_source2 + + + + sd_spec2 + + + + time_source2 + + + + clock_source3 + + + + sd_spec3 + + + + time_source3 + + + + clock_source4 + + + + sd_spec4 + + + + time_source4 + + + + clock_source5 + + + + sd_spec5 + + + + time_source5 + + + + clock_source6 + + + + sd_spec6 + + + + time_source6 + + + + clock_source7 + + + + sd_spec7 + + + + time_source7 + + + + nchan + 1 + + + num_mboards + 1 + + + samp_rate + samp_rate + + + hide_cmd_port + False + + + hide_lo_controls + True + + + stream_args + + + + stream_chans + [] + + + sync + + + + len_tag_name + + + + otw + + + uhd_usrp_source @@ -4084,6 +5029,109 @@ audio_L-R + + wxgui_fftsink2 + + avg_alpha + 0 + + + average + False + + + baseband_freq + f_tune + + + alias + + + + comment + + + + affinity + + + + _enabled + True + + + fft_size + 1024 + + + freqvar + None + + + _coordinate + (416, 124) + + + _rotation + 0 + + + grid_pos + + + + id + wxgui_fftsink2_0 + + + notebook + + + + peak_hold + False + + + ref_level + 0 + + + ref_scale + 2.0 + + + fft_rate + 15 + + + samp_rate + samp_rate + + + title + FFT Plot + + + type + complex + + + win_size + + + + win + None + + + y_divs + 10 + + + y_per_div + 10 + + wxgui_fftsink2 @@ -4670,6 +5718,12 @@ 0 1 + + analog_sig_source_x_0_1 + uhd_usrp_sink_0 + 0 + 0 + band_pass_filter_0 blocks_add_xx_1 @@ -4880,6 +5934,12 @@ 0 0 + + uhd_usrp_source_0 + wxgui_fftsink2_0 + 0 + 0 + virtual_source_0 blocks_conjugate_cc_0 diff --git a/garage.grc b/garage.grc index e25b933..d0954bc 100644 --- a/garage.grc +++ b/garage.grc @@ -837,7 +837,7 @@ kThreshold - 0.05 + 0.02 diff --git a/kfz.grc b/kfz.grc index 1e2137e..e0af848 100644 --- a/kfz.grc +++ b/kfz.grc @@ -113,7 +113,7 @@ value - 2000 + 4000