diff options
Diffstat (limited to 'gr-digital/python')
| -rw-r--r-- | gr-digital/python/__init__.py | 7 | ||||
| -rw-r--r-- | gr-digital/python/generic_mod_demod.py | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/gr-digital/python/__init__.py b/gr-digital/python/__init__.py index b8060140e..0fc48cc79 100644 --- a/gr-digital/python/__init__.py +++ b/gr-digital/python/__init__.py @@ -26,13 +26,8 @@ from psk2 import * from bpsk import * from qpsk import * from qam import * -<<<<<<< HEAD from gmsk import * from pkt import * -from packet_utils import * from crc import * -======= -from ofdm import * -from pkt import * +from packet_utils import * from modulation_utils2 import * ->>>>>>> next diff --git a/gr-digital/python/generic_mod_demod.py b/gr-digital/python/generic_mod_demod.py index b1986512f..7d98c87da 100644 --- a/gr-digital/python/generic_mod_demod.py +++ b/gr-digital/python/generic_mod_demod.py @@ -112,7 +112,7 @@ class generic_mod(gr.hier_block2): self._differential = differential if self._samples_per_symbol < 2: - raise TypeError, ("sbp must be >= 2, is %d" % self._samples_per_symbol) + raise TypeError, ("sbp must be >= 2, is %f" % self._samples_per_symbol) arity = pow(2,self.bits_per_symbol()) |