[Commit-gnuradio] r3836 - gnuradio/branches/developers/trondeau/sr_control/gnuradio-examples/python/digital

[trondeau]

Author: trondeau
Date: 2006-10-23 11:07:33 -0600 (Mon, 23 Oct 2006)
New Revision: 3836

Modified:
   
gnuradio/branches/developers/trondeau/sr_control/gnuradio-examples/python/digital/pick_bitrate_adv.py
   
gnuradio/branches/developers/trondeau/sr_control/gnuradio-examples/python/digital/receive_path.py
Log:
pick_bitrate_adv now minimizes both internal interpolation and sps; maximizes 
USRP interp to offload processing. Not tested on receiver side

Modified: 
gnuradio/branches/developers/trondeau/sr_control/gnuradio-examples/python/digital/pick_bitrate_adv.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/sr_control/gnuradio-examples/python/digital/pick_bitrate_adv.py
       2006-10-23 14:58:05 UTC (rev 3835)
+++ 
gnuradio/branches/developers/trondeau/sr_control/gnuradio-examples/python/digital/pick_bitrate_adv.py
       2006-10-23 17:07:33 UTC (rev 3836)
@@ -22,27 +22,32 @@
 _default_bitrate = 500e3
 
 _valid_samples_per_symbol = (2,3,4,5,6,7)
-_max_gr_interp_rate = 20
-_max_gr_decim_rate = 20
+_max_gr_interp_rate = 30
+_max_gr_decim_rate = 30
 
 def _gen_tx_info(converter_rate):
     results = []
+    rng = range(16, 512 + 1, 4)
+    rng.reverse()
     for samples_per_symbol in _valid_samples_per_symbol:
-        for interp in range(16, 512 + 1, 4):
+        for interp in rng:
             for gr_interp in range(1,_max_gr_interp_rate):
                 bitrate = converter_rate / (interp*gr_interp) / 
samples_per_symbol
                 results.append((bitrate, samples_per_symbol, interp, 
gr_interp))
-    results.sort()
+#    results.sort()
     return results
 
 def _gen_rx_info(converter_rate):
     results = []
+    rng = range(8, 256 + 1, 2)
+    rng.reverse()
     for samples_per_symbol in _valid_samples_per_symbol:
-        for decim in range(8, 256 + 1, 2):
+        for decim in rng:
+            print decim
             for gr_decim in range(1,_max_gr_decim_rate):
                 bitrate = converter_rate / (decim*gr_decim) / 
samples_per_symbol
                 results.append((bitrate, samples_per_symbol, decim, gr_decim))
-    results.sort()
+    #results.sort()
     return results
     
 def _filter_info(info, samples_per_symbol, xrate):
@@ -106,7 +111,7 @@
 def pick_tx_bitrate(bitrate, bits_per_symbol, samples_per_symbol,
                     interp_rate, converter_rate=128e6):
     """
-    Given the 4 input parameters, return at configuration that matches
+    Given the 4 input parameters, return a configuration that matches
 
     @param bitrate: desired bitrate or None
     @type bitrate: number or None

Modified: 
gnuradio/branches/developers/trondeau/sr_control/gnuradio-examples/python/digital/receive_path.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/sr_control/gnuradio-examples/python/digital/receive_path.py
   2006-10-23 14:58:05 UTC (rev 3835)
+++ 
gnuradio/branches/developers/trondeau/sr_control/gnuradio-examples/python/digital/receive_path.py
   2006-10-23 17:07:33 UTC (rev 3836)
@@ -27,7 +27,7 @@
 import sys
 
 # from current dir
-from pick_bitrate import pick_rx_bitrate
+from pick_bitrate_adv import pick_rx_bitrate
 
 # /////////////////////////////////////////////////////////////////////////////
 #                              receive path
@@ -67,7 +67,7 @@
         demod_kwargs = self._demod_class.extract_kwargs_from_options(options)
 
         # Design filter to get actual channel we want
-        sw_decim = 1
+        sw_decim = self._gr_decim # use decimation rate from pick_rx_bitrate
         chan_coeffs = gr.firdes.low_pass (1.0,                  # gain
                                           sw_decim * self._samples_per_symbol, 
# sampling rate
                                           1.0,                  # midpoint of 
trans. band
@@ -120,7 +120,7 @@
         adc_rate = self.u.adc_rate()
 
         # derive values of bitrate, samples_per_symbol, and decim from desired 
info
-        (self._bitrate, self._samples_per_symbol, self._decim) = \
+        (self._bitrate, self._samples_per_symbol, self._decim, self._gr_decim) 
= \
             pick_rx_bitrate(self._bitrate, 
self._demod_class.bits_per_symbol(), \
                             self._samples_per_symbol, self._decim, adc_rate)