diff options
author | dan <dmtaub@gmail.com> | 2011-01-28 16:31:58 -0500 |
---|---|---|
committer | dan <dmtaub@gmail.com> | 2011-01-28 16:31:58 -0500 |
commit | b11a72afece56dc138aac5400057668e8388f43d (patch) | |
tree | b779455122ee1987d3fcd9b51fcffa8d03057b86 /behaviors/ExpandingColorZones.py | |
parent | 6a0bfdfb00944ae0bcc6215a194c3290b4a085f2 (diff) | |
parent | b67a37ad06fa4c97dcdb32cecc71c7f492b12840 (diff) |
Merge branch 'fridaydemo' of github.com:rcoh/SmootLight into osc
Conflicts:
behaviors/ControllerOSC.py
Diffstat (limited to 'behaviors/ExpandingColorZones.py')
-rw-r--r-- | behaviors/ExpandingColorZones.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/behaviors/ExpandingColorZones.py b/behaviors/ExpandingColorZones.py index 345851e..75be761 100644 --- a/behaviors/ExpandingColorZones.py +++ b/behaviors/ExpandingColorZones.py @@ -2,13 +2,14 @@ from operationscore.Behavior import * from logger import main_log class ExpandingColorZones(Behavior): def behaviorInit(self): - self.mapping = {'r':[(132,0),(255,0,0)], 'g':[(400,0), (0,255,0)], - 'b':[(668,0), + self.mapping = {'s001':[(132,0),(255,0,0)], 's002':[(400,0), (0,255,0)], + 's003':[(668,0), (0,0,255)]} - self.mappingkey = 'KeyChar' + self.mappingkey = 'data' def processResponse(self, sensorInputs, recursiveInputs): ret = [] for data in sensorInputs: + print data data = dict(data) if self.mappingkey in data: try: |