diff options
| author |  Daniel <dmt@daniel-desktop.(none)> | 2011-01-29 18:55:40 -0800 |
|---|---|---|
| committer | Daniel <dmt@daniel-desktop.(none)> | 2011-01-29 18:55:40 -0800 |
| commit | 8f0e3818e819c73fee6986852c856efb7717c0e4 (patch) | |
| tree | 4c6ee00fcebc155d83a78ce40cc38cbcd37efd3e /behaviors/EchoBehavior.py | |
| parent | e34b4dbf8ba67c5374e43bea8b469172025a9163 (diff) | |
| parent | 277a5143165d2553ce5e97f151cc6b3cea426468 (diff) | |
Merge branch 'master' of github.com:rcoh/SmootLight into osc
Conflicts:
Profile.py
Diffstat (limited to 'behaviors/EchoBehavior.py')
| -rw-r--r-- | behaviors/EchoBehavior.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/behaviors/EchoBehavior.py b/behaviors/EchoBehavior.py index 6ef4fcb..c4af7c0 100644 --- a/behaviors/EchoBehavior.py +++ b/behaviors/EchoBehavior.py @@ -9,6 +9,9 @@ class EchoBehavior(Behavior): for sensory in sensorInputs: outDict = {} outDict[Strings.LOCATION] = sensory[Strings.LOCATION] - outDict['Color'] = (255,0,0) + if self['Color'] != None: + outDict['Color'] = self['Color'] + else: + outDict['Color'] = (255,0,0) ret.append(outDict) return (ret, []) |