Changeset 4819

Timestamp:

08/25/07 11:04:25 (6 years ago)

Author:

DrewCormier

Message:

basic functionality now works. had to change the way I implemented my buffering a little

Location:

experimental/components/rc2007_gui

Files:

• WorkModule.py (modified) (2 diffs)
• rc2007_gui.py (modified) (1 diff)

experimental/components/rc2007_gui/WorkModule.py

@@ -33 +33 @@
     component to reside."""
 
-    def __init__(self, USRP_Commander_GUI_ref):
+    def __init__(self, rc2007_gui_ref):
         '''Initialization.  Sets a reference to parent.  
         Initializes the buffer.  Starts the Process data
         thread, which waits for data to be added to the buffer'''
 
-        self.USRP_Commander_GUI_ref = USRP_Commander_GUI_ref
+        self.rc2007_gui_ref = rc2007_gui_ref
         
         self.data_queue = []
@@ -76 +76 @@
                 self.data_queue_lock.release()
                                 
-                # get data out of tuple
-                I = new_data[0]
-                Q = new_data[1]
-                                
-                newI = [0 for x in range(len(I))]
-                newQ = [0 for x in range(len(Q))]
-                
-                
-                # Insert code here to do work
-                # Example:
-                #for x in range(len(I)):
-                #    newI[x] = I[x]
-                #    newQ[x] = Q[x]
-
+                if self.rc2007_gui_ref.talk_flag:
+                    print "attempting to pass data"     
                                         
-                # Output the new data
-                # TODO: autogenerate code that will send data to all existing uses ports
-                if self.USRP_Commander_GUI_ref.outPort0_active:
-                    self.USRP_Commander_GUI_ref.outPort0_servant.send_data(newI, newQ)
+                    if self.rc2007_gui_ref.outPort0_active:
+                        self.rc2007_gui_ref.outPort0_servant.send_data(
+                                                   new_data[0], new_data[1])
 
             self.data_signal.clear()  # done reading the buffer

experimental/components/rc2007_gui/rc2007_gui.py

@@ -171 +171 @@
     def Process(self):
         while self.is_running:
+
             self.data_event.wait()
-            if self.parent.talk_flag:
+
+            while len(self.data_buffer) > 0:
                 self.data_buffer_lock.acquire()
                 new_data = self.data_buffer.pop()
                 self.data_buffer_lock.release()
-                
+               
+                # send the data to all outPort connections 
                 for port in self.outPorts.values():
                     port.pushPacket(new_data[0], new_data[1])
             
-            # if the push to talk button is not depressed, don't do anything
-            # with the data, even if it is there
-            # alternatively, if the button is down, i just sent the packet
-            self.data_event.clear()
-
-            # TODO: make sure the buffer is empty
+                self.data_event.clear()
+