summaryrefslogtreecommitdiff
path: root/gr-digital/python/ofdm_receiver.py
diff options
context:
space:
mode:
authorTom Rondeau2011-10-12 17:31:39 -0400
committerTom Rondeau2011-10-12 17:31:39 -0400
commit9edab7aec9c59ad56956d19c34539f26aec069af (patch)
tree322c9f5019448e5bc173138e1e6d94d9a5938fd4 /gr-digital/python/ofdm_receiver.py
parent1c3f94bb119b76db9159941ace08c318c5a3fbba (diff)
downloadgnuradio-9edab7aec9c59ad56956d19c34539f26aec069af.tar.gz
gnuradio-9edab7aec9c59ad56956d19c34539f26aec069af.tar.bz2
gnuradio-9edab7aec9c59ad56956d19c34539f26aec069af.zip
digital: benchmark_tx and benchmark_rx are working to/from file.
Diffstat (limited to 'gr-digital/python/ofdm_receiver.py')
-rw-r--r--gr-digital/python/ofdm_receiver.py39
1 files changed, 21 insertions, 18 deletions
diff --git a/gr-digital/python/ofdm_receiver.py b/gr-digital/python/ofdm_receiver.py
index d89c79c4d..6c19cb32e 100644
--- a/gr-digital/python/ofdm_receiver.py
+++ b/gr-digital/python/ofdm_receiver.py
@@ -23,7 +23,10 @@
import math
from numpy import fft
from gnuradio import gr
-import digital_swig
+from ofdm_sync_pn import ofdm_sync_pn
+from ofdm_sync_fixed import ofdm_sync_fixed
+from ofdm_sync_pnac import ofdm_sync_pnac
+from ofdm_sync_ml import ofdm_sync_ml
class ofdm_receiver(gr.hier_block2):
"""
@@ -83,22 +86,22 @@ class ofdm_receiver(gr.hier_block2):
SYNC = "pn"
if SYNC == "ml":
nco_sensitivity = -1.0/fft_length # correct for fine frequency
- self.ofdm_sync = digital_swig.ofdm_sync_ml(fft_length,
- cp_length,
- snr,
- ks0time,
- logging)
+ self.ofdm_sync = ofdm_sync_ml(fft_length,
+ cp_length,
+ snr,
+ ks0time,
+ logging)
elif SYNC == "pn":
nco_sensitivity = -2.0/fft_length # correct for fine frequency
- self.ofdm_sync = digital_swig.ofdm_sync_pn(fft_length,
- cp_length,
- logging)
+ self.ofdm_sync = ofdm_sync_pn(fft_length,
+ cp_length,
+ logging)
elif SYNC == "pnac":
nco_sensitivity = -2.0/fft_length # correct for fine frequency
- self.ofdm_sync = digital_swig.ofdm_sync_pnac(fft_length,
- cp_length,
- ks0time,
- logging)
+ self.ofdm_sync = ofdm_sync_pnac(fft_length,
+ cp_length,
+ ks0time,
+ logging)
# for testing only; do not user over the air
# remove filter and filter delay for this
elif SYNC == "fixed":
@@ -106,11 +109,11 @@ class ofdm_receiver(gr.hier_block2):
nsymbols = 18 # enter the number of symbols per packet
freq_offset = 0.0 # if you use a frequency offset, enter it here
nco_sensitivity = -2.0/fft_length # correct for fine frequency
- self.ofdm_sync = digital_swig.ofdm_sync_fixed(fft_length,
- cp_length,
- nsymbols,
- freq_offset,
- logging)
+ self.ofdm_sync = ofdm_sync_fixed(fft_length,
+ cp_length,
+ nsymbols,
+ freq_offset,
+ logging)
# Set up blocks