hyperobject · August 29, 2015 13:56 · Feb 7, 2014 · Feb 7, 2014 · Feb 7, 2014 · Feb 7, 2014
diff --git a/s2.py b/s2.py
@@ -35,19 +35,21 @@ def set_led(ledpos="right", onoff="on"):
     if onoff == "off":
         bot.setLED(ledpos,"off")
 
-@reporter("get line sensor %n value")
-def get_line(n=1):
-    return bot.getLine(n - 1)
+menu('lineSensor', ['left', 'right'])
+@reporter("get %m.lineSensor line sensor value")
+def get_line(lineSensor='left'):
+    positions = {'left': 0, 'right': 1}
+    return bot.getLine(positions[lineSensor])
 
 @reporter("get IR sensor %n value")
 def get_IR(n=1):
     return bot.getIR(n - 1)
 
 menu('lightSensor', ['left', 'center', 'right'])
 @reporter("get light sensor %m.lightSensor value")
-def get_light(lightsensor='center'):
+def get_light(lightSensor='center'):
     positions = {'left': 0, 'center': 1, 'right': 2}
-    return bot.getLight(positions[lightsensor])
+    return bot.getLight(positions[lightSensor])
 
 @reporter("get S2 name")
 def get_name():

diff --git a/s2.py b/s2.py
@@ -12,26 +12,26 @@ def stop_motors():
     bot.stop()
 
 @command("set speed %n")
-def straight(speed=100):
-    bot.translate(speed/100)
+def drive_straight(speed=100):
+    bot.translate(speed / 100)
 
 @command("set speed left: %n right: %n")
-def turny(ls=100,rs=100):
-    bot.motors(ls,rs)
+def drive_left_right(ls=100, rs=100):
+    bot.motors(ls, rs)
 
 @command("play tone %n for %n seconds")
-def play_tone(tone=500,time=1):
-    bot.beep(time,tone)
+def play_tone(tone=500, time=1):
+    bot.beep(time, tone)
 
 @command("set S2 name to %s")
 def set_name(name):
     bot.setName(name)
 
-menu("ledpos",["right","left"])
-menu("onoff",["on","off"])
-@command("turn %m.ledpos LED %m.onoff")
+menu("ledPos", ["right", "left"])
+menu("onOff", ["on", "off"])
+@command("turn %m.ledPos led %m.onOff")
 def set_led(ledpos="right", onoff="on"):
-    bot.setLED(ledpos,onoff)
+    bot.setLED(ledpos, onoff)
     if onoff == "off":
         bot.setLED(ledpos,"off")
 
@@ -43,19 +43,19 @@ def get_line(n=1):
 def get_IR(n=1):
     return bot.getIR(n - 1)
 
-menu('lightsensor',['left','center','right'])
-@reporter("get light sensor %m.lightsensor value")
+menu('lightSensor', ['left', 'center', 'right'])
+@reporter("get light sensor %m.lightSensor value")
 def get_light(lightsensor='center'):
+    positions = {'left': 0, 'center': 1, 'right': 2}
     return bot.getLight(positions[lightsensor])
 
 @reporter("get S2 name")
 def get_name():
     return bot.getName()
 
 @reset
-def resetall():
+def reset_s2():
     bot.stop()
 
-positions = {'left':0,'center':1,'right':2}
 bot = Scribbler()
 blockext.run("Parallax S2 robot", "s2", 3610)
diff --git a/s2.py b/s2.py
@@ -10,9 +10,11 @@
 @command("stop both motors")
 def stop_motors():
     bot.stop()
+
 @command("set speed %n")
 def straight(speed=100):
     bot.translate(speed/100)
+
 @command("set speed left: %n right: %n")
 def turny(ls=100,rs=100):
     bot.motors(ls,rs)

diff --git a/s2.py b/s2.py
@@ -8,7 +8,7 @@
 
 
 @command("stop both motors")
-def stopmotors():
+def stop_motors():
     bot.stop()
 @command("set speed %n")
 def straight(speed=100):
@@ -18,36 +18,36 @@ def turny(ls=100,rs=100):
     bot.motors(ls,rs)
 
 @command("play tone %n for %n seconds")
-def playtone(tone=500,time=1):
+def play_tone(tone=500,time=1):
     bot.beep(time,tone)
 
 @command("set S2 name to %s")
-def nameset(name):
+def set_name(name):
     bot.setName(name)
 
 menu("ledpos",["right","left"])
 menu("onoff",["on","off"])
 @command("turn %m.ledpos LED %m.onoff")
-def setled(ledpos="right", onoff="on"):
+def set_led(ledpos="right", onoff="on"):
     bot.setLED(ledpos,onoff)
     if onoff == "off":
         bot.setLED(ledpos,"off")
 
 @reporter("get line sensor %n value")
-def getline(n=1):
+def get_line(n=1):
     return bot.getLine(n - 1)
 
 @reporter("get IR sensor %n value")
-def getIR(n=1):
+def get_IR(n=1):
     return bot.getIR(n - 1)
 
 menu('lightsensor',['left','center','right'])
 @reporter("get light sensor %m.lightsensor value")
-def getlight(lightsensor='center'):
+def get_light(lightsensor='center'):
     return bot.getLight(positions[lightsensor])
 
 @reporter("get S2 name")
-def getname():
+def get_name():
     return bot.getName()
 
 @reset

diff --git a/s2.py b/s2.py
@@ -33,7 +33,6 @@ def setled(ledpos="right", onoff="on"):
     if onoff == "off":
         bot.setLED(ledpos,"off")
 
-menu('linesensor',['
 @reporter("get line sensor %n value")
 def getline(n=1):
     return bot.getLine(n - 1)
@@ -42,9 +41,10 @@ def getline(n=1):
 def getIR(n=1):
     return bot.getIR(n - 1)
 
-@reporter("get light sensor %n value")
-def getlight(n=1):
-    return bot.getLight(n - 1)
+menu('lightsensor',['left','center','right'])
+@reporter("get light sensor %m.lightsensor value")
+def getlight(lightsensor='center'):
+    return bot.getLight(positions[lightsensor])
 
 @reporter("get S2 name")
 def getname():

diff --git a/s2.py b/s2.py
@@ -16,28 +16,36 @@ def straight(speed=100):
 @command("set speed left: %n right: %n")
 def turny(ls=100,rs=100):
     bot.motors(ls,rs)
+
 @command("play tone %n for %n seconds")
 def playtone(tone=500,time=1):
     bot.beep(time,tone)
+
 @command("set S2 name to %s")
 def nameset(name):
     bot.setName(name)
+
 menu("ledpos",["right","left"])
 menu("onoff",["on","off"])
 @command("turn %m.ledpos LED %m.onoff")
 def setled(ledpos="right", onoff="on"):
     bot.setLED(ledpos,onoff)
     if onoff == "off":
         bot.setLED(ledpos,"off")
+
+menu('linesensor',['
 @reporter("get line sensor %n value")
 def getline(n=1):
     return bot.getLine(n - 1)
+
 @reporter("get IR sensor %n value")
 def getIR(n=1):
     return bot.getIR(n - 1)
+
 @reporter("get light sensor %n value")
 def getlight(n=1):
     return bot.getLight(n - 1)
+
 @reporter("get S2 name")
 def getname():
     return bot.getName()
@@ -46,5 +54,6 @@ def getname():
 def resetall():
     bot.stop()
 
+positions = {'left':0,'center':1,'right':2}
 bot = Scribbler()
 blockext.run("Parallax S2 robot", "s2", 3610)
diff --git a/s2.py b/s2.py
@@ -0,0 +1,50 @@
+from __future__ import division
+
+from myro import *
+
+import blockext
+from blockext import *
+
+
+
+@command("stop both motors")
+def stopmotors():
+    bot.stop()
+@command("set speed %n")
+def straight(speed=100):
+    bot.translate(speed/100)
+@command("set speed left: %n right: %n")
+def turny(ls=100,rs=100):
+    bot.motors(ls,rs)
+@command("play tone %n for %n seconds")
+def playtone(tone=500,time=1):
+    bot.beep(time,tone)
+@command("set S2 name to %s")
+def nameset(name):
+    bot.setName(name)
+menu("ledpos",["right","left"])
+menu("onoff",["on","off"])
+@command("turn %m.ledpos LED %m.onoff")
+def setled(ledpos="right", onoff="on"):
+    bot.setLED(ledpos,onoff)
+    if onoff == "off":
+        bot.setLED(ledpos,"off")
+@reporter("get line sensor %n value")
+def getline(n=1):
+    return bot.getLine(n - 1)
+@reporter("get IR sensor %n value")
+def getIR(n=1):
+    return bot.getIR(n - 1)
+@reporter("get light sensor %n value")
+def getlight(n=1):
+    return bot.getLight(n - 1)
+@reporter("get S2 name")
+def getname():
+    return bot.getName()
+
+@reset
+def resetall():
+    bot.stop()
+
+bot = Scribbler()
+blockext.run("Parallax S2 robot", "s2", 3610)