diff options
| author | Johnathan Corgan | 2011-07-18 05:44:42 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2011-07-18 05:44:42 -0700 |
| commit | a6a51938fabe4cbcd6de596b479a4f8c343deb86 (patch) | |
| tree | 454201156691c02adbdee3539afcf5e6e405ad51 | |
| parent | 37d2e0ecdb74183d40a4097c6404d252acea5fd1 (diff) | |
| parent | ece528da43f561eaa4f6de46f7bdab976cc85547 (diff) | |
| download | gnuradio-a6a51938fabe4cbcd6de596b479a4f8c343deb86.tar.gz gnuradio-a6a51938fabe4cbcd6de596b479a4f8c343deb86.tar.bz2 gnuradio-a6a51938fabe4cbcd6de596b479a4f8c343deb86.zip | |
Merge remote branch 'gnuradio/next' into wip/vocoders
| -rw-r--r-- | gr-digital/python/Makefile.am | 6 | ||||
| -rw-r--r-- | gr-digital/python/__init__.py | 3 | ||||
| -rw-r--r-- | gr-digital/python/generic_mod_demod.py | 2 | ||||
| -rw-r--r-- | gr-digital/python/psk2.py | 4 | ||||
| -rw-r--r-- | gr-digital/python/qam.py | 7 |
5 files changed, 13 insertions, 9 deletions
diff --git a/gr-digital/python/Makefile.am b/gr-digital/python/Makefile.am index f0bfbc28f..392ce45c1 100644 --- a/gr-digital/python/Makefile.am +++ b/gr-digital/python/Makefile.am @@ -46,5 +46,9 @@ digital_PYTHON = \ generic_mod_demod.py \ qam.py \ bpsk.py \ - qpsk.py + qpsk.py \ + ofdm.py \ + pkt.py \ + modulation_utils2.py + endif diff --git a/gr-digital/python/__init__.py b/gr-digital/python/__init__.py index a17128e7d..3d0be3865 100644 --- a/gr-digital/python/__init__.py +++ b/gr-digital/python/__init__.py @@ -27,3 +27,6 @@ from dqpsk import * from d8psk import * from psk2 import * from qam import * +from ofdm import * +from pkt import * +from modulation_utils2 import * diff --git a/gr-digital/python/generic_mod_demod.py b/gr-digital/python/generic_mod_demod.py index 04302f0a4..f8051db0a 100644 --- a/gr-digital/python/generic_mod_demod.py +++ b/gr-digital/python/generic_mod_demod.py @@ -26,7 +26,7 @@ Generic modulation and demodulation. """ from gnuradio import gr -from gnuradio.modulation_utils2 import extract_kwargs_from_options_for_class +from modulation_utils2 import extract_kwargs_from_options_for_class #from gnuradio.digital.utils import mod_codes from utils import mod_codes import digital_swig diff --git a/gr-digital/python/psk2.py b/gr-digital/python/psk2.py index 6ab398e42..778c1e5e5 100644 --- a/gr-digital/python/psk2.py +++ b/gr-digital/python/psk2.py @@ -26,9 +26,9 @@ PSK modulation and demodulation. from math import pi, log from cmath import exp -from gnuradio import gr, modulation_utils2 +from gnuradio import gr import digital_swig -#from gnuradio.digital.generic_mod_demod import generic_mod, generic_demod +import modulation_utils2 from utils import mod_codes, gray_code from generic_mod_demod import generic_mod, generic_demod diff --git a/gr-digital/python/qam.py b/gr-digital/python/qam.py index 5eb34e4b2..ee2b1e416 100644 --- a/gr-digital/python/qam.py +++ b/gr-digital/python/qam.py @@ -25,11 +25,8 @@ QAM modulation and demodulation. from math import pi, sqrt, log -from gnuradio import gr, modulation_utils2 -#from gnuradio.digital.generic_mod_demod import generic_mod, generic_demod -#from gnuradio.digital.utils.gray_code import gray_code -#from gnuradio.digital.utils import mod_codes - +from gnuradio import gr +import modulation_utils2 from generic_mod_demod import generic_mod, generic_demod from utils.gray_code import gray_code from utils import mod_codes |