[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 10/25: polar: rebased and fixed branch for
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 10/25: polar: rebased and fixed branch for merge again. |
|
Date: |
Wed, 23 Sep 2015 14:51:37 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch master
in repository gnuradio.
commit 39ce33fad9c220d90498f47ded715d000a27375a
Author: Johannes Demel <address@hidden>
Date: Mon Sep 21 11:28:01 2015 +0200
polar: rebased and fixed branch for merge again.
---
gr-fec/examples/polar_code_example.grc | 88 ++++++++----------
gr-fec/examples/polar_encoder_decoder_chain.grc | 118 +++++++++++-------------
volk | 2 +-
3 files changed, 93 insertions(+), 115 deletions(-)
diff --git a/gr-fec/examples/polar_code_example.grc
b/gr-fec/examples/polar_code_example.grc
index 4429ad2..ae388d6 100644
--- a/gr-fec/examples/polar_code_example.grc
+++ b/gr-fec/examples/polar_code_example.grc
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
-<?grc format='1' created='3.7.8'?>
+<?grc format='1' created='3.7.9'?>
<flow_graph>
<timestamp>Thu Jul 16 16:19:12 2015</timestamp>
<block>
@@ -139,7 +139,7 @@
</param>
<param>
<key>channel</key>
- <value>bsc</value>
+ <value>BSC</value>
</param>
<param>
<key>comment</key>
@@ -418,7 +418,7 @@
</param>
</block>
<block>
- <key>blocks_add_const_vxx</key>
+ <key>blocks_char_to_float</key>
<param>
<key>alias</key>
<value></value>
@@ -428,10 +428,6 @@
<value></value>
</param>
<param>
- <key>const</key>
- <value>1.0</value>
- </param>
- <param>
<key>affinity</key>
<value></value>
</param>
@@ -441,7 +437,7 @@
</param>
<param>
<key>_coordinate</key>
- <value>(448, 651)</value>
+ <value>(952, 475)</value>
</param>
<param>
<key>_rotation</key>
@@ -449,11 +445,7 @@
</param>
<param>
<key>id</key>
- <value>blocks_add_const_vxx_0</value>
- </param>
- <param>
- <key>type</key>
- <value>float</value>
+ <value>blocks_char_to_float_0</value>
</param>
<param>
<key>maxoutbuf</key>
@@ -464,6 +456,10 @@
<value>0</value>
</param>
<param>
+ <key>scale</key>
+ <value>1.0</value>
+ </param>
+ <param>
<key>vlen</key>
<value>1</value>
</param>
@@ -488,7 +484,7 @@
</param>
<param>
<key>_coordinate</key>
- <value>(952, 475)</value>
+ <value>(952, 443)</value>
</param>
<param>
<key>_rotation</key>
@@ -496,7 +492,7 @@
</param>
<param>
<key>id</key>
- <value>blocks_char_to_float_0</value>
+ <value>blocks_char_to_float_0_1</value>
</param>
<param>
<key>maxoutbuf</key>
@@ -535,7 +531,7 @@
</param>
<param>
<key>_coordinate</key>
- <value>(312, 651)</value>
+ <value>(440, 651)</value>
</param>
<param>
<key>_rotation</key>
@@ -543,7 +539,7 @@
</param>
<param>
<key>id</key>
- <value>blocks_char_to_float_0_0</value>
+ <value>blocks_char_to_float_0_2</value>
</param>
<param>
<key>maxoutbuf</key>
@@ -555,7 +551,7 @@
</param>
<param>
<key>scale</key>
- <value>-0.5</value>
+ <value>1</value>
</param>
<param>
<key>vlen</key>
@@ -563,7 +559,7 @@
</param>
</block>
<block>
- <key>blocks_char_to_float</key>
+ <key>blocks_pack_k_bits_bb</key>
<param>
<key>alias</key>
<value></value>
@@ -582,7 +578,7 @@
</param>
<param>
<key>_coordinate</key>
- <value>(952, 443)</value>
+ <value>(808, 651)</value>
</param>
<param>
<key>_rotation</key>
@@ -590,7 +586,11 @@
</param>
<param>
<key>id</key>
- <value>blocks_char_to_float_0_1</value>
+ <value>blocks_pack_k_bits_bb_0</value>
+ </param>
+ <param>
+ <key>k</key>
+ <value>8</value>
</param>
<param>
<key>maxoutbuf</key>
@@ -600,17 +600,9 @@
<key>minoutbuf</key>
<value>0</value>
</param>
- <param>
- <key>scale</key>
- <value>1.0</value>
- </param>
- <param>
- <key>vlen</key>
- <value>1</value>
- </param>
</block>
<block>
- <key>blocks_pack_k_bits_bb</key>
+ <key>blocks_unpack_k_bits_bb</key>
<param>
<key>alias</key>
<value></value>
@@ -629,7 +621,7 @@
</param>
<param>
<key>_coordinate</key>
- <value>(808, 651)</value>
+ <value>(432, 547)</value>
</param>
<param>
<key>_rotation</key>
@@ -637,7 +629,7 @@
</param>
<param>
<key>id</key>
- <value>blocks_pack_k_bits_bb_0</value>
+ <value>blocks_unpack_k_bits_bb_0</value>
</param>
<param>
<key>k</key>
@@ -653,7 +645,7 @@
</param>
</block>
<block>
- <key>blocks_unpack_k_bits_bb</key>
+ <key>digital_map_bb</key>
<param>
<key>alias</key>
<value></value>
@@ -672,7 +664,7 @@
</param>
<param>
<key>_coordinate</key>
- <value>(432, 547)</value>
+ <value>(328, 651)</value>
</param>
<param>
<key>_rotation</key>
@@ -680,11 +672,11 @@
</param>
<param>
<key>id</key>
- <value>blocks_unpack_k_bits_bb_0</value>
+ <value>digital_map_bb_0</value>
</param>
<param>
- <key>k</key>
- <value>8</value>
+ <key>map</key>
+ <value>[-1, 1]</value>
</param>
<param>
<key>maxoutbuf</key>
@@ -1465,26 +1457,20 @@
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>blocks_add_const_vxx_0</source_block_id>
- <sink_block_id>fec_extended_decoder_0</sink_block_id>
- <source_key>0</source_key>
- <sink_key>0</sink_key>
- </connection>
- <connection>
<source_block_id>blocks_char_to_float_0</source_block_id>
<sink_block_id>qtgui_time_sink_x_0</sink_block_id>
<source_key>0</source_key>
<sink_key>1</sink_key>
</connection>
<connection>
- <source_block_id>blocks_char_to_float_0_0</source_block_id>
- <sink_block_id>blocks_add_const_vxx_0</sink_block_id>
+ <source_block_id>blocks_char_to_float_0_1</source_block_id>
+ <sink_block_id>qtgui_time_sink_x_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>blocks_char_to_float_0_1</source_block_id>
- <sink_block_id>qtgui_time_sink_x_0</sink_block_id>
+ <source_block_id>blocks_char_to_float_0_2</source_block_id>
+ <sink_block_id>fec_extended_decoder_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
@@ -1507,6 +1493,12 @@
<sink_key>0</sink_key>
</connection>
<connection>
+ <source_block_id>digital_map_bb_0</source_block_id>
+ <sink_block_id>blocks_char_to_float_0_2</sink_block_id>
+ <source_key>0</source_key>
+ <sink_key>0</sink_key>
+ </connection>
+ <connection>
<source_block_id>fec_ber_bf_0</source_block_id>
<sink_block_id>qtgui_number_sink_0</sink_block_id>
<source_key>0</source_key>
@@ -1520,7 +1512,7 @@
</connection>
<connection>
<source_block_id>fec_extended_encoder_0</source_block_id>
- <sink_block_id>blocks_char_to_float_0_0</sink_block_id>
+ <sink_block_id>digital_map_bb_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
diff --git a/gr-fec/examples/polar_encoder_decoder_chain.grc
b/gr-fec/examples/polar_encoder_decoder_chain.grc
index 481dd1d..b5d27ca 100644
--- a/gr-fec/examples/polar_encoder_decoder_chain.grc
+++ b/gr-fec/examples/polar_encoder_decoder_chain.grc
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
-<?grc format='1' created='3.7.8'?>
+<?grc format='1' created='3.7.9'?>
<flow_graph>
<timestamp>Mon Jun 15 10:51:02 2015</timestamp>
<block>
@@ -175,7 +175,7 @@
</param>
<param>
<key>channel</key>
- <value>bsc</value>
+ <value>BSC</value>
</param>
<param>
<key>comment</key>
@@ -427,7 +427,7 @@
</param>
</block>
<block>
- <key>blocks_add_const_vxx</key>
+ <key>blocks_char_to_float</key>
<param>
<key>alias</key>
<value></value>
@@ -437,20 +437,16 @@
<value></value>
</param>
<param>
- <key>const</key>
- <value>1.0</value>
- </param>
- <param>
<key>affinity</key>
<value></value>
</param>
<param>
<key>_enabled</key>
- <value>1</value>
+ <value>False</value>
</param>
<param>
<key>_coordinate</key>
- <value>(752, 347)</value>
+ <value>(1112, 347)</value>
</param>
<param>
<key>_rotation</key>
@@ -458,11 +454,7 @@
</param>
<param>
<key>id</key>
- <value>blocks_add_const_vxx_0</value>
- </param>
- <param>
- <key>type</key>
- <value>float</value>
+ <value>blocks_char_to_float_0</value>
</param>
<param>
<key>maxoutbuf</key>
@@ -473,6 +465,10 @@
<value>0</value>
</param>
<param>
+ <key>scale</key>
+ <value>1.0</value>
+ </param>
+ <param>
<key>vlen</key>
<value>1</value>
</param>
@@ -493,11 +489,11 @@
</param>
<param>
<key>_enabled</key>
- <value>False</value>
+ <value>True</value>
</param>
<param>
<key>_coordinate</key>
- <value>(1112, 347)</value>
+ <value>(736, 347)</value>
</param>
<param>
<key>_rotation</key>
@@ -505,7 +501,7 @@
</param>
<param>
<key>id</key>
- <value>blocks_char_to_float_0</value>
+ <value>blocks_char_to_float_0_1</value>
</param>
<param>
<key>maxoutbuf</key>
@@ -517,7 +513,7 @@
</param>
<param>
<key>scale</key>
- <value>1.0</value>
+ <value>1</value>
</param>
<param>
<key>vlen</key>
@@ -525,7 +521,7 @@
</param>
</block>
<block>
- <key>blocks_char_to_float</key>
+ <key>blocks_head</key>
<param>
<key>alias</key>
<value></value>
@@ -540,11 +536,11 @@
</param>
<param>
<key>_enabled</key>
- <value>1</value>
+ <value>True</value>
</param>
<param>
<key>_coordinate</key>
- <value>(616, 347)</value>
+ <value>(944, 459)</value>
</param>
<param>
<key>_rotation</key>
@@ -552,7 +548,7 @@
</param>
<param>
<key>id</key>
- <value>blocks_char_to_float_0_0</value>
+ <value>blocks_head_0</value>
</param>
<param>
<key>maxoutbuf</key>
@@ -563,8 +559,12 @@
<value>0</value>
</param>
<param>
- <key>scale</key>
- <value>-0.5</value>
+ <key>num_items</key>
+ <value>head_samps</value>
+ </param>
+ <param>
+ <key>type</key>
+ <value>byte</value>
</param>
<param>
<key>vlen</key>
@@ -572,12 +572,16 @@
</param>
</block>
<block>
- <key>blocks_head</key>
+ <key>blocks_null_sink</key>
<param>
<key>alias</key>
<value></value>
</param>
<param>
+ <key>bus_conns</key>
+ <value>[[0,],]</value>
+ </param>
+ <param>
<key>comment</key>
<value></value>
</param>
@@ -591,7 +595,7 @@
</param>
<param>
<key>_coordinate</key>
- <value>(944, 459)</value>
+ <value>(1152, 465)</value>
</param>
<param>
<key>_rotation</key>
@@ -599,40 +603,28 @@
</param>
<param>
<key>id</key>
- <value>blocks_head_0</value>
- </param>
- <param>
- <key>maxoutbuf</key>
- <value>0</value>
- </param>
- <param>
- <key>minoutbuf</key>
- <value>0</value>
- </param>
- <param>
- <key>num_items</key>
- <value>head_samps</value>
+ <value>blocks_null_sink_0</value>
</param>
<param>
<key>type</key>
<value>byte</value>
</param>
<param>
+ <key>num_inputs</key>
+ <value>1</value>
+ </param>
+ <param>
<key>vlen</key>
<value>1</value>
</param>
</block>
<block>
- <key>blocks_null_sink</key>
+ <key>digital_map_bb</key>
<param>
<key>alias</key>
<value></value>
</param>
<param>
- <key>bus_conns</key>
- <value>[[0,],]</value>
- </param>
- <param>
<key>comment</key>
<value></value>
</param>
@@ -646,7 +638,7 @@
</param>
<param>
<key>_coordinate</key>
- <value>(1152, 465)</value>
+ <value>(624, 347)</value>
</param>
<param>
<key>_rotation</key>
@@ -654,19 +646,19 @@
</param>
<param>
<key>id</key>
- <value>blocks_null_sink_0</value>
+ <value>digital_map_bb_0</value>
</param>
<param>
- <key>type</key>
- <value>byte</value>
+ <key>map</key>
+ <value>[-1, 1]</value>
</param>
<param>
- <key>num_inputs</key>
- <value>1</value>
+ <key>maxoutbuf</key>
+ <value>0</value>
</param>
<param>
- <key>vlen</key>
- <value>1</value>
+ <key>minoutbuf</key>
+ <value>0</value>
</param>
</block>
<block>
@@ -1171,7 +1163,7 @@
</block>
<connection>
<source_block_id>analog_random_source_x_0</source_block_id>
- <sink_block_id>blocks_char_to_float_0_0</sink_block_id>
+ <sink_block_id>digital_map_bb_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
@@ -1182,20 +1174,14 @@
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>blocks_add_const_vxx_0</source_block_id>
- <sink_block_id>fec_extended_decoder_0</sink_block_id>
- <source_key>0</source_key>
- <sink_key>0</sink_key>
- </connection>
- <connection>
<source_block_id>blocks_char_to_float_0</source_block_id>
<sink_block_id>qtgui_time_sink_x_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>blocks_char_to_float_0_0</source_block_id>
- <sink_block_id>blocks_add_const_vxx_0</sink_block_id>
+ <source_block_id>blocks_char_to_float_0_1</source_block_id>
+ <sink_block_id>fec_extended_decoder_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
@@ -1206,20 +1192,20 @@
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>fec_extended_decoder_0</source_block_id>
- <sink_block_id>blocks_char_to_float_0</sink_block_id>
+ <source_block_id>digital_map_bb_0</source_block_id>
+ <sink_block_id>blocks_char_to_float_0_1</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>fec_extended_decoder_0</source_block_id>
- <sink_block_id>blocks_head_0</sink_block_id>
+ <sink_block_id>blocks_char_to_float_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>fec_extended_encoder_0</source_block_id>
- <sink_block_id>blocks_char_to_float_0_0</sink_block_id>
+ <source_block_id>fec_extended_decoder_0</source_block_id>
+ <sink_block_id>blocks_head_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
diff --git a/volk b/volk
index 52f2192..a5f2452 160000
--- a/volk
+++ b/volk
@@ -1 +1 @@
-Subproject commit 52f219294c2424b541739b28dd7296196067dba9
+Subproject commit a5f24520138d9e1b802722c42372526fad3a460a
- [Commit-gnuradio] [gnuradio] branch master updated (aae6445 -> 45faa98), git, 2015/09/23
- [Commit-gnuradio] [gnuradio] 08/25: polar: updated VOLK pointer to volk/volk/master with polar kernels merged, git, 2015/09/23
- [Commit-gnuradio] [gnuradio] 17/25: fec: polar: renaming GRC file names to be consistent with other codes and variable names., git, 2015/09/23
- [Commit-gnuradio] [gnuradio] 20/25: fec: polar: Installing more FEC examples., git, 2015/09/23
- [Commit-gnuradio] [gnuradio] 09/25: polar: fixed bugs in init code, git, 2015/09/23
- [Commit-gnuradio] [gnuradio] 12/25: Fix the VOLKized fft_vcc_fftw and QA code, git, 2015/09/23
- [Commit-gnuradio] [gnuradio] 23/25: volk: update submodule to latest, git, 2015/09/23
- [Commit-gnuradio] [gnuradio] 11/25: grc: defer check for gtk init until after arg parsing, git, 2015/09/23
- [Commit-gnuradio] [gnuradio] 18/25: Merge branch 'socis/master' into polar, git, 2015/09/23
- [Commit-gnuradio] [gnuradio] 22/25: Merge remote-tracking branch 'geiger/volkize_fft_fix', git, 2015/09/23
- [Commit-gnuradio] [gnuradio] 10/25: polar: rebased and fixed branch for merge again.,
git <=
- [Commit-gnuradio] [gnuradio] 19/25: polar: rearranged polar_code_example flowgraph, git, 2015/09/23
- [Commit-gnuradio] [gnuradio] 21/25: Merge branch 'maint', git, 2015/09/23
- [Commit-gnuradio] [gnuradio] 05/25: polar: VOLK kernel integration, git, 2015/09/23
- [Commit-gnuradio] [gnuradio] 24/25: Merge remote-tracking branch 'gnuradio-wg-grc/master_grcwg', git, 2015/09/23
- [Commit-gnuradio] [gnuradio] 07/25: polar: updated polar code example GRC, git, 2015/09/23
- [Commit-gnuradio] [gnuradio] 02/25: polar: encoder implemented in C++, git, 2015/09/23
- [Commit-gnuradio] [gnuradio] 25/25: Merge remote-tracking branch 'tom/socis/master', git, 2015/09/23
- [Commit-gnuradio] [gnuradio] 06/25: polar: refarctoring and clean-up, git, 2015/09/23
- [Commit-gnuradio] [gnuradio] 03/25: polar: SC and SC List decoder implemented in C++, git, 2015/09/23
- [Commit-gnuradio] [gnuradio] 01/25: polar: Python test code for polar codes, git, 2015/09/23