diff --git a/apps/fft-multi-decoder_fixed_dual-rtlsdr.grc b/apps/fft-multi-decoder_fixed_dual-rtlsdr.grc index ab84b20..4bd1c48 100644 --- a/apps/fft-multi-decoder_fixed_dual-rtlsdr.grc +++ b/apps/fft-multi-decoder_fixed_dual-rtlsdr.grc @@ -128,7 +128,7 @@ blocks: start: 86e6 step: 1e5 stop: 108e6 - value: 1007e5 + value: '104500000' widget: counter_slider states: bus_sink: false @@ -149,7 +149,7 @@ blocks: start: 86e6 step: 1e5 stop: 108e6 - value: '102300000' + value: '104500000' widget: counter_slider states: bus_sink: false @@ -170,7 +170,7 @@ blocks: start: 86e6 step: 1e5 stop: 108e6 - value: '101300000' + value: '104500000' widget: counter_slider states: bus_sink: false @@ -197,9 +197,9 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [440, 0] + coordinate: [480, -4.0] rotation: 0 - state: enabled + state: disabled - name: freq5 id: variable_qtgui_range parameters: @@ -218,9 +218,9 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [440, 96] + coordinate: [480, 92.0] rotation: 0 - state: enabled + state: disabled - name: freq_tune id: variable_qtgui_range parameters: @@ -233,7 +233,7 @@ blocks: start: 86e6 step: 1e5 stop: 108e6 - value: '101400000' + value: '104300000' widget: counter_slider states: bus_sink: false @@ -260,9 +260,9 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [144, 136] + coordinate: [144, 172.0] rotation: 0 - state: enabled + state: disabled - name: loop_bw id: variable_qtgui_range parameters: @@ -584,23 +584,6 @@ blocks: coordinate: [1517, 155] rotation: 0 state: enabled -- name: blocks_null_sink_0 - id: blocks_null_sink - parameters: - affinity: '' - alias: '' - bus_structure_sink: '[[0,],]' - comment: '' - num_inputs: '1' - type: complex - vlen: fft_len - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [552, 444.0] - rotation: 0 - state: true - name: blocks_null_source_0 id: blocks_null_source parameters: @@ -630,13 +613,13 @@ blocks: maxoutbuf: '0' minoutbuf: '0' num_outputs: '1' - type: complex - vlen: fft_len*10 + type: float + vlen: '1' states: bus_sink: false bus_source: false bus_structure: null - coordinate: [528, 620.0] + coordinate: [920, 144.0] rotation: 0 state: true - name: blocks_stream_to_vector_0 @@ -719,7 +702,7 @@ blocks: bus_structure: null coordinate: [1504, 636] rotation: 0 - state: enabled + state: disabled - name: fft_vxx_0 id: fft_vxx parameters: @@ -840,7 +823,7 @@ blocks: bus_structure: null coordinate: [712, 236.0] rotation: 0 - state: enabled + state: disabled - name: hier_ifft_decoder_0_0 id: hier_ifft_decoder parameters: @@ -862,7 +845,7 @@ blocks: bus_structure: null coordinate: [702, 391] rotation: 0 - state: enabled + state: disabled - name: hier_ifft_decoder_0_1 id: hier_ifft_decoder parameters: @@ -885,50 +868,6 @@ blocks: coordinate: [704, 544] rotation: 0 state: enabled -- name: hier_ifft_decoder_0_1_0 - id: hier_ifft_decoder - parameters: - affinity: '' - alias: '' - chan_fft_len: chan_fft_len - comment: '' - cutpoint: (freq4-freq_tune2)*fft_len/samp_rate-chan_fft_len/2+fft_len/2 - fft_len: fft_len - log: 'False' - loop_bw: 3.14/loop_bw - maxoutbuf: '0' - minoutbuf: '0' - num_zeros: num_zeros - samp_rate: int(samp_rate) - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [704, 680] - rotation: 0 - state: disabled -- name: hier_ifft_decoder_0_1_1 - id: hier_ifft_decoder - parameters: - affinity: '' - alias: '' - chan_fft_len: chan_fft_len - comment: '' - cutpoint: (freq5-freq_tune2)*fft_len/samp_rate-chan_fft_len/2+fft_len/2 - fft_len: fft_len - log: 'False' - loop_bw: 3.14/loop_bw - maxoutbuf: '0' - minoutbuf: '0' - num_zeros: num_zeros - samp_rate: int(samp_rate) - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [696, 816] - rotation: 0 - state: disabled - name: multirds_decoder_compare_0 id: multirds_decoder_compare parameters: @@ -956,7 +895,7 @@ blocks: log: 'False' maxoutbuf: '0' minoutbuf: '0' - nPorts: '3' + nPorts: '1' workdir: /media/clemens/teratemp/tmp/gr-multirds/data/ writeDB: 'False' states: @@ -985,7 +924,7 @@ blocks: bus_structure: null coordinate: [1856, 460.0] rotation: 0 - state: true + state: disabled - name: qtgui_const_sink_x_0 id: qtgui_const_sink_x parameters: @@ -1038,7 +977,7 @@ blocks: marker8: '0' marker9: '0' name: '""' - nconnections: '3' + nconnections: '1' size: '1024' style1: '0' style10: '0' @@ -1075,7 +1014,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [1080, 744.0] + coordinate: [1152, 712.0] rotation: 0 state: enabled - name: qtgui_freq_sink_x_0_0_1 @@ -1129,7 +1068,7 @@ blocks: maxoutbuf: '0' minoutbuf: '0' name: '""' - nconnections: '3' + nconnections: '1' showports: 'True' tr_chan: '0' tr_level: '0.0' @@ -1189,7 +1128,7 @@ blocks: color9: '"dark green"' comment: '' ctrlpanel: 'False' - fc: freq_tune2 + fc: freq_tune fftsize: 2048*2 freqhalf: 'True' grid: 'False' @@ -1289,7 +1228,7 @@ blocks: maxoutbuf: '0' minoutbuf: '0' name: '' - nconnections: '3' + nconnections: '1' showports: 'True' tr_chan: '0' tr_level: '0.0' @@ -2045,31 +1984,26 @@ connections: - [blocks_multiply_const_vxx_0_0_0, '0', blocks_add_xx_0_0, '1'] - [blocks_null_source_0, '0', blocks_stream_to_vector_0_0, '0'] - [blocks_null_source_0, '0', qtgui_freq_sink_x_0_0_1_0, '1'] -- [blocks_null_source_1, '0', hier_ifft_decoder_0, '0'] -- [blocks_null_source_1, '0', hier_ifft_decoder_0_0, '0'] -- [blocks_null_source_1, '0', hier_ifft_decoder_0_1, '0'] +- [blocks_null_source_1, '0', fir_filter_xxx_0_0, '0'] +- [blocks_null_source_1, '0', fir_filter_xxx_0_0_0, '0'] - [blocks_stream_to_vector_0, '0', fft_vxx_0, '0'] - [blocks_stream_to_vector_0_0, '0', fft_vxx_0_0, '0'] - [epy_block_0, out, multirds_rds_parser_table_qt_0_0, freq] -- [fft_vxx_0, '0', blocks_null_sink_0, '0'] +- [fft_vxx_0, '0', hier_ifft_decoder_0, '0'] +- [fft_vxx_0, '0', hier_ifft_decoder_0_0, '0'] +- [fft_vxx_0, '0', hier_ifft_decoder_0_1, '0'] - [fir_filter_xxx_0_0, '0', analog_fm_deemph_0_0, '0'] - [fir_filter_xxx_0_0_0, '0', analog_fm_deemph_0_0_0, '0'] - [fir_filter_xxx_0_0_0_0, '0', analog_fm_deemph_0_0_0_0, '0'] - [hier_ifft_decoder_0, '0', fir_filter_xxx_0_0, '0'] - [hier_ifft_decoder_0, '0', qtgui_freq_sink_x_0_0_1_2, '0'] -- [hier_ifft_decoder_0, '1', qtgui_freq_sink_x_0_0_1, '0'] -- [hier_ifft_decoder_0, '2', qtgui_const_sink_x_0, '0'] -- [hier_ifft_decoder_0, rds, multirds_rds_parser_table_qt_0_0, in0] +- [hier_ifft_decoder_0, rds, multirds_rds_parser_table_qt_0_0, in] - [hier_ifft_decoder_0_0, '0', fir_filter_xxx_0_0_0, '0'] -- [hier_ifft_decoder_0_0, '0', qtgui_freq_sink_x_0_0_1_2, '1'] -- [hier_ifft_decoder_0_0, '1', qtgui_freq_sink_x_0_0_1, '1'] -- [hier_ifft_decoder_0_0, '2', qtgui_const_sink_x_0, '1'] -- [hier_ifft_decoder_0_0, rds, multirds_rds_parser_table_qt_0_0, in1] - [hier_ifft_decoder_0_1, '0', fir_filter_xxx_0_0_0_0, '0'] -- [hier_ifft_decoder_0_1, '0', qtgui_freq_sink_x_0_0_1_2, '2'] -- [hier_ifft_decoder_0_1, '1', qtgui_freq_sink_x_0_0_1, '2'] -- [hier_ifft_decoder_0_1, '2', qtgui_const_sink_x_0, '2'] -- [hier_ifft_decoder_0_1, rds, multirds_rds_parser_table_qt_0_0, in2] +- [hier_ifft_decoder_0_1, '0', qtgui_freq_sink_x_0_0_1_2, '0'] +- [hier_ifft_decoder_0_1, '1', qtgui_freq_sink_x_0_0_1, '0'] +- [hier_ifft_decoder_0_1, '2', qtgui_const_sink_x_0, '0'] +- [hier_ifft_decoder_0_1, rds, multirds_rds_parser_table_qt_0_0, in] - [multirds_rds_parser_table_qt_0_0, tmc_raw, multirds_tmc_parser_0, in] - [rtlsdr_source_0, '0', blocks_stream_to_vector_0, '0'] - [rtlsdr_source_0, '0', qtgui_freq_sink_x_0_0_1_0, '0'] diff --git a/apps/ifft-RDS-decoder_hier-block.grc b/apps/ifft-RDS-decoder_hier-block.grc index 3b2322f..27eb345 100644 --- a/apps/ifft-RDS-decoder_hier-block.grc +++ b/apps/ifft-RDS-decoder_hier-block.grc @@ -148,7 +148,7 @@ blocks: bus_structure: null coordinate: [1128, 240.0] rotation: 0 - state: disabled + state: enabled - name: blocks_file_sink_0 id: blocks_file_sink parameters: @@ -220,7 +220,7 @@ blocks: bus_structure: null coordinate: [1376, 360.0] rotation: 0 - state: disabled + state: enabled - name: blocks_vector_to_stream_0_0_1 id: blocks_vector_to_stream parameters: @@ -287,7 +287,7 @@ blocks: bus_structure: null coordinate: [1112, 480.0] rotation: 180 - state: disabled + state: enabled - name: digital_clock_recovery_mm_xx_0 id: digital_clock_recovery_mm_xx parameters: @@ -308,7 +308,7 @@ blocks: bus_structure: null coordinate: [888, 204.0] rotation: 0 - state: disabled + state: enabled - name: digital_costas_loop_cc_0 id: digital_costas_loop_cc parameters: @@ -326,7 +326,7 @@ blocks: bus_structure: null coordinate: [704, 160.0] rotation: 0 - state: disabled + state: enabled - name: digital_diff_decoder_bb_0 id: digital_diff_decoder_bb parameters: @@ -342,7 +342,7 @@ blocks: bus_structure: null coordinate: [920, 476.0] rotation: 180 - state: disabled + state: enabled - name: fft_len id: parameter parameters: @@ -400,7 +400,7 @@ blocks: bus_structure: null coordinate: [463, 231] rotation: 270 - state: disabled + state: enabled - name: log id: parameter parameters: @@ -439,7 +439,7 @@ blocks: bus_structure: null coordinate: [1200, 8] rotation: 0 - state: enabled + state: disabled - name: loop_bw id: parameter parameters: @@ -478,7 +478,24 @@ blocks: bus_structure: null coordinate: [1384, 16] rotation: 0 - state: enabled + state: disabled +- name: multirds_rds_decoder_0 + id: multirds_rds_decoder + parameters: + affinity: '' + alias: '' + comment: '' + debug: 'False' + log: 'False' + maxoutbuf: '0' + minoutbuf: '0' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [1152, 628.0] + rotation: 0 + state: disabled - name: multirds_rds_decoder_redsea_0 id: multirds_rds_decoder_redsea parameters: @@ -487,6 +504,8 @@ blocks: comment: '' debug: 'False' log: 'False' + maxoutbuf: '0' + minoutbuf: '0' states: bus_sink: false bus_source: false @@ -618,7 +637,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [934, 123] + coordinate: [1008, 340.0] rotation: 0 state: enabled - name: pad_source_0 @@ -658,9 +677,26 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [184, 92.0] + coordinate: [928, 20.0] rotation: 0 - state: bypassed + state: disabled +- name: rds_decoder_0 + id: rds_decoder + parameters: + affinity: '' + alias: '' + comment: '' + debug: 'False' + log: 'False' + maxoutbuf: '0' + minoutbuf: '0' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [1392, 672.0] + rotation: 0 + state: true - name: root_raised_cosine_filter_0 id: root_raised_cosine_filter parameters: @@ -683,7 +719,7 @@ blocks: bus_structure: null coordinate: [551, 207] rotation: 90 - state: disabled + state: enabled - name: samp_rate id: parameter parameters: @@ -712,20 +748,27 @@ connections: - [blocks_complex_to_real_0, '0', multirds_symbol_combiner_0, '0'] - [blocks_keep_one_in_n_0, '0', blocks_file_sink_0_0_0, '0'] - [blocks_keep_one_in_n_0, '0', digital_binary_slicer_fb_0, '0'] +- [blocks_vector_to_stream_0_0_1, '0', analog_wfm_rcv_0_0, '0'] +- [blocks_vector_to_stream_0_0_1, '0', pad_sink_0_1, '0'] - [blocks_vector_to_stream_0_0_1, '0', rational_resampler_xxx_0, '0'] - [digital_binary_slicer_fb_0, '0', digital_diff_decoder_bb_0, '0'] - [digital_clock_recovery_mm_xx_0, '0', blocks_complex_to_real_0, '0'] - [digital_clock_recovery_mm_xx_0, '0', pad_sink_1, '0'] - [digital_costas_loop_cc_0, '0', digital_clock_recovery_mm_xx_0, '0'] +- [digital_diff_decoder_bb_0, '0', multirds_rds_decoder_0, '0'] - [digital_diff_decoder_bb_0, '0', multirds_rds_decoder_redsea_0, '0'] +- [digital_diff_decoder_bb_0, '0', rds_decoder_0, '0'] - [fft_vxx_1_1, '0', blocks_vector_to_stream_0_0_1, '0'] - [freq_xlating_fir_filter_xxx_1, '0', root_raised_cosine_filter_0, '0'] - [logpwrfft_x_0, '0', multirds_pilot_SNR_0, '0'] - [multirds_pilot_SNR_0, out, pad_sink_0_0, in] +- [multirds_rds_decoder_0, out, pad_sink_0_0, in] +- [multirds_rds_decoder_redsea_0, out, pad_sink_0_0, in] - [multirds_vector_cutter_0_0, '0', fft_vxx_1_1, '0'] - [pad_source_0, '0', multirds_vector_cutter_0_0, '0'] - [rational_resampler_xxx_0, '0', analog_wfm_rcv_0_0, '0'] - [rational_resampler_xxx_0, '0', pad_sink_0_1, '0'] +- [rds_decoder_0, out, pad_sink_0_0, in] - [root_raised_cosine_filter_0, '0', digital_costas_loop_cc_0, '0'] metadata: diff --git a/grc/multirds_rds_decoder.block.yml b/grc/multirds_rds_decoder.block.yml index 770f34d..3422f55 100644 --- a/grc/multirds_rds_decoder.block.yml +++ b/grc/multirds_rds_decoder.block.yml @@ -2,19 +2,25 @@ id: multirds_rds_decoder label: Rds decoder -category: '[MULTIRDS]' +category: '[multirds]' parameters: - id: log label: Log - dtype: raw + dtype: bool + default: 'False' - id: debug label: Debug - dtype: raw + dtype: bool + default: 'False' inputs: - domain: stream dtype: byte +outputs: +- domain: message + optional: true + templates: imports: import multirds diff --git a/grc/multirds_rds_decoder_redsea.block.yml b/grc/multirds_rds_decoder_redsea.block.yml index e6c4c0c..7dd7c3d 100644 --- a/grc/multirds_rds_decoder_redsea.block.yml +++ b/grc/multirds_rds_decoder_redsea.block.yml @@ -2,19 +2,24 @@ id: multirds_rds_decoder_redsea label: Rds decoder redsea -category: '[MULTIRDS]' +category: '[multirds]' parameters: - id: log label: Log - dtype: raw + dtype: bool + default: 'False' - id: debug label: Debug - dtype: raw + dtype: bool + default: 'False' inputs: - domain: stream dtype: byte +outputs: +- domain: message + optional: true templates: imports: import multirds