From f1c41f807cb29472d0924149e39d6ec8ad90e6a2 Mon Sep 17 00:00:00 2001
From: eb <eb@221aa14e-8319-0410-a670-987f0aec2ac5>
Date: Wed, 27 Sep 2006 05:14:03 +0000
Subject: Merged changes from eb/digital-wip into trunk.
This includes:
* renaming gnuradio-examples/python/gmsk2 to gnuradio-examples/python/digital
* refactoring the digital data tx and rx test code into benchmark_tx
and benchmark_rx. These accept a -m <modulation> argument.
<modulation> can currently be selected from gmsk, dbpsk, dqpsk
* Two new AGC blocks: gr_agc2: separate attack and delay rates;
gr_feedforward_agc: FIR-ish compressor. Normalizes to peak envelope.
* Working DBPSK mod/demod (works fine)
* Working DQPSK mod/demod (works, but still needs more work)
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3662 221aa14e-8319-0410-a670-987f0aec2ac5
---
gnuradio-core/src/python/gnuradio/blksimpl/pkt.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'gnuradio-core/src/python/gnuradio/blksimpl/pkt.py')
diff --git a/gnuradio-core/src/python/gnuradio/blksimpl/pkt.py b/gnuradio-core/src/python/gnuradio/blksimpl/pkt.py
index 05e22c90e5..a1ece893df 100644
--- a/gnuradio-core/src/python/gnuradio/blksimpl/pkt.py
+++ b/gnuradio-core/src/python/gnuradio/blksimpl/pkt.py
@@ -81,8 +81,8 @@ class mod_pkts(gr.hier_block):
else:
# print "original_payload =", string_to_hex_list(payload)
pkt = packet_utils.make_packet(payload,
- self._modulator.samples_per_baud(),
- self._modulator.bits_per_baud(),
+ self._modulator.samples_per_symbol(),
+ self._modulator.bits_per_symbol(),
self._access_code,
self._pad_for_usrp)
#print "pkt =", string_to_hex_list(pkt)
--
cgit v1.2.3