aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar rcoh <rcoh@mit.edu>2011-02-13 19:43:46 -0500
committerGravatar rcoh <rcoh@mit.edu>2011-02-13 19:43:46 -0500
commit9c76b22071259fe8195eaf5bd846219fc2cade4d (patch)
tree86c3b7b21ffae3e87673cd05240a463b5bea89a5
parenteb8e19fbc6368c5e3eb0d58698ac020939ec74b7 (diff)
parentfcaed61eacb4ba296229b16df2de24e701cf53d3 (diff)
Merge branch 'conner5' of github.com:dxiao/SmootLight into conner5
-rw-r--r--config/C5Sign-dxiao.xml4
-rw-r--r--inputs/ContinuousLocationInput.py1
2 files changed, 2 insertions, 3 deletions
diff --git a/config/C5Sign-dxiao.xml b/config/C5Sign-dxiao.xml
index 38eb40c..7dc4b81 100644
--- a/config/C5Sign-dxiao.xml
+++ b/config/C5Sign-dxiao.xml
@@ -40,9 +40,9 @@
<Renderer>
<InheritsFrom>renderers/C5Renderer.xml</InheritsFrom>
</Renderer>
- <Renderer>
+ <!--Renderer>
<InheritsFrom>renderers/Pygame.xml</InheritsFrom>
- </Renderer>
+ </Renderer-->
</RendererConfiguration>
<InputConfiguration>
<!--InputElement>
diff --git a/inputs/ContinuousLocationInput.py b/inputs/ContinuousLocationInput.py
index f39bd9b..52a36ad 100644
--- a/inputs/ContinuousLocationInput.py
+++ b/inputs/ContinuousLocationInput.py
@@ -14,6 +14,5 @@ class ContinuousLocationInput(Input):
self.location = (xvals[self['xloc']], yvals[self['yloc']])
def sensingLoop(self):
- print (self.location)
self.respond({Strings.LOCATION: self.location})