diff options
| author |  Russell Cohen <rcoh@mit.edu> | 2011-01-26 22:24:55 -0500 |
|---|---|---|
| committer | Russell Cohen <rcoh@mit.edu> | 2011-01-26 22:24:55 -0500 |
| commit | 5d29906fff79bc6e4ba83be7028e1380a0014d21 (patch) | |
| tree | 0bb2350046aa69c3b1095983fea59c49026a857b /operationscore | |
| parent | 2019fb2895237aa9d86450daaf6d90831189fc13 (diff) | |
| parent | 82f99fc4583ca3cc9861a9fe30990a4a9ef162c4 (diff) | |
Merge branch 'mobileapp' into biginstall
Conflicts:
behaviors/RestrictLocation.py
behaviors/Square.py
config/6thFloor.xml
inputs/TCPInput.py
layouts/60StripLayout.xml
operationscore/Behavior.py
operationscore/PixelMapper.py
pixelcore/Pixel.py
pixelcore/Screen.py
renderers/60StripSeq.xml
Diffstat (limited to 'operationscore')
| -rw-r--r-- | operationscore/PixelEvent.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/operationscore/PixelEvent.py b/operationscore/PixelEvent.py index 80d3b9e..c41df17 100644 --- a/operationscore/PixelEvent.py +++ b/operationscore/PixelEvent.py @@ -26,5 +26,6 @@ class PixelEvent(SmootCoreObject): color = responseDict['Color'] else: raise Exception('Need Color. Probably') + pdb.set_trace() responseDict['PixelEvent'] = StepEvent.generate(300, color) |