[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r9576 - in gnuradio/trunk: gnuradio-core/src/lib/gener
From: |
jcorgan |
Subject: |
[Commit-gnuradio] r9576 - in gnuradio/trunk: gnuradio-core/src/lib/general gnuradio-examples/python/digital-bert |
Date: |
Sun, 14 Sep 2008 12:37:08 -0600 (MDT) |
Author: jcorgan
Date: 2008-09-14 12:37:08 -0600 (Sun, 14 Sep 2008)
New Revision: 9576
Modified:
gnuradio/trunk/gnuradio-core/src/lib/general/gr_costas_loop_cc.h
gnuradio/trunk/gnuradio-core/src/lib/general/gr_costas_loop_cc.i
gnuradio/trunk/gnuradio-examples/python/digital-bert/benchmark_rx.py
gnuradio/trunk/gnuradio-examples/python/digital-bert/receive_path.py
Log:
Adds frequency accessor for Costas loop, BERT receiver displays frequency and
timing offset
Modified: gnuradio/trunk/gnuradio-core/src/lib/general/gr_costas_loop_cc.h
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_costas_loop_cc.h
2008-09-14 17:50:28 UTC (rev 9575)
+++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_costas_loop_cc.h
2008-09-14 18:37:08 UTC (rev 9576)
@@ -129,6 +129,11 @@
int work (int noutput_items,
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items);
+
+ /*! \brief returns the current NCO frequency in radians/sample
+ *
+ */
+ float freq() const { return d_freq; }
};
#endif
Modified: gnuradio/trunk/gnuradio-core/src/lib/general/gr_costas_loop_cc.i
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_costas_loop_cc.i
2008-09-14 17:50:28 UTC (rev 9575)
+++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_costas_loop_cc.i
2008-09-14 18:37:08 UTC (rev 9576)
@@ -40,5 +40,5 @@
float alpha();
void set_beta(float beta);
float beta();
-
+ float freq();
};
Modified: gnuradio/trunk/gnuradio-examples/python/digital-bert/benchmark_rx.py
===================================================================
--- gnuradio/trunk/gnuradio-examples/python/digital-bert/benchmark_rx.py
2008-09-14 17:50:28 UTC (rev 9575)
+++ gnuradio/trunk/gnuradio-examples/python/digital-bert/benchmark_rx.py
2008-09-14 18:37:08 UTC (rev 9576)
@@ -39,8 +39,8 @@
def run(self):
while not self.done:
- print "Magnitude: %5.3f Variance: %5.3f Estimated SNR: %4.1f dB
BER: %g" % (
- tb.mag(), tb.var(), tb.snr(), tb.ber())
+ print "Freq. Offset: %5.0f Hz Timing Offset: %5.1f ppm Estimated
SNR: %4.1f dB BER: %g" % (
+ tb.frequency_offset(), tb.timing_offset()*1e6, tb.snr(),
tb.ber())
try:
time.sleep(1.0)
except KeyboardInterrupt:
@@ -104,6 +104,12 @@
def ber(self):
return self._receiver.ber()
+
+ def frequency_offset(self):
+ return self._receiver.frequency_offset()
+
+ def timing_offset(self):
+ return self._receiver.timing_offset()
def get_options():
parser = OptionParser(option_class=eng_option)
@@ -122,17 +128,17 @@
help="Select USRP decimation rate (default=%default)")
parser.add_option("", "--excess-bw", type="eng_float", default=0.35,
help="Select RRC excess bandwidth (default=%default)")
- parser.add_option("", "--costas-alpha", type="eng_float", default=0.2,
+ parser.add_option("", "--costas-alpha", type="eng_float", default=0.05,
help="set Costas loop 1st order gain,
(default=%default)")
- parser.add_option("", "--costas-beta", type="eng_float", default=0.01,
+ parser.add_option("", "--costas-beta", type="eng_float", default=0.00025,
help="set Costas loop 2nd order gain,
(default=%default)")
- parser.add_option("", "--costas-max", type="eng_float", default=0.005,
+ parser.add_option("", "--costas-max", type="eng_float", default=0.05,
help="set Costas loop max freq (rad/sample)
(default=%default)")
- parser.add_option("", "--mm-gain-mu", type="eng_float", default=0.2,
+ parser.add_option("", "--mm-gain-mu", type="eng_float", default=0.001,
help="set M&M loop 1st order gain, (default=%default)")
- parser.add_option("", "--mm-gain-omega", type="eng_float", default=0.01,
+ parser.add_option("", "--mm-gain-omega", type="eng_float",
default=0.000001,
help="set M&M loop 2nd order gain, (default=%default)")
- parser.add_option("", "--mm-omega-limit", type="eng_float", default=0.005,
+ parser.add_option("", "--mm-omega-limit", type="eng_float", default=0.0001,
help="set M&M max timing error, (default=%default)")
Modified: gnuradio/trunk/gnuradio-examples/python/digital-bert/receive_path.py
===================================================================
--- gnuradio/trunk/gnuradio-examples/python/digital-bert/receive_path.py
2008-09-14 17:50:28 UTC (rev 9575)
+++ gnuradio/trunk/gnuradio-examples/python/digital-bert/receive_path.py
2008-09-14 18:37:08 UTC (rev 9576)
@@ -41,21 +41,22 @@
gr.io_signature(1, 1, gr.sizeof_gr_complex), #
Input signature
gr.io_signature(0, 0, 0)) #
Output signature
- sps = int(if_rate/symbol_rate)
- print "IF sample rate:", n2s(if_rate)
+ self._if_rate = if_rate
+ self._sps = int(self._if_rate/symbol_rate)
+ print "IF sample rate:", n2s(self._if_rate)
print "Symbol rate:", n2s(symbol_rate)
- print "Samples/symbol:", sps
+ print "Samples/symbol:", self._sps
print "RRC bandwidth:", excess_bw
# Create AGC to scale input to unity
self._agc = gr.agc_cc(1e-5, 1.0, 1.0, 1.0)
# Create RRC with specified excess bandwidth
- taps = gr.firdes.root_raised_cosine(1.0, # Gain
- sps, # Sampling rate
- 1.0, # Symbol rate
- excess_bw, # Roll-off factor
- 11*sps) # Number of taps
+ taps = gr.firdes.root_raised_cosine(1.0, # Gain
+ self._sps, # Sampling rate
+ 1.0, # Symbol rate
+ excess_bw, # Roll-off factor
+ 11*self._sps) # Number of taps
self._rrc = gr.fir_filter_ccf(1, taps)
@@ -73,7 +74,7 @@
# Create a M&M bit synchronization retiming block
mm_mu = 0.5
- mm_omega = sps
+ mm_omega = self._sps
print "MM gain mu:", mm_gain_mu
print "MM gain omega:", mm_gain_omega
@@ -103,14 +104,15 @@
self.connect(self, self._agc, self._rrc, self._costas, self._mm,
self._c2r, self._slicer, self._descrambler, self._ber)
+ def frequency_offset(self):
+ return self._costas.freq()*self._if_rate/(2*math.pi)
+
+ def timing_offset(self):
+ return self._mm.omega()/self._sps-1.0
+
def snr(self):
return self._snr_probe.snr()
- def signal_mean(self):
- return self._snr_probe.signal_mean()
-
- def noise_variance(self):
- return self._snr_probe.noise_variance()
-
def ber(self):
return (1.0-self._ber.density())/3.0
+
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r9576 - in gnuradio/trunk: gnuradio-core/src/lib/general gnuradio-examples/python/digital-bert,
jcorgan <=