port: use GR 3.8 API

This commit finishes the port from GR 3.7. to 3.8. We assume only Python3 is used and we support the GR master branch. This branch does actually expect that the GR version is set to 3.9 because it is the GR development branch.
kit-cel · Sep 5, 2019 · 49399dc · 49399dc
1 parent 023a5ea
commit 49399dc
Show file tree

Hide file tree

Showing 161 changed files with 19 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
-build/*
+build/
 .ycm_extra_conf.*
 *.swp
 *.pyc

diff --git a/.gitmodules b/.gitmodules
diff --git a/.travis.yml b/.travis.yml
diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/MANIFEST.md b/MANIFEST.md
diff --git a/README.md b/README.md
diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
diff --git a/cmake/Modules/CMakeParseArgumentsCopy.cmake b/cmake/Modules/CMakeParseArgumentsCopy.cmake
diff --git a/cmake/Modules/gfdmConfig.cmake b/cmake/Modules/gfdmConfig.cmake
diff --git a/cmake/Modules/targetConfig.cmake.in b/cmake/Modules/targetConfig.cmake.in
diff --git a/cmake/cmake_uninstall.cmake.in b/cmake/cmake_uninstall.cmake.in
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
diff --git a/docs/README.gfdm b/docs/README.gfdm
diff --git a/docs/doxygen/CMakeLists.txt b/docs/doxygen/CMakeLists.txt
diff --git a/docs/doxygen/Doxyfile.in b/docs/doxygen/Doxyfile.in
diff --git a/docs/doxygen/Doxyfile.swig_doc.in b/docs/doxygen/Doxyfile.swig_doc.in
diff --git a/docs/doxygen/doxyxml/__init__.py b/docs/doxygen/doxyxml/__init__.py
diff --git a/docs/doxygen/doxyxml/base.py b/docs/doxygen/doxyxml/base.py
diff --git a/docs/doxygen/doxyxml/doxyindex.py b/docs/doxygen/doxyxml/doxyindex.py
diff --git a/docs/doxygen/doxyxml/generated/__init__.py b/docs/doxygen/doxyxml/generated/__init__.py
diff --git a/docs/doxygen/doxyxml/generated/compound.py b/docs/doxygen/doxyxml/generated/compound.py
diff --git a/docs/doxygen/doxyxml/generated/compoundsuper.py b/docs/doxygen/doxyxml/generated/compoundsuper.py
diff --git a/docs/doxygen/doxyxml/generated/index.py b/docs/doxygen/doxyxml/generated/index.py
diff --git a/docs/doxygen/doxyxml/generated/indexsuper.py b/docs/doxygen/doxyxml/generated/indexsuper.py
diff --git a/docs/doxygen/doxyxml/text.py b/docs/doxygen/doxyxml/text.py
diff --git a/docs/doxygen/other/demodulator.dox b/docs/doxygen/other/demodulator.dox
diff --git a/docs/doxygen/other/group_defs.dox b/docs/doxygen/other/group_defs.dox
diff --git a/docs/doxygen/other/main_page.dox b/docs/doxygen/other/main_page.dox
diff --git a/docs/doxygen/other/modulator.dox b/docs/doxygen/other/modulator.dox
diff --git a/docs/doxygen/swig_doc.py b/docs/doxygen/swig_doc.py
diff --git a/examples/.gitignore b/examples/.gitignore
diff --git a/examples/README b/examples/README
diff --git a/examples/gfdm_fast_sync_demo.grc b/examples/gfdm_fast_sync_demo.grc
@@ -190,7 +190,22 @@ blocks:
     bus_structure: null
     coordinate: [56, 948]
     rotation: 0
-    state: enabled
+    state: disabled
+- name: chan_taps
+  id: variable_qtgui_entry
+  parameters:
+    comment: ''
+    gui_hint: 'ctrl_tab@0: 7,0,1,1'
+    label: Channel taps
+    type: raw
+    value: '[1.+1.j, .5]'
+  states:
+    bus_sink: false
+    bus_source: false
+    bus_structure: null
+    coordinate: [1576, 652.0]
+    rotation: 0
+    state: true
 - name: core_preamble
   id: variable
   parameters:

diff --git a/examples/gfdm_ota_demo.grc b/examples/gfdm_ota_demo.grc
@@ -500,7 +500,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [448, 292]
+    coordinate: [432, 292.0]
     rotation: 0
     state: enabled
 - name: blocks_multiply_const_vxx_0
@@ -537,7 +537,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [616, 280]
+    coordinate: [616, 276.0]
     rotation: 0
     state: enabled
 - name: blocks_repack_bits_bb_0

diff --git a/examples/gfdm_simulation_demo.grc b/examples/gfdm_simulation_demo.grc
diff --git a/examples/hier_gfdm_fastsync.grc b/examples/hier_gfdm_fastsync.grc
diff --git a/examples/hier_gfdm_receiver.grc b/examples/hier_gfdm_receiver.grc
diff --git a/examples/hier_gfdm_receiver_tagged.grc b/examples/hier_gfdm_receiver_tagged.grc
diff --git a/examples/hier_gfdm_transmitter.grc b/examples/hier_gfdm_transmitter.grc
diff --git a/examples/simple_modulator.grc b/examples/simple_modulator.grc
diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt
diff --git a/grc/gfdm_advanced_receiver_sb_cc.block.yml b/grc/gfdm_advanced_receiver_sb_cc.block.yml
diff --git a/grc/gfdm_channel_estimator_cc.block.yml b/grc/gfdm_channel_estimator_cc.block.yml
diff --git a/grc/gfdm_cyclic_prefixer_cc.block.yml b/grc/gfdm_cyclic_prefixer_cc.block.yml
diff --git a/grc/gfdm_extract_burst_cc.block.yml b/grc/gfdm_extract_burst_cc.block.yml
diff --git a/grc/gfdm_modulator_cc.block.yml b/grc/gfdm_modulator_cc.block.yml
diff --git a/grc/gfdm_preamble_generator.block.yml b/grc/gfdm_preamble_generator.block.yml
diff --git a/grc/gfdm_remove_prefix_cc.block.yml b/grc/gfdm_remove_prefix_cc.block.yml
diff --git a/grc/gfdm_resource_demapper_cc.block.yml b/grc/gfdm_resource_demapper_cc.block.yml
diff --git a/grc/gfdm_resource_mapper_cc.block.yml b/grc/gfdm_resource_mapper_cc.block.yml
diff --git a/grc/gfdm_short_burst_shaper.block.yml b/grc/gfdm_short_burst_shaper.block.yml
diff --git a/grc/gfdm_simple_modulator_cc.block.yml b/grc/gfdm_simple_modulator_cc.block.yml
diff --git a/grc/gfdm_simple_receiver_cc.block.yml b/grc/gfdm_simple_receiver_cc.block.yml
diff --git a/grc/gfdm_transmitter_cc.block.yml b/grc/gfdm_transmitter_cc.block.yml
diff --git a/include/gfdm/CMakeLists.txt b/include/gfdm/CMakeLists.txt
diff --git a/include/gfdm/add_cyclic_prefix_cc.h b/include/gfdm/add_cyclic_prefix_cc.h
diff --git a/include/gfdm/advanced_receiver_kernel_cc.h b/include/gfdm/advanced_receiver_kernel_cc.h
diff --git a/include/gfdm/advanced_receiver_sb_cc.h b/include/gfdm/advanced_receiver_sb_cc.h
diff --git a/include/gfdm/api.h b/include/gfdm/api.h
diff --git a/include/gfdm/channel_estimator_cc.h b/include/gfdm/channel_estimator_cc.h
diff --git a/include/gfdm/cyclic_prefixer_cc.h b/include/gfdm/cyclic_prefixer_cc.h
diff --git a/include/gfdm/extract_burst_cc.h b/include/gfdm/extract_burst_cc.h
diff --git a/include/gfdm/gfdm_kernel_utils.h b/include/gfdm/gfdm_kernel_utils.h
diff --git a/include/gfdm/gfdm_utils.h b/include/gfdm/gfdm_utils.h
diff --git a/include/gfdm/modulator_cc.h b/include/gfdm/modulator_cc.h
diff --git a/include/gfdm/modulator_kernel_cc.h b/include/gfdm/modulator_kernel_cc.h
diff --git a/include/gfdm/preamble_channel_estimator_cc.h b/include/gfdm/preamble_channel_estimator_cc.h
diff --git a/include/gfdm/preamble_generator.h b/include/gfdm/preamble_generator.h
diff --git a/include/gfdm/receiver_kernel_cc.h b/include/gfdm/receiver_kernel_cc.h
diff --git a/include/gfdm/remove_prefix_cc.h b/include/gfdm/remove_prefix_cc.h
diff --git a/include/gfdm/resource_demapper_cc.h b/include/gfdm/resource_demapper_cc.h
diff --git a/include/gfdm/resource_demapper_kernel_cc.h b/include/gfdm/resource_demapper_kernel_cc.h
diff --git a/include/gfdm/resource_mapper_cc.h b/include/gfdm/resource_mapper_cc.h
diff --git a/include/gfdm/resource_mapper_kernel_cc.h b/include/gfdm/resource_mapper_kernel_cc.h
diff --git a/include/gfdm/short_burst_shaper.h b/include/gfdm/short_burst_shaper.h
diff --git a/include/gfdm/simple_modulator_cc.h b/include/gfdm/simple_modulator_cc.h
diff --git a/include/gfdm/simple_receiver_cc.h b/include/gfdm/simple_receiver_cc.h
diff --git a/include/gfdm/transmitter_cc.h b/include/gfdm/transmitter_cc.h
diff --git a/include/gfdm/transmitter_kernel.h b/include/gfdm/transmitter_kernel.h
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
diff --git a/lib/add_cyclic_prefix_cc.cc b/lib/add_cyclic_prefix_cc.cc
diff --git a/lib/advanced_receiver_kernel_cc.cc b/lib/advanced_receiver_kernel_cc.cc
diff --git a/lib/advanced_receiver_sb_cc_impl.cc b/lib/advanced_receiver_sb_cc_impl.cc
diff --git a/lib/advanced_receiver_sb_cc_impl.h b/lib/advanced_receiver_sb_cc_impl.h
diff --git a/lib/channel_estimator_cc_impl.cc b/lib/channel_estimator_cc_impl.cc
diff --git a/lib/channel_estimator_cc_impl.h b/lib/channel_estimator_cc_impl.h
diff --git a/lib/cyclic_prefixer_cc_impl.cc b/lib/cyclic_prefixer_cc_impl.cc
diff --git a/lib/cyclic_prefixer_cc_impl.h b/lib/cyclic_prefixer_cc_impl.h
diff --git a/lib/extract_burst_cc_impl.cc b/lib/extract_burst_cc_impl.cc
diff --git a/lib/extract_burst_cc_impl.h b/lib/extract_burst_cc_impl.h
diff --git a/lib/gfdm_kernel_utils.cc b/lib/gfdm_kernel_utils.cc
diff --git a/lib/gfdm_utils.cc b/lib/gfdm_utils.cc
diff --git a/lib/modulator_cc_impl.cc b/lib/modulator_cc_impl.cc
diff --git a/lib/modulator_cc_impl.h b/lib/modulator_cc_impl.h
diff --git a/lib/modulator_kernel_cc.cc b/lib/modulator_kernel_cc.cc
diff --git a/lib/preamble_channel_estimator_cc.cc b/lib/preamble_channel_estimator_cc.cc
diff --git a/lib/preamble_generator.cc b/lib/preamble_generator.cc
diff --git a/lib/qa_gfdm.cc b/lib/qa_gfdm.cc
diff --git a/lib/qa_gfdm.h b/lib/qa_gfdm.h
diff --git a/lib/receiver_kernel_cc.cc b/lib/receiver_kernel_cc.cc
diff --git a/lib/remove_prefix_cc_impl.cc b/lib/remove_prefix_cc_impl.cc
diff --git a/lib/remove_prefix_cc_impl.h b/lib/remove_prefix_cc_impl.h
diff --git a/lib/resource_demapper_cc_impl.cc b/lib/resource_demapper_cc_impl.cc
diff --git a/lib/resource_demapper_cc_impl.h b/lib/resource_demapper_cc_impl.h
diff --git a/lib/resource_demapper_kernel_cc.cc b/lib/resource_demapper_kernel_cc.cc
diff --git a/lib/resource_mapper_cc_impl.cc b/lib/resource_mapper_cc_impl.cc
diff --git a/lib/resource_mapper_cc_impl.h b/lib/resource_mapper_cc_impl.h
diff --git a/lib/resource_mapper_kernel_cc.cc b/lib/resource_mapper_kernel_cc.cc
diff --git a/lib/short_burst_shaper_impl.cc b/lib/short_burst_shaper_impl.cc
diff --git a/lib/short_burst_shaper_impl.h b/lib/short_burst_shaper_impl.h
diff --git a/lib/simple_modulator_cc_impl.cc b/lib/simple_modulator_cc_impl.cc
diff --git a/lib/simple_modulator_cc_impl.h b/lib/simple_modulator_cc_impl.h
diff --git a/lib/simple_receiver_cc_impl.cc b/lib/simple_receiver_cc_impl.cc
diff --git a/lib/simple_receiver_cc_impl.h b/lib/simple_receiver_cc_impl.h
diff --git a/lib/test_gfdm.cc b/lib/test_gfdm.cc
diff --git a/lib/transmitter_cc_impl.cc b/lib/transmitter_cc_impl.cc
diff --git a/lib/transmitter_cc_impl.h b/lib/transmitter_cc_impl.h
diff --git a/lib/transmitter_kernel.cc b/lib/transmitter_kernel.cc
diff --git a/python/.gitignore b/python/.gitignore
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
diff --git a/python/__init__.py b/python/__init__.py
diff --git a/python/build_utils.py b/python/build_utils.py
diff --git a/python/build_utils_codes.py b/python/build_utils_codes.py
diff --git a/python/cython/.gitignore b/python/cython/.gitignore
diff --git a/python/cython/README.md b/python/cython/README.md
diff --git a/python/cython/cgfdm.pyx b/python/cython/cgfdm.pyx
diff --git a/python/cython/gfdm_evaluation.py b/python/cython/gfdm_evaluation.py
diff --git a/python/cython/gfdm_interface.pxd b/python/cython/gfdm_interface.pxd
diff --git a/python/cython/gfdm_wrapper_test.py b/python/cython/gfdm_wrapper_test.py
diff --git a/python/pygfdm/CMakeLists.txt b/python/pygfdm/CMakeLists.txt
diff --git a/python/pygfdm/__init__.py b/python/pygfdm/__init__.py
diff --git a/python/pygfdm/converter.py b/python/pygfdm/converter.py
diff --git a/python/pygfdm/correlation.py b/python/pygfdm/correlation.py
diff --git a/python/pygfdm/cyclic_prefix.py b/python/pygfdm/cyclic_prefix.py
diff --git a/python/pygfdm/filters.py b/python/pygfdm/filters.py
diff --git a/python/pygfdm/gfdm_modulation.py b/python/pygfdm/gfdm_modulation.py
diff --git a/python/pygfdm/gfdm_plot_utils.py b/python/pygfdm/gfdm_plot_utils.py
diff --git a/python/pygfdm/gfdm_receiver.py b/python/pygfdm/gfdm_receiver.py
diff --git a/python/pygfdm/gfdm_tests.py b/python/pygfdm/gfdm_tests.py
diff --git a/python/pygfdm/mapping.py b/python/pygfdm/mapping.py
diff --git a/python/pygfdm/modulation.py b/python/pygfdm/modulation.py
diff --git a/python/pygfdm/ota_validation.py b/python/pygfdm/ota_validation.py
diff --git a/python/pygfdm/preamble.py b/python/pygfdm/preamble.py
diff --git a/python/pygfdm/receiver.py b/python/pygfdm/receiver.py
diff --git a/python/pygfdm/synchronization.py b/python/pygfdm/synchronization.py
diff --git a/python/pygfdm/testsuite.py b/python/pygfdm/testsuite.py
diff --git a/python/pygfdm/utils.py b/python/pygfdm/utils.py
diff --git a/python/pygfdm/validation_utils.py b/python/pygfdm/validation_utils.py
diff --git a/python/qa_channel_estimator_cc.py b/python/qa_channel_estimator_cc.py
diff --git a/python/qa_extract_burst_cc.py b/python/qa_extract_burst_cc.py
diff --git a/python/qa_pygfdm_module.py b/python/qa_pygfdm_module.py
diff --git a/python/qa_remove_prefix_cc.py b/python/qa_remove_prefix_cc.py
diff --git a/python/qa_short_burst_shaper.py b/python/qa_short_burst_shaper.py
diff --git a/python/qa_transmitter_cc.py b/python/qa_transmitter_cc.py
diff --git a/python/qa_transmitter_chain_cc.py b/python/qa_transmitter_chain_cc.py
diff --git a/python/qa_vc_compatibility_check.py b/python/qa_vc_compatibility_check.py
diff --git a/python/setup.cfg b/python/setup.cfg
diff --git a/python/setup.py b/python/setup.py
diff --git a/swig/CMakeLists.txt b/swig/CMakeLists.txt
diff --git a/swig/gfdm_swig.i b/swig/gfdm_swig.i
diff --git a/swig/preamble_generator.i b/swig/preamble_generator.i
-Original file line number
+Diff line change
@@ -1,4 +1,4 @@
-    build/*
+    build/
     .ycm_extra_conf.*
     *.swp
     *.pyc
@@ Expand Down @@