Merge branch 'master' of git.sugarlabs.org:legojam/legojam-linux

Pep8

1 files changed, 31 insertions, 30 deletions

diff --git a/LegoJAM.py b/LegoJAM.py
index 6f8661e..3f568bb 100644
--- a/LegoJAM.py
+++ b/LegoJAM.py
@@ -4,7 +4,6 @@
 import os
 import gtk
 import sys
-import gobject
 
 BASE = os.path.dirname(__file__)
 
@@ -14,7 +13,9 @@ sys.path.append("nxt_plugin")
 import nxt
 from nxt import *
 
+
 class LegoJAM(gtk.Window):
+
     def __init__(self):
         super(LegoJAM, self).__init__()
         self.set_title("LegoJAM")
@@ -23,52 +24,52 @@ class LegoJAM(gtk.Window):
         self.set_size_request(640, 480)
         self.set_border_width(2)
         self.set_position(gtk.WIN_POS_CENTER)
-        
+
         self.base_box = None
-        button_motor_A = None
-        button_motor_B = None
-        
+        # button_motor_A = None
+        # button_motor_B = None
+
         self.set_layout()
         self.show_all()
-        
+
         self.connect("delete_event", self.delete_event)
-       
+
         self.robot = Pancho()
-        
+
     def set_layout(self):
         self.base_box = gtk.VBox()
-        
+
         self.button_encender_motor_A = gtk.Button("Encender Motor A")
         self.button_encender_motor_B = gtk.Button("Encender Motor B")
         self.button_encender_motor_C = gtk.Button("Encender Motor C")
-        
+
         self.button_detener_motor_A = gtk.Button("Apagar Motor A")
         self.button_detener_motor_B = gtk.Button("Apagar Motor B")
         self.button_detener_motor_C = gtk.Button("Apagar Motor C")
-        
+
         self.button_encender_motor_A.connect("clicked", self.run_motor)
         self.button_encender_motor_B.connect("clicked", self.run_motor)
         self.button_encender_motor_C.connect("clicked", self.run_motor)
-        
+
         self.button_detener_motor_A.connect("clicked", self.stop_motor)
         self.button_detener_motor_B.connect("clicked", self.stop_motor)
         self.button_detener_motor_C.connect("clicked", self.stop_motor)
-        
+
         motor = gtk.HBox()
         motor.pack_start(self.button_encender_motor_A, True, True, )
         motor.pack_start(self.button_detener_motor_A, True, True, 0)
         self.base_box.pack_start(motor, True, True, 0)
-        
+
         motor = gtk.HBox(0)
         motor.pack_start(self.button_encender_motor_B, True, True, )
         motor.pack_start(self.button_detener_motor_B, True, True, 0)
         self.base_box.pack_start(motor, True, True, 0)
-        
+
         motor = gtk.HBox(0)
         motor.pack_start(self.button_encender_motor_C, True, True, )
         motor.pack_start(self.button_detener_motor_C, True, True, 0)
         self.base_box.pack_start(motor, True, True, 0)
-        
+
         self.add(self.base_box)
 
     def run_motor(self, widget):
@@ -78,7 +79,7 @@ class LegoJAM(gtk.Window):
             self.robot.run_motor("B")
         elif widget == self.button_encender_motor_C:
             self.robot.run_motor("C")
-            
+
     def stop_motor(self, widget):
         if widget == self.button_detener_motor_A:
             self.robot.stop_motor("A")
@@ -86,14 +87,13 @@ class LegoJAM(gtk.Window):
             self.robot.stop_motor("B")
         elif widget == self.button_detener_motor_C:
             self.robot.stop_motor("C")
-    
+
     def delete_event(self, widget, event):
         self.salir()
         return False
 
     def salir(self, widget=None):
         sys.exit(0)
-   
 
 
 # robot.get_battery_level()
@@ -102,7 +102,7 @@ class LegoJAM(gtk.Window):
 # robot.get_firmware_version()
 # robot.get_input_values() takes exactly 2 arguments (1 given)
 # robot.get_output_state() takes exactly 2 arguments (1 given)
-        
+
 class Pancho():
     def __init__(self):
         self.nombre = 'Pancho'
@@ -111,7 +111,7 @@ class Pancho():
         self.motorC = None
         self.funciones = []
         self.set_up()
-        
+
     def set_up(self):
         try:
             self.robot = nxt.locator.find_one_brick()
@@ -125,15 +125,15 @@ class Pancho():
         self.motorA = Mimotor("A", self.robot, PORT_A)
         self.motorB = Mimotor("B", self.robot, PORT_B)
         self.motorC = Mimotor("C", self.robot, PORT_C)
-        
+
     def run_motor(self, motor):
         if motor == "A":
-            self.motorA.run(power = 127, regulated=False)
+            self.motorA.run(power=127, regulated=False)
         elif motor == "B":
-            self.motorB.run(power = 127, regulated=False)
+            self.motorB.run(power=127, regulated=False)
         elif motor == "C":
-            self.motorC.run(power = 127, regulated=False)
-        
+            self.motorC.run(power=127, regulated=False)
+
     def stop_motor(self, motor):
         if motor == "A":
             self.motorA.brake()
@@ -143,17 +143,18 @@ class Pancho():
             self.motorC.brake()
 
 
-
 class Mimotor(Motor):
     # motor._get_state()
     def __init__(self, nombre, brick, port):
         Motor.__init__(self, brick, port)
         self.nombre = nombre
-        
+
         #self.turn(power = 100, tacho_units = 360, emulate = True)
-        #self.turn(power = 100, tacho_units= 0, brake = True, timeout = 1, emulate = True)
+        #self.turn(
+        #power = 100,
+        #tacho_units= 0, brake = True, timeout = 1, emulate = True)
         #self.run(power = 100, regulated=False)
-        
+
 if __name__ == "__main__":
     LegoJAM()
     gtk.main()