From bb1d982669c44a990ffc926f4666b6aa72237619 Mon Sep 17 00:00:00 2001
From: Thomas B Thompson <tbent@spice.(none)>
Date: Mon, 10 Jan 2011 22:23:49 -0500
Subject: Worked on getting the threading stuff consolidated in
 ThreadedSmootCoreObject. Also set up a decent system for SmootCoreObjects to
 kill the whole application in a managed fashion.

---
 behaviors/DebugBehavior.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'behaviors')

diff --git a/behaviors/DebugBehavior.py b/behaviors/DebugBehavior.py
index 8e9bbdb..9bf3ea8 100644
--- a/behaviors/DebugBehavior.py
+++ b/behaviors/DebugBehavior.py
@@ -4,5 +4,5 @@ import pdb
 class DebugBehavior(Behavior):
     def processResponse(self, sensorInputs, recursiveInputs):
         if sensorInputs != []:
-            main_log.debug('Sensor Inputs: ', str(sensorInputs))
+            main_log.debug('Sensor Inputs: ' + str(sensorInputs))
         return []
-- 
cgit v1.2.3


From 9315ded6555a7afb8f11d96e5a4c446389f157cb Mon Sep 17 00:00:00 2001
From: rcoh <rcoh@mit.edu>
Date: Tue, 11 Jan 2011 13:16:59 -0500
Subject: Some config changes to make everything a little more palatable.

---
 behaviors/AddPixelEvent.py | 4 ++++
 behaviors/LoopAndDie.xml   | 2 +-
 config/Outdoor.xml         | 2 +-
 layouts/50PixelStrip.xml   | 2 +-
 renderers/SixStripUDP.xml  | 4 ++--
 5 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100644 behaviors/AddPixelEvent.py

(limited to 'behaviors')

diff --git a/behaviors/AddPixelEvent.py b/behaviors/AddPixelEvent.py
new file mode 100644
index 0000000..bf3cfff
--- /dev/null
+++ b/behaviors/AddPixelEvent.py
@@ -0,0 +1,4 @@
+from operationscore.Behavior import *
+class AddPixelEvent(Behavior):
+    def initBehavior(self):
+        className = self['Class']
diff --git a/behaviors/LoopAndDie.xml b/behaviors/LoopAndDie.xml
index af26562..e2940e4 100644
--- a/behaviors/LoopAndDie.xml
+++ b/behaviors/LoopAndDie.xml
@@ -1,6 +1,6 @@
 <Behavior>
     <Class>behaviors.RecursiveDecay</Class>
     <Args>
-        <InitialResponseCount>70</InitialResponseCount>
+        <InitialResponseCount>20</InitialResponseCount>
     </Args>
 </Behavior>
diff --git a/config/Outdoor.xml b/config/Outdoor.xml
index f0995b1..9ee0c3a 100644
--- a/config/Outdoor.xml
+++ b/config/Outdoor.xml
@@ -87,7 +87,7 @@
         <Behavior Id="recursivedecay">
             <InheritsFrom>behaviors/LoopAndDie.xml</InheritsFrom>
             <Args>
-                <InitialResponseCount>2000</InitialResponseCount>
+                <InitialResponseCount>200</InitialResponseCount>
             </Args>
         </Behavior>
         <Behavior>
diff --git a/layouts/50PixelStrip.xml b/layouts/50PixelStrip.xml
index 11fa5e1..beabb97 100644
--- a/layouts/50PixelStrip.xml
+++ b/layouts/50PixelStrip.xml
@@ -3,6 +3,6 @@
     <Args>
         <pixelToPixelSpacing>4</pixelToPixelSpacing>
         <spacing>4</spacing> 
-        <numPixels>500</numPixels>
+        <numPixels>50</numPixels>
     </Args>
 </PixelStrip>
diff --git a/renderers/SixStripUDP.xml b/renderers/SixStripUDP.xml
index f3c9e75..04f493b 100644
--- a/renderers/SixStripUDP.xml
+++ b/renderers/SixStripUDP.xml
@@ -3,11 +3,11 @@
     <Args>
         <Id>indoorRenderer</Id>
         <PowerSupply>
-            <IP>10.31.255.233</IP>
+            <IP>10.32.97.17</IP>
             <PortMapping>{'strip1':1, 'strip2':2}</PortMapping>
         </PowerSupply>
         <PowerSupply>
-            <IP>10.32.97.17</IP>
+            <IP>10.31.255.233</IP>
             <PortMapping>{'strip3':1, 'strip4':2}</PortMapping>
         </PowerSupply>
         <PowerSupply>
-- 
cgit v1.2.3