[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r4531 - gnuradio/branches/developers/n4hy/ofdm/gnuradi
From: |
trondeau |
Subject: |
[Commit-gnuradio] r4531 - gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm |
Date: |
Mon, 19 Feb 2007 16:55:07 -0700 (MST) |
Author: trondeau
Date: 2007-02-19 16:55:07 -0700 (Mon, 19 Feb 2007)
New Revision: 4531
Removed:
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm/receive_path_simple.py
Modified:
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm/benchmark_ofdm.py
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm/receive_path.py
Log:
building better receive_path, getting rid of unnecessary receive_path_simple
Modified:
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm/benchmark_ofdm.py
===================================================================
---
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm/benchmark_ofdm.py
2007-02-19 23:40:04 UTC (rev 4530)
+++
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm/benchmark_ofdm.py
2007-02-19 23:55:07 UTC (rev 4531)
@@ -30,7 +30,7 @@
# from current dir
from transmit_path import transmit_path
-from receive_path_simple import receive_path
+from receive_path import receive_path
import ofdm
class awgn_channel(gr.hier_block):
@@ -48,8 +48,6 @@
fg.connect(self.mixer_offset, (self.noise_adder,1))
fg.connect(self.noise, (self.noise_adder,0))
- print frequency_offset
- print sample_rate
gr.hier_block.__init__(self, fg, self.input, self.noise_adder)
class my_graph(gr.flow_graph):
@@ -59,7 +57,7 @@
channel_on = True
SNR = 10.0**(options.snr/10.0)
- frequency_offset = options.frequency_offset #/ options.fft_length
+ frequency_offset = options.frequency_offset
power_in_signal = options.occupied_tones
noise_power_in_channel = power_in_signal/SNR
Modified:
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm/receive_path.py
===================================================================
---
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm/receive_path.py
2007-02-19 23:40:04 UTC (rev 4530)
+++
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm/receive_path.py
2007-02-19 23:55:07 UTC (rev 4531)
@@ -57,11 +57,11 @@
# receiver
self.packet_receiver = \
- blks.demod_pkts(fg,
- self.ofdm_demod,
- access_code=None,
- callback=self._rx_callback,
- threshold=-1)
+ blks.demod_ofdm_pkts(fg,
+ self.ofdm_demod,
+ access_code=None,
+ callback=self._rx_callback,
+ threshold=-1)
# Carrier Sensing Blocks
alpha = 0.001
Deleted:
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm/receive_path_simple.py
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r4531 - gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm,
trondeau <=