Merge branch 'master' of https://github.com/CMCRobotics/raspbuggy

CMCRobotics · Jul 1, 2015 · 9815542 · 9815542
2 parents d4f6380 + 343bb6a
commit 9815542
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/modules/drivar/src/main/python/DrivarNxt.py b/modules/drivar/src/main/python/DrivarNxt.py
@@ -100,9 +100,14 @@ def isObstacleWithin(self, distance):
             return False
 
     def rotatePen(self, angle):
-        self.m_penMotor.turn(70, angle)
+        power = 70
+        if angle < 0:
+            angle = -1 * angle
+            power = -70
+        self.m_penMotor.turn(power, angle)
 
     def getReflectivityMeasurement(self):
+        self.m_lightSensor.set_illuminated(True)
         return self.m_lightSensor.get_sample()
 
     def wait(self, milliseconds):

diff --git a/modules/pywebide/src/main/webapp/js/raspbuggy.service.js b/modules/pywebide/src/main/webapp/js/raspbuggy.service.js
@@ -3,8 +3,8 @@ function Raspbuggy() {
   this.statusUpdateCallbacks = [];
   this.m_abortScriptCallback = null;
   this.m_scriptOutputCallback = null;
-//  this.SCRIPT_PREFIX = "from Drivar import Drivar\nfrom DrivarNxt import DrivarNxt\ndrivar = DrivarNxt()\ndrivar.initialize()\n\n"
-  this.SCRIPT_PREFIX = "from Drivar import Drivar\nfrom DrivarNoop import DrivarNoop\ndrivar = DrivarNoop()\nimport logging\nlogging.basicConfig(level=logging.DEBUG)\ndrivar.initialize()\n\n"
+  this.SCRIPT_PREFIX = "from Drivar import Drivar\nfrom DrivarNxt import DrivarNxt\ndrivar = DrivarNxt()\ndrivar.initialize()\n\n"
+//  this.SCRIPT_PREFIX = "from Drivar import Drivar\nfrom DrivarNoop import DrivarNoop\ndrivar = DrivarNoop()\nimport logging\nlogging.basicConfig(level=logging.DEBUG)\ndrivar.initialize()\n\n"
 }