diff options
| author | Martin Braun <martin.braun@ettus.com> | 2018-02-03 16:58:15 +0100 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2018-02-03 16:58:43 +0100 |
| commit | db7e26bc73fd71bc88249131f57f7edef308fa63 (patch) | |
| tree | d084ad2615012d53c50a230821761349eb978d56 /gr-digital/python | |
| parent | 3c63f7334d6de70d655aa97fcccbfb950645f4d4 (diff) | |
| parent | a35e10870bbb9a71b3ab66b1dc58135e08c9543e (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gr-digital/python')
| -rw-r--r-- | gr-digital/python/digital/generic_mod_demod.py | 2 | ||||
| -rw-r--r-- | gr-digital/python/digital/gfsk.py | 2 | ||||
| -rw-r--r-- | gr-digital/python/digital/ofdm_sync_pn.py | 2 | ||||
| -rwxr-xr-x | gr-digital/python/digital/psk_constellations.py | 2 | ||||
| -rwxr-xr-x | gr-digital/python/digital/qa_constellation_receiver.py | 2 | ||||
| -rwxr-xr-x | gr-digital/python/digital/qa_ofdm_sync_sc_cfb.py | 2 | ||||
| -rwxr-xr-x | gr-digital/python/digital/qam_constellations.py | 2 | ||||
| -rwxr-xr-x | gr-digital/python/digital/test_soft_decisions.py | 6 |
8 files changed, 10 insertions, 10 deletions
diff --git a/gr-digital/python/digital/generic_mod_demod.py b/gr-digital/python/digital/generic_mod_demod.py index 1b8e1149c9..b26966fbcf 100644 --- a/gr-digital/python/digital/generic_mod_demod.py +++ b/gr-digital/python/digital/generic_mod_demod.py @@ -81,7 +81,7 @@ def add_common_options(parser): help="Select modulation code from: %s [default=%%default]" % (', '.join(mod_codes.codes),)) parser.add_option("", "--excess-bw", type="float", default=_def_excess_bw, - help="set RRC excess bandwith factor [default=%default]") + help="set RRC excess bandwidth factor [default=%default]") # ///////////////////////////////////////////////////////////////////////////// diff --git a/gr-digital/python/digital/gfsk.py b/gr-digital/python/digital/gfsk.py index 3569ffe6cf..032302b103 100644 --- a/gr-digital/python/digital/gfsk.py +++ b/gr-digital/python/digital/gfsk.py @@ -195,7 +195,7 @@ class gfsk_demod(gr.hier_block2): verbose: Print information about modulator? (bool) log: Print modualtion data to files? (bool) - Clock recovery parameters. These all have reasonble defaults. + Clock recovery parameters. These all have reasonable defaults. Args: gain_mu: controls rate of mu adjustment (float) diff --git a/gr-digital/python/digital/ofdm_sync_pn.py b/gr-digital/python/digital/ofdm_sync_pn.py index 8bf7ed782a..0e79c67ca0 100644 --- a/gr-digital/python/digital/ofdm_sync_pn.py +++ b/gr-digital/python/digital/ofdm_sync_pn.py @@ -39,7 +39,7 @@ class ofdm_sync_pn(gr.hier_block2): """ OFDM synchronization using PN Correlation: T. M. Schmidl and D. C. Cox, "Robust Frequency and Timing - Synchonization for OFDM," IEEE Trans. Communications, vol. 45, + Synchronization for OFDM," IEEE Trans. Communications, vol. 45, no. 12, 1997. """ diff --git a/gr-digital/python/digital/psk_constellations.py b/gr-digital/python/digital/psk_constellations.py index d2db4e848b..ee3c2e6070 100755 --- a/gr-digital/python/digital/psk_constellations.py +++ b/gr-digital/python/digital/psk_constellations.py @@ -21,7 +21,7 @@ # import numpy -from constellation_map_generator import * +from constellation_map_generator import constellation_map_generator ''' Note on the naming scheme. Each constellation is named using a prefix diff --git a/gr-digital/python/digital/qa_constellation_receiver.py b/gr-digital/python/digital/qa_constellation_receiver.py index 80d9c43d81..f0d7275d34 100755 --- a/gr-digital/python/digital/qa_constellation_receiver.py +++ b/gr-digital/python/digital/qa_constellation_receiver.py @@ -110,7 +110,7 @@ class test_constellation_receiver(gr_unittest.TestCase): for req_correct, tcs in requirements: for constellation, differential in tcs: # The constellation_receiver doesn't work for constellations - # of multple dimensions (i.e. multiple complex numbers to a + # of multiple dimensions (i.e. multiple complex numbers to a # single symbol). # That is not implemented since the receiver has no way of # knowing where the beginning of a symbol is. diff --git a/gr-digital/python/digital/qa_ofdm_sync_sc_cfb.py b/gr-digital/python/digital/qa_ofdm_sync_sc_cfb.py index ccb6dff439..1558c5d51f 100755 --- a/gr-digital/python/digital/qa_ofdm_sync_sc_cfb.py +++ b/gr-digital/python/digital/qa_ofdm_sync_sc_cfb.py @@ -68,7 +68,7 @@ class qa_ofdm_sync_sc_cfb (gr_unittest.TestCase): self.assertEqual(numpy.sum(sig2_detect), 1) def test_002_freq (self): - """ Add a fine frequency offset and see if that get's detected properly """ + """ Add a fine frequency offset and see if that gets detected properly """ fft_len = 32 cp_len = 4 # This frequency offset is normalized to rads, i.e. \pi == f_s/2 diff --git a/gr-digital/python/digital/qam_constellations.py b/gr-digital/python/digital/qam_constellations.py index ab58916384..cd895c590b 100755 --- a/gr-digital/python/digital/qam_constellations.py +++ b/gr-digital/python/digital/qam_constellations.py @@ -21,7 +21,7 @@ # import numpy -from constellation_map_generator import * +from constellation_map_generator import constellation_map_generator ''' Note on the naming scheme. Each constellation is named using a prefix diff --git a/gr-digital/python/digital/test_soft_decisions.py b/gr-digital/python/digital/test_soft_decisions.py index 78714100b7..878058ebbc 100755 --- a/gr-digital/python/digital/test_soft_decisions.py +++ b/gr-digital/python/digital/test_soft_decisions.py @@ -22,9 +22,9 @@ import numpy, pylab, sys from gnuradio import digital -from soft_dec_lut_gen import * -from psk_constellations import * -from qam_constellations import * +from soft_dec_lut_gen import soft_dec_table, calc_soft_dec_from_table, calc_soft_dec +from psk_constellations import psk_4_0, psk_4_1, psk_4_2, psk_4_3, psk_4_4, psk_4_5, psk_4_6, psk_4_7, sd_psk_4_0, sd_psk_4_1, sd_psk_4_2, sd_psk_4_3, sd_psk_4_4, sd_psk_4_5, sd_psk_4_6, sd_psk_4_7 +from qam_constellations import qam_16_0, sd_qam_16_0 def test_qpsk(i, sample, prec): qpsk_const_list = [psk_4_0, psk_4_1, psk_4_2, psk_4_3, |