Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorflavio <fdanesse@gmail.com>2012-06-17 00:52:29 (GMT)
committer flavio <fdanesse@gmail.com>2012-06-17 00:52:29 (GMT)
commitbca5020d7047584fbe59b0021e3db66a316107cd (patch)
treed2437840c034088f79da222aeddb890c5acb1946
parent286f48f744718ca21abdb0a78eed8b4766c76f1b (diff)
Comentario y Correcciones MenoresHEADmaster
-rw-r--r--.gitignore5
-rw-r--r--LegoJAM.py20
2 files changed, 15 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore
index 539da74..db73526 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
-*.py[co]
+*.pyc
+*.pyo
+*.bak
+*.??~
diff --git a/LegoJAM.py b/LegoJAM.py
index ad0cf16..d7e60f4 100644
--- a/LegoJAM.py
+++ b/LegoJAM.py
@@ -25,7 +25,7 @@ class LegoJAM(Window):
def __init__(self):
super(LegoJAM, self).__init__()
self.set_title("LegoJAM")
- #self.set_icon_from_file(os.path.join(BASE, "Iconos", "ceibal.png"))
+ #self.set_icon_from_file(os.path.join(BASE, "Iconos", "legojam.png"))
self.canvas = gtk.VBox()
self.set_canvas(self.canvas)
@@ -146,10 +146,12 @@ class Robot(gobject.GObject):
def set_up(self, robot):
self.robot = robot.connect()
- self.motorA = Mimotor("A", self.robot, nxt.PORT_A)
- self.motorB = Mimotor("B", self.robot, nxt.PORT_B)
- self.motorC = Mimotor("C", self.robot, nxt.PORT_C)
+ self.motorA = MotorJAM("A", self.robot, nxt.PORT_A)
+ self.motorB = MotorJAM("B", self.robot, nxt.PORT_B)
+ self.motorC = MotorJAM("C", self.robot, nxt.PORT_C)
+ # Si los sensores no se encuentran en los puertos correspondientes
+ # la aplicación falla.
self.presion = Touch(self.robot, PORT_1)
self.sonido = Sound(self.robot, PORT_2)
self.ultrasonido = Ultrasonic(self.robot, PORT_4)
@@ -169,23 +171,23 @@ class Robot(gobject.GObject):
def handle(self):
valor_boton = self.presion.get_sample()
- print 'Botón: ', valor_boton
+ print 'Presión: ', valor_boton
valor_sonido = self.sonido.get_sample()
- print 'Botón: ', valor_sonido
+ print 'Sonido: ', valor_sonido
valor_ultrasonido = self.ultrasonido.get_sample()
- print 'Ultrasónico: ', valor_ultrasonido
+ print 'Ultrasonido: ', valor_ultrasonido
valor_luz = self.luz.get_sample()
- print 'luz: ', valor_luz
+ print 'Luz: ', valor_luz
self.emit('battery-label-changed', str(self.robot.get_battery_level()))
return True
-class Mimotor(Motor):
+class MotorJAM(Motor):
# motor._get_state()
def __init__(self, nombre, brick, port):
Motor.__init__(self, brick, port)