diff --git a/grc/hamnet70_demod_sc16qam.grc b/grc/hamnet70_demod_sc16qam.grc index 8047fff..8cd9e38 100644 --- a/grc/hamnet70_demod_sc16qam.grc +++ b/grc/hamnet70_demod_sc16qam.grc @@ -117,7 +117,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [734, 706] + coordinate: [736, 684.0] rotation: 0 state: enabled - name: header_mod @@ -175,6 +175,22 @@ blocks: coordinate: [846, 11] rotation: 0 state: enabled +- name: payload_dec + id: variable_dummy_decoder_def + parameters: + comment: '' + dim1: '1' + dim2: '1' + framebits: 8*(MTU+4)*2 + ndim: '0' + value: '"ok"' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [848, 204.0] + rotation: 0 + state: disabled - name: payload_mod id: variable_constellation parameters: @@ -347,7 +363,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [63, 371] + coordinate: [64, 252.0] rotation: 0 state: enabled - name: blocks_add_const_vxx_0 @@ -402,7 +418,7 @@ blocks: bus_structure: null coordinate: [1188, 1316] rotation: 0 - state: enabled + state: disabled - name: blocks_multiply_xx_0 id: blocks_multiply_xx parameters: @@ -438,7 +454,26 @@ blocks: bus_structure: null coordinate: [1324, 1320] rotation: 0 - state: enabled + state: disabled +- name: blocks_null_source_0 + id: blocks_null_source + parameters: + affinity: '' + alias: '' + bus_structure_source: '[[0,],]' + comment: '' + maxoutbuf: '0' + minoutbuf: '0' + num_outputs: '1' + type: float + vlen: '1' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [1344, 1240.0] + rotation: 0 + state: true - name: blocks_repack_bits_bb_0 id: blocks_repack_bits_bb parameters: @@ -495,7 +530,7 @@ blocks: bus_structure: null coordinate: [917, 1368] rotation: 0 - state: enabled + state: disabled - name: blocks_rms_xx_0_0 id: blocks_rms_xx parameters: @@ -512,7 +547,7 @@ blocks: bus_structure: null coordinate: [1037, 1288] rotation: 0 - state: enabled + state: disabled - name: blocks_sub_xx_0 id: blocks_sub_xx parameters: @@ -530,7 +565,7 @@ blocks: bus_structure: null coordinate: [917, 1276] rotation: 0 - state: enabled + state: disabled - name: blocks_tagged_stream_multiply_length_0 id: blocks_tagged_stream_multiply_length parameters: @@ -567,6 +602,23 @@ blocks: coordinate: [2258, 921] rotation: 0 state: enabled +- name: blocks_tagged_stream_to_pdu_1_0_0_0 + id: blocks_tagged_stream_to_pdu + parameters: + affinity: '' + alias: '' + comment: '' + maxoutbuf: '0' + minoutbuf: '0' + tag: packet_len + type: float + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [1872, 1100.0] + rotation: 0 + state: disabled - name: digital_chunks_to_symbols_xx_0 id: digital_chunks_to_symbols_xx parameters: @@ -586,7 +638,7 @@ blocks: bus_structure: null coordinate: [1262, 1122] rotation: 0 - state: enabled + state: disabled - name: digital_constellation_decoder_cb_0 id: digital_constellation_decoder_cb parameters: @@ -616,8 +668,8 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [918, 850] - rotation: 0 + coordinate: [728, 756.0] + rotation: 180 state: enabled - name: digital_constellation_soft_decoder_cf_0 id: digital_constellation_soft_decoder_cf @@ -647,7 +699,7 @@ blocks: sps: sps symbols: filtered_preamble threshold: '0.999' - threshold_method: digital.THRESHOLD_ABSOLUTE + threshold_method: digital.THRESHOLD_DYNAMIC states: bus_sink: false bus_source: false @@ -670,7 +722,7 @@ blocks: bus_structure: null coordinate: [2465, 921] rotation: 0 - state: enabled + state: bypassed - name: digital_header_payload_demux_0 id: digital_header_payload_demux parameters: @@ -694,7 +746,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [479, 842] + coordinate: [472, 844.0] rotation: 0 state: enabled - name: digital_packet_headerparser_b_0 @@ -710,7 +762,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [726, 770] + coordinate: [480, 756.0] rotation: 180 state: enabled - name: digital_pfb_clock_sync_xxx_0 @@ -736,6 +788,25 @@ blocks: coordinate: [790, 355] rotation: 0 state: enabled +- name: fec_async_decoder_0 + id: fec_async_decoder + parameters: + affinity: '' + alias: '' + comment: '' + decoder: payload_dec + maxoutbuf: '0' + minoutbuf: '0' + mtu: 8*(MTU+4)*2 + packed: 'True' + rev_pack: 'True' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [2104, 1092.0] + rotation: 0 + state: disabled - name: fec_extended_tagged_decoder_0 id: fec_extended_tagged_decoder parameters: @@ -747,7 +818,7 @@ blocks: lentagname: packet_len maxoutbuf: '0' minoutbuf: '0' - mtu: 8*(MTU+4)*2 + mtu: MTU puncpat: '''11''' value: fec_extended_decoder states: @@ -841,7 +912,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [231, 858] + coordinate: [224, 860.0] rotation: 0 state: enabled - name: hamnet70_pid_controller_0 @@ -879,7 +950,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [670, 1074] + coordinate: [776, 908.0] rotation: 0 state: enabled - name: import_0 @@ -1002,7 +1073,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [79, 482] + coordinate: [80, 436.0] rotation: 0 state: enabled - name: samp_rate @@ -1045,7 +1116,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [31, 874] + coordinate: [16, 876.0] rotation: 0 state: enabled @@ -1053,11 +1124,13 @@ connections: - [analog_agc_xx_0, '0', pad_sink_1, '0'] - [analog_agc_xx_0, '0', virtual_sink_0, '0'] - [analog_sig_source_x_0, '0', blocks_multiply_xx_0, '0'] +- [blocks_add_const_vxx_0, '0', blocks_tagged_stream_to_pdu_1_0_0_0, '0'] - [blocks_add_const_vxx_0, '0', fec_extended_tagged_decoder_0, '0'] - [blocks_char_to_float_0, '0', blocks_add_const_vxx_0, '0'] - [blocks_divide_xx_0, '0', blocks_nlog10_ff_0, '0'] - [blocks_multiply_xx_0, '0', digital_corr_est_cc_0, '0'] - [blocks_nlog10_ff_0, '0', pad_sink_3, '0'] +- [blocks_null_source_0, '0', pad_sink_3, '0'] - [blocks_repack_bits_bb_0, '0', blocks_char_to_float_0, '0'] - [blocks_repack_bits_bb_0_0, '0', blocks_tagged_stream_to_pdu_1_0_0, '0'] - [blocks_rms_xx_0, '0', blocks_divide_xx_0, '0'] @@ -1065,6 +1138,7 @@ connections: - [blocks_sub_xx_0, '0', blocks_rms_xx_0_0, '0'] - [blocks_tagged_stream_multiply_length_0, '0', fec_extended_tagged_decoder_0, '0'] - [blocks_tagged_stream_to_pdu_1_0_0, pdus, digital_crc32_async_bb_0, in] +- [blocks_tagged_stream_to_pdu_1_0_0_0, pdus, fec_async_decoder_0, in] - [digital_chunks_to_symbols_xx_0, '0', blocks_sub_xx_0, '1'] - [digital_constellation_decoder_cb_0, '0', blocks_repack_bits_bb_0, '0'] - [digital_constellation_decoder_cb_0, '0', digital_chunks_to_symbols_xx_0, '0'] @@ -1079,6 +1153,7 @@ connections: - [digital_packet_headerparser_b_0, header_data, digital_header_payload_demux_0, header_data] - [digital_pfb_clock_sync_xxx_0, '0', hamnet70_correct_phase_from_tag_0, '0'] - [digital_pfb_clock_sync_xxx_0, '0', hamnet70_freq_est_lr_0, '0'] +- [fec_async_decoder_0, out, digital_crc32_async_bb_0, in] - [fec_extended_tagged_decoder_0, '0', blocks_repack_bits_bb_0_0, '0'] - [hamnet70_async_scrambler_0, pdu_out, pad_sink_2, in] - [hamnet70_correct_frequency_from_pilot_syms_0, '0', analog_agc_xx_0, '0'] diff --git a/grc/hamnet70_mod_sc16qam.grc b/grc/hamnet70_mod_sc16qam.grc index 2d4aca1..bee9e8e 100644 --- a/grc/hamnet70_mod_sc16qam.grc +++ b/grc/hamnet70_mod_sc16qam.grc @@ -65,6 +65,21 @@ blocks: coordinate: [862, 11] rotation: 0 state: enabled +- name: fec_enc + id: variable_dummy_encoder_def + parameters: + comment: '' + dim1: '1' + dim2: '1' + framebits: 8*(MTU+4)*2 + ndim: '0' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [864, 188.0] + rotation: 0 + state: disabled - name: header_format_tx id: variable parameters: @@ -190,6 +205,19 @@ blocks: coordinate: [311, 11] rotation: 0 state: enabled +- name: blocks_message_debug_0 + id: blocks_message_debug + parameters: + affinity: '' + alias: '' + comment: '' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [536, 240.0] + rotation: 0 + state: disabled - name: blocks_pdu_to_tagged_stream_0 id: blocks_pdu_to_tagged_stream parameters: @@ -197,7 +225,7 @@ blocks: alias: '' comment: '' maxoutbuf: '0' - minoutbuf: base_buffer_size + minoutbuf: '0' tag: packet_len type: byte states: @@ -219,7 +247,7 @@ blocks: l: payload_mod.bits_per_symbol() len_tag_key: '"packet_len"' maxoutbuf: '0' - minoutbuf: base_buffer_size + minoutbuf: '0' states: bus_sink: false bus_source: false @@ -239,7 +267,7 @@ blocks: l: header_mod.bits_per_symbol() len_tag_key: '"packet_len"' maxoutbuf: '0' - minoutbuf: base_buffer_size + minoutbuf: '0' states: bus_sink: false bus_source: false @@ -255,7 +283,7 @@ blocks: comment: '' lengthtagname: '"packet_len"' maxoutbuf: '0' - minoutbuf: base_buffer_size + minoutbuf: '0' ninputs: '3' tag_preserve_head_pos: '0' type: complex @@ -284,7 +312,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [1709, 251] + coordinate: [1712, 260.0] rotation: 0 state: enabled - name: digital_chunks_to_symbols_xx_0 @@ -316,7 +344,7 @@ blocks: dimension: '1' in_type: byte maxoutbuf: '0' - minoutbuf: base_buffer_size + minoutbuf: '0' num_ports: '1' out_type: complex symbol_table: header_mod.points() @@ -342,7 +370,7 @@ blocks: bus_structure: null coordinate: [351, 394] rotation: 0 - state: enabled + state: bypassed - name: digital_map_bb_0 id: digital_map_bb parameters: @@ -437,7 +465,7 @@ blocks: comment: '' length_tag: packet_len maxoutbuf: '0' - minoutbuf: base_buffer_size + minoutbuf: '0' offsets: '[len(preamble)+pilot_offset]' pilot_sequence: pilot_sequence states: @@ -456,7 +484,7 @@ blocks: interleaver_width: '64' length_tag: packet_len maxoutbuf: '0' - minoutbuf: base_buffer_size + minoutbuf: '0' operation: interleave states: bus_sink: false @@ -588,6 +616,7 @@ connections: - [blocks_vector_source_x_0, '0', blocks_tagged_stream_mux_0, '0'] - [digital_chunks_to_symbols_xx_0, '0', hamnet70_symbol_interleaver_0, '0'] - [digital_chunks_to_symbols_xx_0_0, '0', blocks_tagged_stream_mux_0, '1'] +- [digital_crc32_async_bb_0, out, blocks_message_debug_0, print_pdu] - [digital_crc32_async_bb_0, out, fec_async_encoder_0, in] - [digital_map_bb_0, '0', digital_chunks_to_symbols_xx_0, '0'] - [digital_map_bb_0_0, '0', digital_chunks_to_symbols_xx_0_0, '0'] diff --git a/tmp/test_sc16qam.grc b/tmp/test_sc16qam.grc index cfa956e..caf2946 100644 --- a/tmp/test_sc16qam.grc +++ b/tmp/test_sc16qam.grc @@ -182,9 +182,9 @@ blocks: maxoutbuf: '0' minoutbuf: '0' repeat: 'True' - tags: tagged_streams.make_lengthtags((1000,), (0,), "packet_len") + tags: tagged_streams.make_lengthtags((104,), (0,), "packet_len") type: byte - vector: '[x%256 for x in range(1000)]' + vector: bytes([x%256 for x in range(104)]) vlen: '1' states: bus_sink: false @@ -376,7 +376,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [1392, 172.0] + coordinate: [1528, 172.0] rotation: 0 state: enabled - name: qtgui_number_sink_0 @@ -659,7 +659,7 @@ blocks: bus_structure: null coordinate: [1536, 260.0] rotation: 0 - state: disabled + state: enabled - name: qtgui_time_sink_x_0_0 id: qtgui_time_sink_x parameters: @@ -713,10 +713,10 @@ blocks: marker7: '-1' marker8: '-1' marker9: '-1' - name: '""' + name: '"Correlation"' nconnections: '1' size: '1024' - srate: samp_rate + srate: samp_rate/2 stemplot: 'False' style1: '1' style10: '1' @@ -729,7 +729,7 @@ blocks: style8: '1' style9: '1' tr_chan: '0' - tr_delay: 10/150e3 + tr_delay: 30/150e3 tr_level: '0.0' tr_mode: qtgui.TRIG_MODE_TAG tr_slope: qtgui.TRIG_SLOPE_POS @@ -754,7 +754,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [1184, 284.0] + coordinate: [1192, 172.0] rotation: 0 state: enabled @@ -766,12 +766,12 @@ connections: - [blocks_vector_source_x_0_0_0, '0', blocks_throttle_0_0, '0'] - [channels_channel_model_0, '0', hamnet70_demod_sc16qam_0, '0'] - [channels_channel_model_0, '0', qtgui_sink_x_0, '0'] -- [hamnet70_demod_sc16qam_0, '0', qtgui_const_sink_x_0, '0'] +- [hamnet70_demod_sc16qam_0, '0', qtgui_time_sink_x_0_0, '0'] +- [hamnet70_demod_sc16qam_0, '1', qtgui_const_sink_x_0, '0'] - [hamnet70_demod_sc16qam_0, '1', qtgui_sink_x_1, '0'] - [hamnet70_demod_sc16qam_0, '1', qtgui_time_sink_x_0, '0'] -- [hamnet70_demod_sc16qam_0, '1', qtgui_time_sink_x_0_0, '0'] -- [hamnet70_demod_sc16qam_0, '2', qtgui_number_sink_0_0, '0'] -- [hamnet70_demod_sc16qam_0, '3', qtgui_number_sink_0, '0'] +- [hamnet70_demod_sc16qam_0, '2', qtgui_number_sink_0, '0'] +- [hamnet70_demod_sc16qam_0, '3', qtgui_number_sink_0_0, '0'] - [hamnet70_demod_sc16qam_0, pdu_out, blocks_message_debug_0, print_pdu] - [hamnet70_mod_sc16qam_0, '0', blocks_throttle_0, '0']