diff options
| -rw-r--r-- | gr-controls/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | gr-controls/grc/controls_csim.xml | 2 | ||||
| -rw-r--r-- | gr-controls/grc/controls_dsim.xml | 2 | ||||
| -rw-r--r-- | gr-controls/python/__init__.py | 7 |
4 files changed, 5 insertions, 10 deletions
diff --git a/gr-controls/CMakeLists.txt b/gr-controls/CMakeLists.txt index d3a1f06a5..97ea01b70 100644 --- a/gr-controls/CMakeLists.txt +++ b/gr-controls/CMakeLists.txt @@ -22,7 +22,7 @@ ######################################################################## #include(GrBoost) -#find_package(SCIGENW3f) +#find_package(CONTROLSW3f) ######################################################################## # Register component @@ -39,7 +39,7 @@ GR_REGISTER_COMPONENT("gr-controls" ENABLE_GR_CONTROLS ######################################################################## # Begin conditional configuration ######################################################################## -if(ENABLE_GR_SCIGEN) +if(ENABLE_GR_CONTROLS) ######################################################################## # Add subdirectories diff --git a/gr-controls/grc/controls_csim.xml b/gr-controls/grc/controls_csim.xml index 0b2b38874..39e96b45e 100644 --- a/gr-controls/grc/controls_csim.xml +++ b/gr-controls/grc/controls_csim.xml @@ -11,7 +11,7 @@ CSIM Block: <key>controls_csim</key> <category>controls</category> - <import>from gnuradio import controls_csim</import> + <import>import gnuradio.controls.controls_csim as controls_csim</import> <make>controls_csim.csim() self.$(id).set_parameters($P, $I, $D, $n0, $n1, $d0, $d1, $window) </make> diff --git a/gr-controls/grc/controls_dsim.xml b/gr-controls/grc/controls_dsim.xml index 149f88186..13bf49730 100644 --- a/gr-controls/grc/controls_dsim.xml +++ b/gr-controls/grc/controls_dsim.xml @@ -10,7 +10,7 @@ <key>controls_dsim</key> <category>controls</category> - <import>from gnuradio import controls_dsim</import> + <import>import gnuradio.controls.controls_dsim as controls_dsim</import> <make>controls_dsim.dsim() self.$(id).set_parameters($P, $I, $D, $n0, $n1, $step, $d0, $d1, $window) </make> diff --git a/gr-controls/python/__init__.py b/gr-controls/python/__init__.py index ed63150cf..b9829df26 100644 --- a/gr-controls/python/__init__.py +++ b/gr-controls/python/__init__.py @@ -40,13 +40,8 @@ if _RTLD_GLOBAL != 0: sys.setdlopenflags(_dlopenflags|_RTLD_GLOBAL) # ---------------------------------------------------------------- - -# import swig generated symbols into the scimod namespace -from scimod_swig import * - # import any pure python here -from dsim import dsim -# +# Dummy File for future use # ---------------------------------------------------------------- # Tail of workaround |