Changeset 8967

Timestamp:

07/21/08 18:21:02

Author:

jcorgan

Message:

Updated constellation demo for OTA use.

Files:

• gnuradio/branches/features/experimental-gui/const_controller.py (modified) (3 diffs)
• gnuradio/branches/features/experimental-gui/const_gui.py (modified) (1 diff)
• gnuradio/branches/features/experimental-gui/const_streamer.py (modified) (3 diffs)
• gnuradio/branches/features/experimental-gui/const_top_block.py (modified) (5 diffs)
• gnuradio/branches/features/experimental-gui/plotter (modified) (1 prop)
• gnuradio/branches/features/experimental-gui/usrp_const.py (modified) (3 diffs)

gnuradio/branches/features/experimental-gui/const_controller.py

@@ -56 +56 @@
-                 costas_alpha=0.1,
-                 costas_max=0.05,
-alpha
-max
+gain_mu
+omega_limit
-        
-        prop_val_interface.__init__(self)
@@ -77 +77 @@
-                                   costas_alpha=costas_alpha,
-                                   costas_max=costas_max,
-alpha=mm_alpha
-max=mm_max
+gain_mu=mm_gain_mu
+omega_limit=mm_omega_limit
-        
-        # External control interface.  These properties, when set by an external
@@ -85 +85 @@
-        self.add_listener('gain',         self._tb.set_gain)
-        self.add_listener('freq',         self._tb.set_freq)
-
-
+
+
+
+
-        
-        # Set providers for application properties
-
-
-#temp!!!
-['costas_alpha'] = .5
-['costas_beta'] = .5
+ 
+self.set_provider('costas_alpha', self._tb.costas_alpha)
+self.set_provider('costas_beta',  self._tb.costas_beta)
+.set_provider('gain_mu',      self._tb.gain_mu)
+.set_provider('gain_omega',   self._tb.gain_omega)
-        
-        # The controller is a thread.  This is not required but convenient here.

gnuradio/branches/features/experimental-gui/const_gui.py

@@ -30 +30 @@
-
-class const_gui(wxgui_app):
-const demo
+USRP Constellation Plot
-        wxgui_app.__init__(self, controller=controller, title=title)
-
-        self._win = const_window(parent=self.GetWin(),
-                                controller=controller,
-3
+6
-                                title=title,
-                                msg_key='const',
-                                alpha_key='costas_alpha',
-                                beta_key='costas_beta',
-costas_alpha
-costas_bet
+gain_mu
+gain_omeg
-                            )
-    

gnuradio/branches/features/experimental-gui/const_streamer.py

@@ -37 +37 @@
-                 costas_alpha=0.1,
-                 costas_max=0.05,
-alpha
-max
+gain_mu
+omega_limit
-        """!
-        Create a const_streamer.
-        @param sample_rate          Incoming sample rate
-        @param bit_rate             Modulated bit rate/sec
-    
+
-        @param frame_size           Number of constellation points to plot at a time
-        @param frame_rate           Number of frames/sec to create (default is 30)
-        @param costas_alpha         Costas loop 1st order gain constant (default is 0.1)
-        @param costas_max           Costas loop maximum offset, rad/sample (default is 0.05)
-alpha  
-max        
+gain_mu
+omega_limit
-        """
-        
@@ -68 +68 @@
-        # Timing recovery loop
-        # Critically damped 2nd order DLL
-freq
-beta = 0.25*mm_alpha*mm_alpha
-
-freq,   # omega,
-beta,   # gain_omega
-
-alpha,  # 
-max)    # omega_limit
+omega
+gain_omega = 0.25*mm_gain_mu*mm_gain_mu
+m_m
+omega,   
+gain_omega,
+m_m
+
+omega_limit)
-
-        # Scale to unity power
@@ -86 +86 @@
-            
-        self.connect(self, self._costas, self._retime, self._agc, self._decim, self)
+
+    def set_costas_alpha(self, alpha):
+        self._costas.set_alpha(alpha)
+
+    def costas_alpha(self):
+        return self._costas.alpha()
+        
+    def set_costas_beta(self, beta):
+        self._costas.set_beta(beta)
+
+    def costas_beta(self):
+        return self._costas.beta()
+
+    def set_gain_mu(self, gain_mu):
+        self._retime.set_gain_mu(gain_mu)
+        
+    def gain_mu(self):
+        return self._retime.gain_mu()
+        
+    def set_gain_omega(self, gain_omega):
+        self._retime.set_gain_omega(gain_omega)
+        
+    def gain_omega(self):
+        return self._return.gain_omega()

gnuradio/branches/features/experimental-gui/const_top_block.py

@@ -46 +46 @@
-                 costas_alpha=0.1,
-                 costas_max=0.05,
-alpha
-max
+gain_mu
+omega_limit
-                 ):
-        """!
-        Create a const_top_block.
-
-    
+
-        @param frame_size           Number of constellation points to plot at a time
-        @param frame_rate           Number of frames/sec to create (default is 30)
-    
-    
-      
-    
+
+
+
+
-        @param subdev_spec          Daughterboard selection (default is first found)
-   
-   
-      
+
+
+
-        @param bit_rate             Modulated bit rate/sec (default equivalent to 2 samples/bit)
-        @param costas_alpha         Costas loop 1st order gain constant (default is 0.1)
-        @param costas_max           Costas loop maximum offset, rad/sample (default is 0.05)
-alpha  
-max        
+gain_mu
+omega_limit
-        """
-        
@@ -82 +82 @@
-                                       antenna=antenna)
-
-
-
-
+
+
-
-        self._const = const_streamer.const_streamer(sample_rate=self._u.sample_rate(),
@@ -93 +92 @@
-                                                    costas_alpha=costas_alpha,
-                                                    costas_max=costas_max,
-alpha=mm_alpha
-max=mm_max
+gain_mu=mm_gain_mu
+omega_limit=mm_omega_limit
-
-        self._msgq = gr.msg_queue(2)
-        self._sink = gr.message_sink(gr.sizeof_gr_complex*frame_size, self._msgq, True)
-                    
-
+
+
-
-    # "Setters", which are called externally to affect flowgraph operation
@@ -112 +112 @@
-        self._const.set_sample_rate(self._u.sample_rate())
-
+    def set_costas_alpha(self, alpha):
+        self._const.set_costas_alpha(alpha)
+        
+    def set_costas_beta(self, beta):
+        self._const.set_costas_beta(beta)
+
+    def set_gain_mu(self, gain_mu):
+        self._const.set_gain_mu(gain_mu);
+
+    def set_gain_omega(self, gain_omega):
+        self._const.set_gain_omega(gain_omega)
+
-    # Getters, which are called externally to get information about the flowgraph
-    def queue(self):
@@ -118 +130 @@
-    def sample_rate(self):
-        return self._u.sample_rate()
+        
+    def costas_alpha(self):
+        return self._const.costas_alpha()
+        
+    def costas_beta(self):
+        return self._const.costas_beta()
-
+    def gain_mu(self):
+        return self._const.gain_mu()
+        
+    def gain_omega(self):
+        return self._const.gain_omega()

gnuradio/branches/features/experimental-gui/usrp_const.py

@@ -58 +58 @@
-    parser.add_option("", "--costas-max", type="eng_float", default=0.05,
-                      help="Select Costas loop max offset in radians/sample, [default=%default]")
-alpha
+gain-mu
-                      help="Select timing recovery loop first order gain, [default=%default]")
-max
+omega-limit
-                      help="Select timing recovery loop max offset in bits/sample, [default=%default]")
-                      
@@ -100 +100 @@
-                                  costas_alpha=options.costas_alpha,
-                                  costas_max=options.costas_max,
-alpha=options.mm_alpha
-max=options.mm_max
+gain_mu=options.mm_gain_mu
+omega_limit=options.mm_omega_limit
-
-    # Step 2: Create the GUI and pass it the controller
@@ -113 +113 @@
-    gui.run()
-
-    # TEMPORARY
-    #f = open('const.dat', 'wb')
-    #def writer(frame):
-    #   f.write(frame)
-    #controller.add_listener('const', writer)
-
-    #controller.on_init()
-    #try:
-        #raw_input("Press return to stop.")
-    #except KeyboardInterrupt:
-        #pass
-        
-    #controller.on_exit()