summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rondeau <trondeau@vt.edu>2011-10-12 23:02:56 -0400
committerTom Rondeau <trondeau@vt.edu>2011-10-12 23:02:56 -0400
commit73ccc57f0f8c25162b8a3410e8a9e59c9e824a45 (patch)
tree1bc5488f54adc666324cd8607e1151c0af58bf63
parentd53109a88522d243bf684ffe1a9aad2801c52f07 (diff)
digital: changed modulation_utils2 to modulation_utils and update all files using it.
Diffstat
-rwxr-xr-xgr-digital/examples/narrowband/benchmark_rx.py2
-rwxr-xr-xgr-digital/examples/narrowband/benchmark_tx.py2
-rwxr-xr-xgr-digital/examples/narrowband/digital_bert_rx.py4
-rwxr-xr-xgr-digital/examples/narrowband/digital_bert_tx.py2
-rwxr-xr-xgr-digital/examples/narrowband/rx_voice.py2
-rwxr-xr-xgr-digital/examples/narrowband/tunnel.py4
-rwxr-xr-xgr-digital/examples/narrowband/tx_voice.py2
-rw-r--r--gr-digital/python/Makefile.am2
-rw-r--r--gr-digital/python/__init__.py2
-rw-r--r--gr-digital/python/bpsk.py14
-rw-r--r--gr-digital/python/cpm.py8
-rw-r--r--gr-digital/python/generic_mod_demod.py2
-rw-r--r--gr-digital/python/gmsk.py10
-rw-r--r--gr-digital/python/modulation_utils.py (renamed from gr-digital/python/modulation_utils2.py)0
-rw-r--r--gr-digital/python/psk.py8
-rw-r--r--gr-digital/python/qam.py8
-rw-r--r--gr-digital/python/qpsk.py14
17 files changed, 43 insertions, 43 deletions
diff --git a/gr-digital/examples/narrowband/benchmark_rx.py b/gr-digital/examples/narrowband/benchmark_rx.py
index 1439481941..65aac3638c 100755
--- a/gr-digital/examples/narrowband/benchmark_rx.py
+++ b/gr-digital/examples/narrowband/benchmark_rx.py
@@ -87,7 +87,7 @@ def main():
print "ok = %5s pktno = %4d n_rcvd = %4d n_right = %4d" % (
ok, pktno, n_rcvd, n_right)
- demods = digital.modulation_utils2.type_1_demods()
+ demods = digital.modulation_utils.type_1_demods()
# Create Options Parser:
parser = OptionParser (option_class=eng_option, conflict_handler="resolve")
diff --git a/gr-digital/examples/narrowband/benchmark_tx.py b/gr-digital/examples/narrowband/benchmark_tx.py
index 6f1d752814..1fd8819814 100755
--- a/gr-digital/examples/narrowband/benchmark_tx.py
+++ b/gr-digital/examples/narrowband/benchmark_tx.py
@@ -71,7 +71,7 @@ def main():
def send_pkt(payload='', eof=False):
return tb.txpath.send_pkt(payload, eof)
- mods = digital.modulation_utils2.type_1_mods()
+ mods = digital.modulation_utils.type_1_mods()
parser = OptionParser(option_class=eng_option, conflict_handler="resolve")
expert_grp = parser.add_option_group("Expert")
diff --git a/gr-digital/examples/narrowband/digital_bert_rx.py b/gr-digital/examples/narrowband/digital_bert_rx.py
index 9ee1f5ee84..9878f55e19 100755
--- a/gr-digital/examples/narrowband/digital_bert_rx.py
+++ b/gr-digital/examples/narrowband/digital_bert_rx.py
@@ -178,7 +178,7 @@ def get_options(demods):
uhd_receiver.add_options(parser)
- demods = digital.modulation_utils2.type_1_demods()
+ demods = digital.modulation_utils.type_1_demods()
for mod in demods.values():
mod.add_options(parser)
@@ -191,7 +191,7 @@ def get_options(demods):
if __name__ == "__main__":
- demods = digital.modulation_utils2.type_1_demods()
+ demods = digital.modulation_utils.type_1_demods()
(options, args) = get_options(demods)
diff --git a/gr-digital/examples/narrowband/digital_bert_tx.py b/gr-digital/examples/narrowband/digital_bert_tx.py
index 6b544c7f73..96cb338fe3 100755
--- a/gr-digital/examples/narrowband/digital_bert_tx.py
+++ b/gr-digital/examples/narrowband/digital_bert_tx.py
@@ -122,7 +122,7 @@ def get_options(mods):
return (options, args)
if __name__ == "__main__":
- mods = digital.modulation_utils2.type_1_mods()
+ mods = digital.modulation_utils.type_1_mods()
(options, args) = get_options(mods)
diff --git a/gr-digital/examples/narrowband/rx_voice.py b/gr-digital/examples/narrowband/rx_voice.py
index b58704e16f..42d7b893be 100755
--- a/gr-digital/examples/narrowband/rx_voice.py
+++ b/gr-digital/examples/narrowband/rx_voice.py
@@ -114,7 +114,7 @@ def main():
print "ok = %r n_rcvd = %4d n_right = %4d" % (
ok, n_rcvd, n_right)
- demods = digital.modulation_utils2.type_1_demods()
+ demods = digital.modulation_utils.type_1_demods()
# Create Options Parser:
parser = OptionParser (option_class=eng_option, conflict_handler="resolve")
diff --git a/gr-digital/examples/narrowband/tunnel.py b/gr-digital/examples/narrowband/tunnel.py
index d25594df59..970920e6ee 100755
--- a/gr-digital/examples/narrowband/tunnel.py
+++ b/gr-digital/examples/narrowband/tunnel.py
@@ -189,8 +189,8 @@ class cs_mac(object):
def main():
- mods = digital.modulation_utils2.type_1_mods()
- demods = digital.modulation_utils2.type_1_demods()
+ mods = digital.modulation_utils.type_1_mods()
+ demods = digital.modulation_utils.type_1_demods()
parser = OptionParser (option_class=eng_option, conflict_handler="resolve")
expert_grp = parser.add_option_group("Expert")
diff --git a/gr-digital/examples/narrowband/tx_voice.py b/gr-digital/examples/narrowband/tx_voice.py
index eabb5e3c37..3d767a0770 100755
--- a/gr-digital/examples/narrowband/tx_voice.py
+++ b/gr-digital/examples/narrowband/tx_voice.py
@@ -102,7 +102,7 @@ def main():
def rx_callback(ok, payload):
print "ok = %r, payload = '%s'" % (ok, payload)
- mods = digital.modulation_utils2.type_1_mods()
+ mods = digital.modulation_utils.type_1_mods()
parser = OptionParser(option_class=eng_option, conflict_handler="resolve")
expert_grp = parser.add_option_group("Expert")
diff --git a/gr-digital/python/Makefile.am b/gr-digital/python/Makefile.am
index d8c332ff8d..e24af995e7 100644
--- a/gr-digital/python/Makefile.am
+++ b/gr-digital/python/Makefile.am
@@ -53,7 +53,7 @@ digital_PYTHON = \
crc.py \
generic_mod_demod.py \
gmsk.py \
- modulation_utils2.py \
+ modulation_utils.py \
ofdm.py \
ofdm_packet_utils.py \
ofdm_receiver.py \
diff --git a/gr-digital/python/__init__.py b/gr-digital/python/__init__.py
index 7e78324810..7c76183c9d 100644
--- a/gr-digital/python/__init__.py
+++ b/gr-digital/python/__init__.py
@@ -34,7 +34,7 @@ from gmsk import *
from cpm import *
from pkt import *
from crc import *
-from modulation_utils2 import *
+from modulation_utils import *
from ofdm import *
from ofdm_receiver import *
from ofdm_sync_fixed import *
diff --git a/gr-digital/python/bpsk.py b/gr-digital/python/bpsk.py
index 58a8289a56..0d8f05c4c1 100644
--- a/gr-digital/python/bpsk.py
+++ b/gr-digital/python/bpsk.py
@@ -29,7 +29,7 @@ from cmath import exp
from gnuradio import gr
from gnuradio.digital.generic_mod_demod import generic_mod, generic_demod
import digital_swig
-import modulation_utils2
+import modulation_utils
# Default number of points in constellation.
_def_constellation_points = 2
@@ -163,9 +163,9 @@ class dbpsk_demod(generic_demod):
#
# Add these to the mod/demod registry
#
-modulation_utils2.add_type_1_mod('bpsk', bpsk_mod)
-modulation_utils2.add_type_1_demod('bpsk', bpsk_demod)
-modulation_utils2.add_type_1_constellation('bpsk', bpsk_constellation)
-modulation_utils2.add_type_1_mod('dbpsk', dbpsk_mod)
-modulation_utils2.add_type_1_demod('dbpsk', dbpsk_demod)
-modulation_utils2.add_type_1_constellation('dbpsk', dbpsk_constellation)
+modulation_utils.add_type_1_mod('bpsk', bpsk_mod)
+modulation_utils.add_type_1_demod('bpsk', bpsk_demod)
+modulation_utils.add_type_1_constellation('bpsk', bpsk_constellation)
+modulation_utils.add_type_1_mod('dbpsk', dbpsk_mod)
+modulation_utils.add_type_1_demod('dbpsk', dbpsk_demod)
+modulation_utils.add_type_1_constellation('dbpsk', dbpsk_constellation)
diff --git a/gr-digital/python/cpm.py b/gr-digital/python/cpm.py
index 56d0fa849d..05032336d4 100644
--- a/gr-digital/python/cpm.py
+++ b/gr-digital/python/cpm.py
@@ -29,7 +29,7 @@ from math import pi
import numpy
import digital_swig
-import modulation_utils2
+import modulation_utils
# default values (used in __init__ and add_options)
_def_samples_per_symbol = 2
@@ -227,7 +227,7 @@ class cpm_mod(gr.hier_block2):
"""
Given command line options, create dictionary suitable for passing to __init__
"""
- return modulation_utils2.extract_kwargs_from_options(cpm_mod.__init__,
+ return modulation_utils.extract_kwargs_from_options(cpm_mod.__init__,
('self',), options)
extract_kwargs_from_options=staticmethod(extract_kwargs_from_options)
@@ -243,5 +243,5 @@ class cpm_mod(gr.hier_block2):
#
# Add these to the mod/demod registry
#
-modulation_utils2.add_type_1_mod('cpm', cpm_mod)
-#modulation_utils2.add_type_1_demod('cpm', cpm_demod)
+modulation_utils.add_type_1_mod('cpm', cpm_mod)
+#modulation_utils.add_type_1_demod('cpm', cpm_demod)
diff --git a/gr-digital/python/generic_mod_demod.py b/gr-digital/python/generic_mod_demod.py
index dec96e455c..ae876e1086 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 modulation_utils2 import extract_kwargs_from_options_for_class
+from modulation_utils import extract_kwargs_from_options_for_class
from utils import mod_codes
import digital_swig
import math
diff --git a/gr-digital/python/gmsk.py b/gr-digital/python/gmsk.py
index c7a50f4227..70fa197e32 100644
--- a/gr-digital/python/gmsk.py
+++ b/gr-digital/python/gmsk.py
@@ -26,7 +26,7 @@
from gnuradio import gr
import digital_swig
-import modulation_utils2
+import modulation_utils
from math import pi
import numpy
@@ -151,7 +151,7 @@ class gmsk_mod(gr.hier_block2):
"""
Given command line options, create dictionary suitable for passing to __init__
"""
- return modulation_utils2.extract_kwargs_from_options(gmsk_mod.__init__,
+ return modulation_utils.extract_kwargs_from_options(gmsk_mod.__init__,
('self',), options)
extract_kwargs_from_options=staticmethod(extract_kwargs_from_options)
@@ -265,12 +265,12 @@ class gmsk_demod(gr.hier_block2):
"""
Given command line options, create dictionary suitable for passing to __init__
"""
- return modulation_utils2.extract_kwargs_from_options(gmsk_demod.__init__,
+ return modulation_utils.extract_kwargs_from_options(gmsk_demod.__init__,
('self',), options)
extract_kwargs_from_options=staticmethod(extract_kwargs_from_options)
#
# Add these to the mod/demod registry
#
-modulation_utils2.add_type_1_mod('gmsk', gmsk_mod)
-modulation_utils2.add_type_1_demod('gmsk', gmsk_demod)
+modulation_utils.add_type_1_mod('gmsk', gmsk_mod)
+modulation_utils.add_type_1_demod('gmsk', gmsk_demod)
diff --git a/gr-digital/python/modulation_utils2.py b/gr-digital/python/modulation_utils.py
index cb3a9812d4..cb3a9812d4 100644
--- a/gr-digital/python/modulation_utils2.py
+++ b/gr-digital/python/modulation_utils.py
diff --git a/gr-digital/python/psk.py b/gr-digital/python/psk.py
index 82781e63b0..58f6787f0c 100644
--- a/gr-digital/python/psk.py
+++ b/gr-digital/python/psk.py
@@ -27,7 +27,7 @@ from math import pi, log
from cmath import exp
import digital_swig
-import modulation_utils2
+import modulation_utils
from utils import mod_codes, gray_code
from generic_mod_demod import generic_mod, generic_demod
@@ -117,6 +117,6 @@ class psk_demod(generic_demod):
#
# Add these to the mod/demod registry
#
-modulation_utils2.add_type_1_mod('psk', psk_mod)
-modulation_utils2.add_type_1_demod('psk', psk_demod)
-modulation_utils2.add_type_1_constellation('psk', psk_constellation)
+modulation_utils.add_type_1_mod('psk', psk_mod)
+modulation_utils.add_type_1_demod('psk', psk_demod)
+modulation_utils.add_type_1_constellation('psk', psk_constellation)
diff --git a/gr-digital/python/qam.py b/gr-digital/python/qam.py
index 2a7e51495b..5b1f7683b8 100644
--- a/gr-digital/python/qam.py
+++ b/gr-digital/python/qam.py
@@ -29,7 +29,7 @@ from gnuradio import gr
from generic_mod_demod import generic_mod, generic_demod
from utils.gray_code import gray_code
from utils import mod_codes
-import modulation_utils2
+import modulation_utils
import digital_swig
# Default number of points in constellation.
@@ -224,6 +224,6 @@ class qam_demod(generic_demod):
#
# Add these to the mod/demod registry
#
-modulation_utils2.add_type_1_mod('qam', qam_mod)
-modulation_utils2.add_type_1_demod('qam', qam_demod)
-modulation_utils2.add_type_1_constellation('qam', qam_constellation)
+modulation_utils.add_type_1_mod('qam', qam_mod)
+modulation_utils.add_type_1_demod('qam', qam_demod)
+modulation_utils.add_type_1_constellation('qam', qam_constellation)
diff --git a/gr-digital/python/qpsk.py b/gr-digital/python/qpsk.py
index 481b7cb5b7..be21fd76f1 100644
--- a/gr-digital/python/qpsk.py
+++ b/gr-digital/python/qpsk.py
@@ -28,7 +28,7 @@ Demodulation is not included since the generic_mod_demod
from gnuradio import gr
from gnuradio.digital.generic_mod_demod import generic_mod, generic_demod
import digital_swig
-import modulation_utils2
+import modulation_utils
# Default number of points in constellation.
_def_constellation_points = 4
@@ -167,10 +167,10 @@ class dqpsk_demod(generic_demod):
#
# Add these to the mod/demod registry
#
-modulation_utils2.add_type_1_mod('qpsk', qpsk_mod)
-modulation_utils2.add_type_1_demod('qpsk', qpsk_demod)
-modulation_utils2.add_type_1_constellation('qpsk', qpsk_constellation)
-modulation_utils2.add_type_1_mod('dqpsk', dqpsk_mod)
-modulation_utils2.add_type_1_demod('dqpsk', dqpsk_demod)
-modulation_utils2.add_type_1_constellation('dqpsk', dqpsk_constellation)
+modulation_utils.add_type_1_mod('qpsk', qpsk_mod)
+modulation_utils.add_type_1_demod('qpsk', qpsk_demod)
+modulation_utils.add_type_1_constellation('qpsk', qpsk_constellation)
+modulation_utils.add_type_1_mod('dqpsk', dqpsk_mod)
+modulation_utils.add_type_1_demod('dqpsk', dqpsk_demod)
+modulation_utils.add_type_1_constellation('dqpsk', dqpsk_constellation)
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-16 19:55:54 +0000