amateurfunk/hamnet70-gnuradio-legacy
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Added scrambler, improved mod, demod and test flow graphs

Browse source
This commit is contained in:
Thomas Kolb 2019-08-04 01:44:35 +02:00
parent dfc37ecb8d
commit 9e7dcaf678
3 changed files with 1818 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

523
grc/hamnet70_demod_sc16qam.grc
View file

@ -140,7 +140,7 @@
</param> </param>
<param> <param>
<key>value</key> <key>value</key>
<value>digital.packet_header_default(64)</value> <value>digital.packet_header_default(32)</value>
</param> </param>
</block> </block>
<block> <block>
@ -785,6 +785,57 @@
<value>1</value> <value>1</value>
</param> </param>
</block> </block>
<block>
<key>blocks_divide_xx</key>
<param>
<key>alias</key>
<value></value>
</param>
<param>
<key>comment</key>
<value></value>
</param>
<param>
<key>affinity</key>
<value></value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>_coordinate</key>
<value>(1188, 1316)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
<param>
<key>id</key>
<value>blocks_divide_xx_0</value>
</param>
<param>
<key>type</key>
<value>float</value>
</param>
<param>
<key>maxoutbuf</key>
<value>0</value>
</param>
<param>
<key>minoutbuf</key>
<value>0</value>
</param>
<param>
<key>num_inputs</key>
<value>2</value>
</param>
<param>
<key>vlen</key>
<value>1</value>
</param>
</block>
<block> <block>
<key>blocks_multiply_xx</key> <key>blocks_multiply_xx</key>
<param> <param>
@ -836,6 +887,57 @@
<value>1</value> <value>1</value>
</param> </param>
</block> </block>
<block>
<key>blocks_nlog10_ff</key>
<param>
<key>alias</key>
<value></value>
</param>
<param>
<key>comment</key>
<value></value>
</param>
<param>
<key>affinity</key>
<value></value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>_coordinate</key>
<value>(1324, 1320)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
<param>
<key>id</key>
<value>blocks_nlog10_ff_0</value>
</param>
<param>
<key>maxoutbuf</key>
<value>0</value>
</param>
<param>
<key>minoutbuf</key>
<value>0</value>
</param>
<param>
<key>vlen</key>
<value>1</value>
</param>
<param>
<key>k</key>
<value>0</value>
</param>
<param>
<key>n</key>
<value>20</value>
</param>
</block>
<block> <block>
<key>blocks_repack_bits_bb</key> <key>blocks_repack_bits_bb</key>
<param> <param>
@ -954,6 +1056,151 @@
<value>False</value> <value>False</value>
</param> </param>
</block> </block>
<block>
<key>blocks_rms_xx</key>
<param>
<key>alpha</key>
<value>0.0001</value>
</param>
<param>
<key>alias</key>
<value></value>
</param>
<param>
<key>comment</key>
<value></value>
</param>
<param>
<key>affinity</key>
<value></value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>_coordinate</key>
<value>(917, 1368)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
<param>
<key>id</key>
<value>blocks_rms_xx_0</value>
</param>
<param>
<key>type</key>
<value>complex</value>
</param>
<param>
<key>maxoutbuf</key>
<value>0</value>
</param>
<param>
<key>minoutbuf</key>
<value>0</value>
</param>
</block>
<block>
<key>blocks_rms_xx</key>
<param>
<key>alpha</key>
<value>0.0001</value>
</param>
<param>
<key>alias</key>
<value></value>
</param>
<param>
<key>comment</key>
<value></value>
</param>
<param>
<key>affinity</key>
<value></value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>_coordinate</key>
<value>(1037, 1288)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
<param>
<key>id</key>
<value>blocks_rms_xx_0_0</value>
</param>
<param>
<key>type</key>
<value>complex</value>
</param>
<param>
<key>maxoutbuf</key>
<value>0</value>
</param>
<param>
<key>minoutbuf</key>
<value>0</value>
</param>
</block>
<block>
<key>blocks_sub_xx</key>
<param>
<key>alias</key>
<value></value>
</param>
<param>
<key>comment</key>
<value></value>
</param>
<param>
<key>affinity</key>
<value></value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>_coordinate</key>
<value>(917, 1276)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
<param>
<key>id</key>
<value>blocks_sub_xx_0</value>
</param>
<param>
<key>type</key>
<value>complex</value>
</param>
<param>
<key>maxoutbuf</key>
<value>0</value>
</param>
<param>
<key>minoutbuf</key>
<value>0</value>
</param>
<param>
<key>num_inputs</key>
<value>2</value>
</param>
<param>
<key>vlen</key>
<value>1</value>
</param>
</block>
<block> <block>
<key>blocks_tagged_stream_multiply_length</key> <key>blocks_tagged_stream_multiply_length</key>
<param> <param>
@ -1029,7 +1276,7 @@
</param> </param>
<param> <param>
<key>_coordinate</key> <key>_coordinate</key>
<value>(2244, 922)</value> <value>(2258, 921)</value>
</param> </param>
<param> <param>
<key>_rotation</key> <key>_rotation</key>
@ -1056,6 +1303,65 @@
<value>0</value> <value>0</value>
</param> </param>
</block> </block>
<block>
<key>digital_chunks_to_symbols_xx</key>
<param>
<key>alias</key>
<value></value>
</param>
<param>
<key>comment</key>
<value></value>
</param>
<param>
<key>affinity</key>
<value></value>
</param>
<param>
<key>dimension</key>
<value>1</value>
</param>
<param>
<key>_enabled</key>
<value>1</value>
</param>
<param>
<key>_coordinate</key>
<value>(1156, 1121)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
<param>
<key>id</key>
<value>digital_chunks_to_symbols_xx_0</value>
</param>
<param>
<key>in_type</key>
<value>byte</value>
</param>
<param>
<key>maxoutbuf</key>
<value>0</value>
</param>
<param>
<key>minoutbuf</key>
<value>0</value>
</param>
<param>
<key>num_ports</key>
<value>1</value>
</param>
<param>
<key>out_type</key>
<value>complex</value>
</param>
<param>
<key>symbol_table</key>
<value>payload_mod.points()</value>
</param>
</block>
<block> <block>
<key>digital_constellation_decoder_cb</key> <key>digital_constellation_decoder_cb</key>
<param> <param>
@ -1237,7 +1543,7 @@
</param> </param>
<param> <param>
<key>threshold</key> <key>threshold</key>
<value>0.995</value> <value>0.997</value>
</param> </param>
</block> </block>
<block> <block>
@ -1260,7 +1566,7 @@
</param> </param>
<param> <param>
<key>_coordinate</key> <key>_coordinate</key>
<value>(2460, 922)</value> <value>(2465, 921)</value>
</param> </param>
<param> <param>
<key>_rotation</key> <key>_rotation</key>
@ -1315,7 +1621,7 @@
</param> </param>
<param> <param>
<key>header_len</key> <key>header_len</key>
<value>64</value> <value>32</value>
</param> </param>
<param> <param>
<key>header_padding</key> <key>header_padding</key>
@ -1543,6 +1849,53 @@
<value>fec_extended_decoder</value> <value>fec_extended_decoder</value>
</param> </param>
</block> </block>
<block>
<key>hamnet70_async_scrambler</key>
<param>
<key>alias</key>
<value></value>
</param>
<param>
<key>comment</key>
<value></value>
</param>
<param>
<key>affinity</key>
<value></value>
</param>
<param>
<key>_enabled</key>
<value>1</value>
</param>
<param>
<key>_coordinate</key>
<value>(2649, 913)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
<param>
<key>id</key>
<value>hamnet70_async_scrambler_0</value>
</param>
<param>
<key>maxoutbuf</key>
<value>0</value>
</param>
<param>
<key>minoutbuf</key>
<value>0</value>
</param>
<param>
<key>polynom</key>
<value>0x38</value>
</param>
<param>
<key>start</key>
<value>0xFF</value>
</param>
</block>
<block> <block>
<key>hamnet70_correct_phase_from_tag</key> <key>hamnet70_correct_phase_from_tag</key>
<param> <param>
@ -1872,7 +2225,7 @@
</param> </param>
<param> <param>
<key>_coordinate</key> <key>_coordinate</key>
<value>(2619, 922)</value> <value>(2832, 921)</value>
</param> </param>
<param> <param>
<key>_rotation</key> <key>_rotation</key>
@ -1903,6 +2256,92 @@
<value>1</value> <value>1</value>
</param> </param>
</block> </block>
<block>
<key>pad_sink</key>
<param>
<key>comment</key>
<value></value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>_coordinate</key>
<value>(1476, 1328)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
<param>
<key>id</key>
<value>pad_sink_3</value>
</param>
<param>
<key>type</key>
<value>float</value>
</param>
<param>
<key>label</key>
<value>SNR</value>
</param>
<param>
<key>num_streams</key>
<value>1</value>
</param>
<param>
<key>optional</key>
<value>True</value>
</param>
<param>
<key>vlen</key>
<value>1</value>
</param>
</block>
<block>
<key>pad_sink</key>
<param>
<key>comment</key>
<value></value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>_coordinate</key>
<value>(1284, 163)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
<param>
<key>id</key>
<value>pad_sink_4</value>
</param>
<param>
<key>type</key>
<value>float</value>
</param>
<param>
<key>label</key>
<value>freq_est</value>
</param>
<param>
<key>num_streams</key>
<value>1</value>
</param>
<param>
<key>optional</key>
<value>False</value>
</param>
<param>
<key>vlen</key>
<value>1</value>
</param>
</block>
<block> <block>
<key>pad_source</key> <key>pad_source</key>
<param> <param>
@ -1915,7 +2354,7 @@
</param> </param>
<param> <param>
<key>_coordinate</key> <key>_coordinate</key>
<value>(95, 483)</value> <value>(79, 482)</value>
</param> </param>
<param> <param>
<key>_rotation</key> <key>_rotation</key>
@ -2077,12 +2516,24 @@
<source_key>0</source_key> <source_key>0</source_key>
<sink_key>0</sink_key> <sink_key>0</sink_key>
</connection> </connection>
<connection>
<source_block_id>blocks_divide_xx_0</source_block_id>
<sink_block_id>blocks_nlog10_ff_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection> <connection>
<source_block_id>blocks_multiply_xx_0</source_block_id> <source_block_id>blocks_multiply_xx_0</source_block_id>
<sink_block_id>digital_corr_est_cc_0</sink_block_id> <sink_block_id>digital_corr_est_cc_0</sink_block_id>
<source_key>0</source_key> <source_key>0</source_key>
<sink_key>0</sink_key> <sink_key>0</sink_key>
</connection> </connection>
<connection>
<source_block_id>blocks_nlog10_ff_0</source_block_id>
<sink_block_id>pad_sink_3</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection> <connection>
<source_block_id>blocks_repack_bits_bb_0</source_block_id> <source_block_id>blocks_repack_bits_bb_0</source_block_id>
<sink_block_id>blocks_char_to_float_0</sink_block_id> <sink_block_id>blocks_char_to_float_0</sink_block_id>
@ -2095,6 +2546,24 @@
<source_key>0</source_key> <source_key>0</source_key>
<sink_key>0</sink_key> <sink_key>0</sink_key>
</connection> </connection>
<connection>
<source_block_id>blocks_rms_xx_0</source_block_id>
<sink_block_id>blocks_divide_xx_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>blocks_rms_xx_0_0</source_block_id>
<sink_block_id>blocks_divide_xx_0</sink_block_id>
<source_key>0</source_key>
<sink_key>1</sink_key>
</connection>
<connection>
<source_block_id>blocks_sub_xx_0</source_block_id>
<sink_block_id>blocks_rms_xx_0_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection> <connection>
<source_block_id>blocks_tagged_stream_multiply_length_0</source_block_id> <source_block_id>blocks_tagged_stream_multiply_length_0</source_block_id>
<sink_block_id>fec_extended_tagged_decoder_0</sink_block_id> <sink_block_id>fec_extended_tagged_decoder_0</sink_block_id>
@ -2107,12 +2576,24 @@
<source_key>pdus</source_key> <source_key>pdus</source_key>
<sink_key>in</sink_key> <sink_key>in</sink_key>
</connection> </connection>
<connection>
<source_block_id>digital_chunks_to_symbols_xx_0</source_block_id>
<sink_block_id>blocks_sub_xx_0</sink_block_id>
<source_key>0</source_key>
<sink_key>1</sink_key>
</connection>
<connection> <connection>
<source_block_id>digital_constellation_decoder_cb_0</source_block_id> <source_block_id>digital_constellation_decoder_cb_0</source_block_id>
<sink_block_id>blocks_repack_bits_bb_0</sink_block_id> <sink_block_id>blocks_repack_bits_bb_0</sink_block_id>
<source_key>0</source_key> <source_key>0</source_key>
<sink_key>0</sink_key> <sink_key>0</sink_key>
</connection> </connection>
<connection>
<source_block_id>digital_constellation_decoder_cb_0</source_block_id>
<sink_block_id>digital_chunks_to_symbols_xx_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection> <connection>
<source_block_id>digital_constellation_decoder_cb_0_0</source_block_id> <source_block_id>digital_constellation_decoder_cb_0_0</source_block_id>
<sink_block_id>digital_packet_headerparser_b_0</sink_block_id> <sink_block_id>digital_packet_headerparser_b_0</sink_block_id>
@ -2139,9 +2620,9 @@
</connection> </connection>
<connection> <connection>
<source_block_id>digital_crc32_async_bb_0</source_block_id> <source_block_id>digital_crc32_async_bb_0</source_block_id>
<sink_block_id>pad_sink_2</sink_block_id> <sink_block_id>hamnet70_async_scrambler_0</sink_block_id>
<source_key>out</source_key> <source_key>out</source_key>
<sink_key>in</sink_key> <sink_key>pdu_in</sink_key>
</connection> </connection>
<connection> <connection>
<source_block_id>digital_header_payload_demux_0</source_block_id> <source_block_id>digital_header_payload_demux_0</source_block_id>
@ -2149,6 +2630,18 @@
<source_key>0</source_key> <source_key>0</source_key>
<sink_key>0</sink_key> <sink_key>0</sink_key>
</connection> </connection>
<connection>
<source_block_id>digital_header_payload_demux_0</source_block_id>
<sink_block_id>blocks_rms_xx_0</sink_block_id>
<source_key>1</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>digital_header_payload_demux_0</source_block_id>
<sink_block_id>blocks_sub_xx_0</sink_block_id>
<source_key>1</source_key>
<sink_key>0</sink_key>
</connection>
<connection> <connection>
<source_block_id>digital_header_payload_demux_0</source_block_id> <source_block_id>digital_header_payload_demux_0</source_block_id>
<sink_block_id>digital_constellation_decoder_cb_0</sink_block_id> <sink_block_id>digital_constellation_decoder_cb_0</sink_block_id>
@ -2185,6 +2678,12 @@
<source_key>0</source_key> <source_key>0</source_key>
<sink_key>0</sink_key> <sink_key>0</sink_key>
</connection> </connection>
<connection>
<source_block_id>hamnet70_async_scrambler_0</source_block_id>
<sink_block_id>pad_sink_2</sink_block_id>
<source_key>pdu_out</source_key>
<sink_key>in</sink_key>
</connection>
<connection> <connection>
<source_block_id>hamnet70_correct_phase_from_tag_0</source_block_id> <source_block_id>hamnet70_correct_phase_from_tag_0</source_block_id>
<sink_block_id>analog_agc_xx_0</sink_block_id> <sink_block_id>analog_agc_xx_0</sink_block_id>
@ -2197,6 +2696,12 @@
<source_key>0</source_key> <source_key>0</source_key>
<sink_key>0</sink_key> <sink_key>0</sink_key>
</connection> </connection>
<connection>
<source_block_id>hamnet70_freq_est_lr_0</source_block_id>
<sink_block_id>pad_sink_4</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection> <connection>
<source_block_id>hamnet70_insert_delayed_tag_0</source_block_id> <source_block_id>hamnet70_insert_delayed_tag_0</source_block_id>
<sink_block_id>digital_header_payload_demux_0</sink_block_id> <sink_block_id>digital_header_payload_demux_0</sink_block_id>

73
grc/hamnet70_mod_sc16qam.grc
View file

@ -203,7 +203,7 @@
</param> </param>
<param> <param>
<key>value</key> <key>value</key>
<value>digital.packet_header_default(64)</value> <value>digital.packet_header_default(32)</value>
</param> </param>
</block> </block>
<block> <block>
@ -453,7 +453,7 @@
</param> </param>
<param> <param>
<key>_coordinate</key> <key>_coordinate</key>
<value>(575, 499)</value> <value>(295, 498)</value>
</param> </param>
<param> <param>
<key>_rotation</key> <key>_rotation</key>
@ -532,7 +532,7 @@
</param> </param>
<param> <param>
<key>minoutbuf</key> <key>minoutbuf</key>
<value>0</value> <value>base_buffer_size</value>
</param> </param>
<param> <param>
<key>align_output</key> <key>align_output</key>
@ -591,7 +591,7 @@
</param> </param>
<param> <param>
<key>minoutbuf</key> <key>minoutbuf</key>
<value>0</value> <value>base_buffer_size</value>
</param> </param>
<param> <param>
<key>align_output</key> <key>align_output</key>
@ -760,7 +760,7 @@
</param> </param>
<param> <param>
<key>minoutbuf</key> <key>minoutbuf</key>
<value>base_buffer_size</value> <value>0</value>
</param> </param>
<param> <param>
<key>num_ports</key> <key>num_ports</key>
@ -854,7 +854,7 @@
</param> </param>
<param> <param>
<key>_coordinate</key> <key>_coordinate</key>
<value>(191, 499)</value> <value>(351, 394)</value>
</param> </param>
<param> <param>
<key>_rotation</key> <key>_rotation</key>
@ -1034,7 +1034,7 @@
</param> </param>
<param> <param>
<key>_coordinate</key> <key>_coordinate</key>
<value>(367, 491)</value> <value>(526, 386)</value>
</param> </param>
<param> <param>
<key>_rotation</key> <key>_rotation</key>
@ -1069,6 +1069,53 @@
<value>True</value> <value>True</value>
</param> </param>
</block> </block>
<block>
<key>hamnet70_async_scrambler</key>
<param>
<key>alias</key>
<value></value>
</param>
<param>
<key>comment</key>
<value></value>
</param>
<param>
<key>affinity</key>
<value></value>
</param>
<param>
<key>_enabled</key>
<value>1</value>
</param>
<param>
<key>_coordinate</key>
<value>(167, 386)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
<param>
<key>id</key>
<value>hamnet70_async_scrambler_0</value>
</param>
<param>
<key>maxoutbuf</key>
<value>0</value>
</param>
<param>
<key>minoutbuf</key>
<value>0</value>
</param>
<param>
<key>polynom</key>
<value>0x38</value>
</param>
<param>
<key>start</key>
<value>0xFF</value>
</param>
</block>
<block> <block>
<key>import</key> <key>import</key>
<param> <param>
@ -1210,7 +1257,7 @@
</param> </param>
<param> <param>
<key>_coordinate</key> <key>_coordinate</key>
<value>(16, 481)</value> <value>(23, 394)</value>
</param> </param>
<param> <param>
<key>_rotation</key> <key>_rotation</key>
@ -1420,6 +1467,12 @@
<source_key>out</source_key> <source_key>out</source_key>
<sink_key>pdus</sink_key> <sink_key>pdus</sink_key>
</connection> </connection>
<connection>
<source_block_id>hamnet70_async_scrambler_0</source_block_id>
<sink_block_id>digital_crc32_async_bb_0</sink_block_id>
<source_key>pdu_out</source_key>
<sink_key>in</sink_key>
</connection>
<connection> <connection>
<source_block_id>interp_fir_filter_xxx_0</source_block_id> <source_block_id>interp_fir_filter_xxx_0</source_block_id>
<sink_block_id>pad_sink_0</sink_block_id> <sink_block_id>pad_sink_0</sink_block_id>
@ -1428,9 +1481,9 @@
</connection> </connection>
<connection> <connection>
<source_block_id>pad_source_0</source_block_id> <source_block_id>pad_source_0</source_block_id>
<sink_block_id>digital_crc32_async_bb_0</sink_block_id> <sink_block_id>hamnet70_async_scrambler_0</sink_block_id>
<source_key>out</source_key> <source_key>out</source_key>
<sink_key>in</sink_key> <sink_key>pdu_in</sink_key>
</connection> </connection>
<connection> <connection>
<source_block_id>virtual_source_0</source_block_id> <source_block_id>virtual_source_0</source_block_id>

1254
tmp/test_sc16qam.grc
View file

File diff suppressed because it is too large Load diff