[Commit-gnuradio] r8980 - gnuradio/branches/features/experimental-gui

[jcorgan]

Author: jcorgan
Date: 2008-07-22 17:03:05 -0600 (Tue, 22 Jul 2008)
New Revision: 8980

Modified:
   gnuradio/branches/features/experimental-gui/simple_usrp.py
   gnuradio/branches/features/experimental-gui/tx_mpsk.py
Log:
Added test MPSK transmitter.

Modified: gnuradio/branches/features/experimental-gui/simple_usrp.py
===================================================================
--- gnuradio/branches/features/experimental-gui/simple_usrp.py  2008-07-22 
22:39:49 UTC (rev 8979)
+++ gnuradio/branches/features/experimental-gui/simple_usrp.py  2008-07-22 
23:03:05 UTC (rev 8980)
@@ -125,6 +125,7 @@
                 interp=32, 
                 subdev_spec=None,
                 freq=None):
+
        """!
        Create a simple_usrp object accepting complex samples.
 
@@ -143,16 +144,19 @@
        self.connect(self, self._u)
 
     def _setup_usrp(self, which, interp):
-       self._u = usrp.sink_c(which=which)
-       self.set_interp(interp)
+       self._u = usrp.sink_c(which=which,
+                             interp_rate=interp)
 
     def _setup_db(self, subdev_spec, freq):
        if subdev_spec is None:
            subdev_spec = usrp.pick_tx_subdevice(self._u)
-       self._u.set_mux(usrp.determine_tx_mux_value(self._u, subdev_spec))
+       mux = usrp.determine_tx_mux_value(self._u, subdev_spec)
+       self._u.set_mux(mux)
        self._subdev = usrp.selected_subdev(self._u, subdev_spec)
+       self._subdev.set_enable(True)
+       print "Using", self._subdev.side_and_name()
        self.set_freq(freq)
-
+       
     def set_interp(self, interp):
        """!
        Set USRP TX interpolation.
@@ -171,7 +175,8 @@
        if freq is None:
            f = self._subdev.freq_range()
            freq = float(f[0]+f[1])/2.0
-       return self._u.tune(0, self._subdev, freq)
+       r = usrp.tune(self._u, self._subdev._which, self._subdev, freq)
+       return r
 
     def sample_rate(self):
        """!

Modified: gnuradio/branches/features/experimental-gui/tx_mpsk.py
===================================================================
--- gnuradio/branches/features/experimental-gui/tx_mpsk.py      2008-07-22 
22:39:49 UTC (rev 8979)
+++ gnuradio/branches/features/experimental-gui/tx_mpsk.py      2008-07-22 
23:03:05 UTC (rev 8980)
@@ -24,6 +24,7 @@
 from optparse import OptionParser
 from gnuradio.eng_option import eng_option
 from math import pi, log10
+import cmath
 import simple_usrp
 
 class tx_mpsk_top_block(gr.top_block):
@@ -47,9 +48,8 @@
        self._p2u = gr.packed_to_unpacked_bb(self._bits_per_sym, 
gr.GR_MSB_FIRST)
        
        # Map to constellation
-       self._constellation = blks2.constellation[arity]
-       self._mapper = gr.chunks_to_symbols_bc(self._constellation)
-       
+       self._constellation = [cmath.exp(i*2*pi/arity*1j) for i in range(arity)]
+       self._mapper = gr.chunks_to_symbols_bc(self._constellation)     
        # Throttle to specified symbol rate
        self._throttle = gr.throttle(gr.sizeof_gr_complex, sym_rate)
 
@@ -108,7 +108,8 @@
 
 if __name__ == "__main__":
     (options, args) = get_options()
-
+    print options
+    
     tb = tx_mpsk_top_block(arity=options.arity,
                           sps=options.sps,
                           which=options.which,