diff --git a/grc/hamnet70_demod_sc16qam.grc b/grc/hamnet70_demod_sc16qam.grc index 05cf065..2169736 100644 --- a/grc/hamnet70_demod_sc16qam.grc +++ b/grc/hamnet70_demod_sc16qam.grc @@ -140,7 +140,7 @@ value - digital.packet_header_default(64) + digital.packet_header_default(32) @@ -785,6 +785,57 @@ 1 + + blocks_divide_xx + + alias + + + + comment + + + + affinity + + + + _enabled + True + + + _coordinate + (1188, 1316) + + + _rotation + 0 + + + id + blocks_divide_xx_0 + + + type + float + + + maxoutbuf + 0 + + + minoutbuf + 0 + + + num_inputs + 2 + + + vlen + 1 + + blocks_multiply_xx @@ -836,6 +887,57 @@ 1 + + blocks_nlog10_ff + + alias + + + + comment + + + + affinity + + + + _enabled + True + + + _coordinate + (1324, 1320) + + + _rotation + 0 + + + id + blocks_nlog10_ff_0 + + + maxoutbuf + 0 + + + minoutbuf + 0 + + + vlen + 1 + + + k + 0 + + + n + 20 + + blocks_repack_bits_bb @@ -954,6 +1056,151 @@ False + + blocks_rms_xx + + alpha + 0.0001 + + + alias + + + + comment + + + + affinity + + + + _enabled + True + + + _coordinate + (917, 1368) + + + _rotation + 0 + + + id + blocks_rms_xx_0 + + + type + complex + + + maxoutbuf + 0 + + + minoutbuf + 0 + + + + blocks_rms_xx + + alpha + 0.0001 + + + alias + + + + comment + + + + affinity + + + + _enabled + True + + + _coordinate + (1037, 1288) + + + _rotation + 0 + + + id + blocks_rms_xx_0_0 + + + type + complex + + + maxoutbuf + 0 + + + minoutbuf + 0 + + + + blocks_sub_xx + + alias + + + + comment + + + + affinity + + + + _enabled + True + + + _coordinate + (917, 1276) + + + _rotation + 0 + + + id + blocks_sub_xx_0 + + + type + complex + + + maxoutbuf + 0 + + + minoutbuf + 0 + + + num_inputs + 2 + + + vlen + 1 + + blocks_tagged_stream_multiply_length @@ -1029,7 +1276,7 @@ _coordinate - (2244, 922) + (2258, 921) _rotation @@ -1056,6 +1303,65 @@ 0 + + digital_chunks_to_symbols_xx + + alias + + + + comment + + + + affinity + + + + dimension + 1 + + + _enabled + 1 + + + _coordinate + (1156, 1121) + + + _rotation + 0 + + + id + digital_chunks_to_symbols_xx_0 + + + in_type + byte + + + maxoutbuf + 0 + + + minoutbuf + 0 + + + num_ports + 1 + + + out_type + complex + + + symbol_table + payload_mod.points() + + digital_constellation_decoder_cb @@ -1237,7 +1543,7 @@ threshold - 0.995 + 0.997 @@ -1260,7 +1566,7 @@ _coordinate - (2460, 922) + (2465, 921) _rotation @@ -1315,7 +1621,7 @@ header_len - 64 + 32 header_padding @@ -1543,6 +1849,53 @@ fec_extended_decoder + + hamnet70_async_scrambler + + alias + + + + comment + + + + affinity + + + + _enabled + 1 + + + _coordinate + (2649, 913) + + + _rotation + 0 + + + id + hamnet70_async_scrambler_0 + + + maxoutbuf + 0 + + + minoutbuf + 0 + + + polynom + 0x38 + + + start + 0xFF + + hamnet70_correct_phase_from_tag @@ -1872,7 +2225,7 @@ _coordinate - (2619, 922) + (2832, 921) _rotation @@ -1903,6 +2256,92 @@ 1 + + pad_sink + + comment + + + + _enabled + True + + + _coordinate + (1476, 1328) + + + _rotation + 0 + + + id + pad_sink_3 + + + type + float + + + label + SNR + + + num_streams + 1 + + + optional + True + + + vlen + 1 + + + + pad_sink + + comment + + + + _enabled + True + + + _coordinate + (1284, 163) + + + _rotation + 0 + + + id + pad_sink_4 + + + type + float + + + label + freq_est + + + num_streams + 1 + + + optional + False + + + vlen + 1 + + pad_source @@ -1915,7 +2354,7 @@ _coordinate - (95, 483) + (79, 482) _rotation @@ -2077,12 +2516,24 @@ 0 0 + + blocks_divide_xx_0 + blocks_nlog10_ff_0 + 0 + 0 + blocks_multiply_xx_0 digital_corr_est_cc_0 0 0 + + blocks_nlog10_ff_0 + pad_sink_3 + 0 + 0 + blocks_repack_bits_bb_0 blocks_char_to_float_0 @@ -2095,6 +2546,24 @@ 0 0 + + blocks_rms_xx_0 + blocks_divide_xx_0 + 0 + 0 + + + blocks_rms_xx_0_0 + blocks_divide_xx_0 + 0 + 1 + + + blocks_sub_xx_0 + blocks_rms_xx_0_0 + 0 + 0 + blocks_tagged_stream_multiply_length_0 fec_extended_tagged_decoder_0 @@ -2107,12 +2576,24 @@ pdus in + + digital_chunks_to_symbols_xx_0 + blocks_sub_xx_0 + 0 + 1 + digital_constellation_decoder_cb_0 blocks_repack_bits_bb_0 0 0 + + digital_constellation_decoder_cb_0 + digital_chunks_to_symbols_xx_0 + 0 + 0 + digital_constellation_decoder_cb_0_0 digital_packet_headerparser_b_0 @@ -2139,9 +2620,9 @@ digital_crc32_async_bb_0 - pad_sink_2 + hamnet70_async_scrambler_0 out - in + pdu_in digital_header_payload_demux_0 @@ -2149,6 +2630,18 @@ 0 0 + + digital_header_payload_demux_0 + blocks_rms_xx_0 + 1 + 0 + + + digital_header_payload_demux_0 + blocks_sub_xx_0 + 1 + 0 + digital_header_payload_demux_0 digital_constellation_decoder_cb_0 @@ -2185,6 +2678,12 @@ 0 0 + + hamnet70_async_scrambler_0 + pad_sink_2 + pdu_out + in + hamnet70_correct_phase_from_tag_0 analog_agc_xx_0 @@ -2197,6 +2696,12 @@ 0 0 + + hamnet70_freq_est_lr_0 + pad_sink_4 + 0 + 0 + hamnet70_insert_delayed_tag_0 digital_header_payload_demux_0 diff --git a/grc/hamnet70_mod_sc16qam.grc b/grc/hamnet70_mod_sc16qam.grc index 6463d34..590299d 100644 --- a/grc/hamnet70_mod_sc16qam.grc +++ b/grc/hamnet70_mod_sc16qam.grc @@ -203,7 +203,7 @@ value - digital.packet_header_default(64) + digital.packet_header_default(32) @@ -453,7 +453,7 @@ _coordinate - (575, 499) + (295, 498) _rotation @@ -532,7 +532,7 @@ minoutbuf - 0 + base_buffer_size align_output @@ -591,7 +591,7 @@ minoutbuf - 0 + base_buffer_size align_output @@ -760,7 +760,7 @@ minoutbuf - base_buffer_size + 0 num_ports @@ -854,7 +854,7 @@ _coordinate - (191, 499) + (351, 394) _rotation @@ -1034,7 +1034,7 @@ _coordinate - (367, 491) + (526, 386) _rotation @@ -1069,6 +1069,53 @@ True + + hamnet70_async_scrambler + + alias + + + + comment + + + + affinity + + + + _enabled + 1 + + + _coordinate + (167, 386) + + + _rotation + 0 + + + id + hamnet70_async_scrambler_0 + + + maxoutbuf + 0 + + + minoutbuf + 0 + + + polynom + 0x38 + + + start + 0xFF + + import @@ -1210,7 +1257,7 @@ _coordinate - (16, 481) + (23, 394) _rotation @@ -1420,6 +1467,12 @@ out pdus + + hamnet70_async_scrambler_0 + digital_crc32_async_bb_0 + pdu_out + in + interp_fir_filter_xxx_0 pad_sink_0 @@ -1428,9 +1481,9 @@ pad_source_0 - digital_crc32_async_bb_0 + hamnet70_async_scrambler_0 out - in + pdu_in virtual_source_0 diff --git a/tmp/test_sc16qam.grc b/tmp/test_sc16qam.grc index 313d771..2d1a1fe 100644 --- a/tmp/test_sc16qam.grc +++ b/tmp/test_sc16qam.grc @@ -105,7 +105,7 @@ _coordinate - (958, 499) + (957, 394) gui_hint @@ -168,7 +168,7 @@ _coordinate - (838, 499) + (837, 394) gui_hint @@ -262,7 +262,7 @@ _coordinate - (487, 654) + (901, 598) _rotation @@ -293,7 +293,7 @@ _coordinate - (559, 379) + (558, 275) _rotation @@ -348,7 +348,7 @@ _coordinate - (375, 275) + (438, 171) _rotation @@ -395,7 +395,7 @@ _coordinate - (319, 387) + (327, 283) _rotation @@ -450,7 +450,7 @@ _coordinate - (223, 275) + (255, 171) _rotation @@ -505,7 +505,7 @@ _coordinate - (15, 259) + (15, 155) _rotation @@ -576,7 +576,7 @@ _coordinate - (335, 499) + (335, 394) _rotation @@ -604,7 +604,7 @@ taps - [(1.0 + 1.0j)*0.7, 0.1] + [(1.0 + 1.0j)*0.7] @@ -627,7 +627,7 @@ _coordinate - (223, 654) + (223, 550) _rotation @@ -637,6 +637,10 @@ id hamnet70_demod_sc16qam_0 + + MTU + 1000 + maxoutbuf 0 @@ -670,7 +674,7 @@ _coordinate - (87, 387) + (87, 275) _rotation @@ -680,6 +684,10 @@ id hamnet70_mod_sc16qam_0 + + MTU + 1000 + maxoutbuf 0 @@ -786,6 +794,468 @@ import numpy as np + + qtgui_number_sink + + autoscale + False + + + avg + 0 + + + alias + + + + comment + + + + affinity + + + + _enabled + True + + + _coordinate + (638, 698) + + + gui_hint + + + + _rotation + 0 + + + graph_type + qtgui.NUM_GRAPH_HORIZ + + + id + qtgui_number_sink_0 + + + type + float + + + color1 + ("black", "black") + + + factor1 + 1 + + + label1 + + + + unit1 + + + + color10 + ("black", "black") + + + factor10 + 1 + + + label10 + + + + unit10 + + + + color2 + ("black", "black") + + + factor2 + 1 + + + label2 + + + + unit2 + + + + color3 + ("black", "black") + + + factor3 + 1 + + + label3 + + + + unit3 + + + + color4 + ("black", "black") + + + factor4 + 1 + + + label4 + + + + unit4 + + + + color5 + ("black", "black") + + + factor5 + 1 + + + label5 + + + + unit5 + + + + color6 + ("black", "black") + + + factor6 + 1 + + + label6 + + + + unit6 + + + + color7 + ("black", "black") + + + factor7 + 1 + + + label7 + + + + unit7 + + + + color8 + ("black", "black") + + + factor8 + 1 + + + label8 + + + + unit8 + + + + color9 + ("black", "black") + + + factor9 + 1 + + + label9 + + + + unit9 + + + + max + 50 + + + min + 0 + + + name + "" + + + nconnections + 1 + + + update_time + 0.10 + + + + qtgui_number_sink + + autoscale + False + + + avg + 0 + + + alias + + + + comment + + + + affinity + + + + _enabled + True + + + _coordinate + (478, 714) + + + gui_hint + + + + _rotation + 0 + + + graph_type + qtgui.NUM_GRAPH_HORIZ + + + id + qtgui_number_sink_0_0 + + + type + float + + + color1 + ("black", "black") + + + factor1 + 1 + + + label1 + + + + unit1 + + + + color10 + ("black", "black") + + + factor10 + 1 + + + label10 + + + + unit10 + + + + color2 + ("black", "black") + + + factor2 + 1 + + + label2 + + + + unit2 + + + + color3 + ("black", "black") + + + factor3 + 1 + + + label3 + + + + unit3 + + + + color4 + ("black", "black") + + + factor4 + 1 + + + label4 + + + + unit4 + + + + color5 + ("black", "black") + + + factor5 + 1 + + + label5 + + + + unit5 + + + + color6 + ("black", "black") + + + factor6 + 1 + + + label6 + + + + unit6 + + + + color7 + ("black", "black") + + + factor7 + 1 + + + label7 + + + + unit7 + + + + color8 + ("black", "black") + + + factor8 + 1 + + + label8 + + + + unit8 + + + + color9 + ("black", "black") + + + factor9 + 1 + + + label9 + + + + unit9 + + + + max + 1 + + + min + -1 + + + name + "Δf" + + + nconnections + 1 + + + update_time + 0.10 + + qtgui_sink_x @@ -822,7 +1292,7 @@ _coordinate - (535, 499) + (534, 394) gui_hint @@ -885,6 +1355,740 @@ firdes.WIN_BLACKMAN_hARRIS + + qtgui_time_sink_x + + autoscale + False + + + axislabels + True + + + alias + + + + comment + + + + ctrlpanel + False + + + affinity + + + + entags + True + + + _enabled + True + + + _coordinate + (710, 562) + + + gui_hint + + + + _rotation + 0 + + + grid + False + + + id + qtgui_time_sink_x_0 + + + legend + True + + + alpha1 + 1.0 + + + color1 + "blue" + + + label1 + + + + marker1 + -1 + + + style1 + 1 + + + width1 + 1 + + + alpha10 + 1.0 + + + color10 + "blue" + + + label10 + + + + marker10 + -1 + + + style10 + 1 + + + width10 + 1 + + + alpha2 + 1.0 + + + color2 + "red" + + + label2 + + + + marker2 + -1 + + + style2 + 1 + + + width2 + 1 + + + alpha3 + 1.0 + + + color3 + "green" + + + label3 + + + + marker3 + -1 + + + style3 + 1 + + + width3 + 1 + + + alpha4 + 1.0 + + + color4 + "black" + + + label4 + + + + marker4 + -1 + + + style4 + 1 + + + width4 + 1 + + + alpha5 + 1.0 + + + color5 + "cyan" + + + label5 + + + + marker5 + -1 + + + style5 + 1 + + + width5 + 1 + + + alpha6 + 1.0 + + + color6 + "magenta" + + + label6 + + + + marker6 + -1 + + + style6 + 1 + + + width6 + 1 + + + alpha7 + 1.0 + + + color7 + "yellow" + + + label7 + + + + marker7 + -1 + + + style7 + 1 + + + width7 + 1 + + + alpha8 + 1.0 + + + color8 + "dark red" + + + label8 + + + + marker8 + -1 + + + style8 + 1 + + + width8 + 1 + + + alpha9 + 1.0 + + + color9 + "dark green" + + + label9 + + + + marker9 + -1 + + + style9 + 1 + + + width9 + 1 + + + name + "" + + + nconnections + 1 + + + size + 1024 + + + srate + samp_rate + + + stemplot + False + + + tr_chan + 0 + + + tr_delay + 10/150e3 + + + tr_level + 0.0 + + + tr_mode + qtgui.TRIG_MODE_TAG + + + tr_slope + qtgui.TRIG_SLOPE_POS + + + tr_tag + "corr_est" + + + type + complex + + + update_time + 0.10 + + + ylabel + Amplitude + + + yunit + "" + + + ymax + 1 + + + ymin + -1 + + + + qtgui_time_sink_x + + autoscale + False + + + axislabels + True + + + alias + + + + comment + + + + ctrlpanel + False + + + affinity + + + + entags + True + + + _enabled + True + + + _coordinate + (526, 514) + + + gui_hint + + + + _rotation + 0 + + + grid + False + + + id + qtgui_time_sink_x_0_0 + + + legend + True + + + alpha1 + 1.0 + + + color1 + "blue" + + + label1 + + + + marker1 + -1 + + + style1 + 1 + + + width1 + 1 + + + alpha10 + 1.0 + + + color10 + "blue" + + + label10 + + + + marker10 + -1 + + + style10 + 1 + + + width10 + 1 + + + alpha2 + 1.0 + + + color2 + "red" + + + label2 + + + + marker2 + -1 + + + style2 + 1 + + + width2 + 1 + + + alpha3 + 1.0 + + + color3 + "green" + + + label3 + + + + marker3 + -1 + + + style3 + 1 + + + width3 + 1 + + + alpha4 + 1.0 + + + color4 + "black" + + + label4 + + + + marker4 + -1 + + + style4 + 1 + + + width4 + 1 + + + alpha5 + 1.0 + + + color5 + "cyan" + + + label5 + + + + marker5 + -1 + + + style5 + 1 + + + width5 + 1 + + + alpha6 + 1.0 + + + color6 + "magenta" + + + label6 + + + + marker6 + -1 + + + style6 + 1 + + + width6 + 1 + + + alpha7 + 1.0 + + + color7 + "yellow" + + + label7 + + + + marker7 + -1 + + + style7 + 1 + + + width7 + 1 + + + alpha8 + 1.0 + + + color8 + "dark red" + + + label8 + + + + marker8 + -1 + + + style8 + 1 + + + width8 + 1 + + + alpha9 + 1.0 + + + color9 + "dark green" + + + label9 + + + + marker9 + -1 + + + style9 + 1 + + + width9 + 1 + + + name + "" + + + nconnections + 1 + + + size + 1024 + + + srate + samp_rate + + + stemplot + False + + + tr_chan + 0 + + + tr_delay + 10/150e3 + + + tr_level + 0.0 + + + tr_mode + qtgui.TRIG_MODE_TAG + + + tr_slope + qtgui.TRIG_SLOPE_POS + + + tr_tag + "corr_est" + + + type + complex + + + update_time + 0.10 + + + ylabel + Amplitude + + + yunit + "" + + + ymax + 100 + + + ymin + -100 + + blocks_tag_gate_0 channels_channel_model_0 @@ -927,12 +2131,36 @@ 0 0 + + hamnet70_demod_sc16qam_0 + qtgui_number_sink_0 + 2 + 0 + + + hamnet70_demod_sc16qam_0 + qtgui_time_sink_x_0_0 + 0 + 0 + + + hamnet70_demod_sc16qam_0 + qtgui_number_sink_0_0 + 3 + 0 + hamnet70_demod_sc16qam_0 blocks_message_debug_0 pdu_out print_pdu + + hamnet70_demod_sc16qam_0 + qtgui_time_sink_x_0 + 1 + 0 + hamnet70_mod_sc16qam_0 blocks_throttle_0