Changeset 1095

Timestamp:

11/06/08 14:37:35 (2 months ago)

Author:

bhimebau

Message:

completed basic functionality - ready for beta test

Files:

• analog/pyeac/branches/pyeac_pygame/eeepc/controlpanel.pyc (modified) (previous)
• analog/pyeac/branches/pyeac_pygame/eeepc/eac_physical.py (modified) (6 diffs)
• analog/pyeac/branches/pyeac_pygame/eeepc/eac_physical.pyc (modified) (previous)
• analog/pyeac/branches/pyeac_pygame/eeepc/pyeac.py (modified) (6 diffs)
• analog/pyeac/branches/pyeac_pygame/eeepc/raw_display.py (modified) (1 diff)

analog/pyeac/branches/pyeac_pygame/eeepc/eac_physical.py

@@ -63 +63 @@
-        (self.input_current,self.output_current) = self.eac.lla_report(self.num_desc)
-
+    def modify(self,function):
+        if function >= 1 and function <= 27:
+            self.function = function
+            self.eac.lla_add(self.input_pin,self.output_pin,self.num_desc,function,self.period)
+
-class Pin:
-
@@ -72 +77 @@
-        self.current_input = None
-        self.current_output = None
+        self.lla_tag = None
-
-class PinGrid:
@@ -105 +111 @@
-        x -= 1
-        y -= 1
+
+        if self.grid[y][x].lla_tag != None:
+            self.lla_disable(self.grid[y][x].lla_tag)
+
-        if self.grid[y][x].mode != 'S':
-            self.grid[y][x].mode = 'S'
@@ -114 +124 @@
-
-        if self.lla_dict.has_key(tag):
-
+
+
-        else:
+            # add operation
-            self.set_voltage_input(input_pin)
-            (x,y) = input_pin
-            self.grid[y-1][x-1].mode = 'L'
+            self.grid[y-1][x-1].lla_tag = tag 
-            self.lla_dict[tag] = LLA(self.ueac, input_pin, output_pin, self.lla_count, function, period)
-            self.lla_count += 1
@@ -148 +161 @@
-        x -= 1
-        y -= 1
+        if self.grid[y][x].lla_tag != None:
+            self.lla_disable(self.grid[y][x].lla_tag)
+
-        if self.grid[y][x].mode != 'V':
-            self.grid[y][x].mode = 'V'
@@ -191 +207 @@
-                if value == 'L':
-                    current_value_key = "%d,%d,function"%(x,y)
-self.lla_add("lla1",(x,y),(0,0),int(full_form[current_value_key]),1
-print int(full_form[current_value_key])
-#                     print "need to add lla"
+value = int(full_form[current_value_key]
+if value > 0 and value < 27:
+            self.lla_add("L%d,%d"%(x,y),(x,y),(0,0),value,1)
-            elif op == 'function':
-
+
+
+
+
+
+
+
+
+
-            elif op == "current":
-                self.set_current_source((x,y),int(value))

analog/pyeac/branches/pyeac_pygame/eeepc/pyeac.py

@@ -36 +36 @@
-    
-    pg = PinGrid(ueac_device='/dev/ttyUSB0')
-
-#     phyeac = ueac(ueac_device='/dev/ttyUSB0')  # Connect to the uEAC device
-#     phyeac.reset()                             # Reset the board to clear any previous config 
-#     phyeac.lof()                               # turn off the board Leds
-#     phyeac.lla_add(3,3,1)                        # Instantiate an lla at position (3,3). 
-#     phyeac.write_i(1,1,100)                    # write pin (1,1) as current source
-#     phyeac.write_i(5,5,100)                    # write pin (5,5) as current source
-    
-    pygame.init()
-    screen = pygame.display.set_mode((790,535))
@@ -49 +41 @@
-    pygame.display.set_caption("EAC Framework")
-    pygame.display.set_icon(pygame.image.load('uEAC_icon.png').convert())
-
-
-    phyeac_vis = Visualizer(absolute=True)
@@ -63 +54 @@
-    c = gui.Container(align=-1,valign=-1)
-    c.add(ecc,0,325)
- #    c.add(bcc,720,100)
-    c.add(bcc,650,100)
-
@@ -71 +61 @@
-    _quit = 0
-    
-#     tb = TableBorder()
-
-    clock = pygame.time.Clock()
-    while True:
@@ -87 +75 @@
-
-        pg.get_data()
-
-#         phyeac.read_v()
-        phyeac_vis.update(pg)
-        phyeac_raw.update(pg)
-
-#         phyeac.read_i()
-    #    print phyeac.current_values
-#         phyeac.lla_report(2)
-
-        screen.fill((0,0,0))
@@ -101 +83 @@
-
-        app.paint(screen)
-
-        pygame.display.flip()
-

analog/pyeac/branches/pyeac_pygame/eeepc/raw_display.py

@@ -60 +60 @@
-                        text.write(self.master_surface,self.font,loc,(0,0,255),"Io = %d" % (value))
-                if pg.grid[y][x].mode == 'L':
+
-                    loc = ((xoffset)+x*60,(yoffset+10)+y*60)
-
+
+
+
+
+
+
+
+
+
+
+
-                                                       
-