diff options
| author |  rcoh <rcoh@mit.edu> | 2011-01-03 15:11:28 -0500 |
|---|---|---|
| committer | rcoh <rcoh@mit.edu> | 2011-01-03 15:11:28 -0500 |
| commit | ba796403d111ffc3b29620647f38bc5541840ccb (patch) | |
| tree | c857ec4c7f4402f426ac29414c69055d2936b2ab | |
| parent | b02b461c2a6b94fa9b27d26bfa4918f39769363c (diff) | |
Not sure if this works.
| -rw-r--r-- | config/Outdoor.xml | 54 | ||||
| -rw-r--r-- | renderers/IndoorRenderer.py | 5 | ||||
| -rw-r--r-- | tests/testdata/inheritanceTESTout.xml | 2 | ||||
| -rw-r--r-- | util/PacketComposition.py | 2 |
4 files changed, 14 insertions, 49 deletions
diff --git a/config/Outdoor.xml b/config/Outdoor.xml index cae610b..f84f261 100644 --- a/config/Outdoor.xml +++ b/config/Outdoor.xml @@ -55,28 +55,10 @@ </Args> </Behavior> <Behavior Id="colorchange"> - <Class>behaviors.ColorChangerBehavior</Class> - <Args> - <Id>colorchange</Id> - <z-index>0</z-index> - <RenderToScreen>False</RenderToScreen> - <!--<ColorList> - <Color>(255,0,0)</Color> - </ColorList>--> - <Inputs> - <Id>pygame</Id> - </Inputs> - </Args> + <InheritsFrom>behaviors/RandomColor.xml</InheritsFrom> </Behavior> - <Behavior> - <Class>behaviors.DecayBehavior</Class> - <Args> - <Id>decay</Id> - <DecayType>Exponential</DecayType> - <Coefficient>.01</Coefficient> - <z-index>0</z-index> - <RenderToScreen>False</RenderToScreen> - </Args> + <Behavior Id="decay"> + <InheritsFrom>behaviors/PixelDecay.xml</InheritsFrom> </Behavior> <Behavior> <Class>behaviors.DebugBehavior</Class> @@ -94,12 +76,8 @@ <Id>pixelsleft</Id> </Args> </Behavior> - <Behavior> - <Class>behaviors.RecursiveDecay</Class> - <Args> - <Id>recursivedecay</Id> - <InitialResponseCount>70</InitialResponseCount> - </Args> + <Behavior Id="recursivedecay"> + <InheritsFrom>behaviors/LoopAndDie.xml</InheritsFrom> </Behavior> <Behavior> <Class>behaviors.BehaviorChain</Class> @@ -118,14 +96,8 @@ <Mapper>gaussmap</Mapper> </Args> </Behavior> - <Behavior> - <Class>behaviors.ModifyParam</Class> - <Args> - <Id>accelerate</Id> - <ParamType>Sensor</ParamType> - <ParamName>StepSize</ParamName> - <ParamOp>{val}*1.05</ParamOp> - </Args> + <Behavior Id="accelerate"> + <InheritsFrom>behaviors/Accelerate.xml</InheritsFrom> </Behavior> <Behavior> <Class>behaviors.BehaviorChain</Class> @@ -152,16 +124,8 @@ <RenderToScreen>True</RenderToScreen> </Args> </Behavior> - <Behavior> - <Class>behaviors.RunningBehavior</Class> - <Args> - <Id>running</Id> - <Inputs> - <Id>pygame</Id> - </Inputs> - <StepSize>1</StepSize> - <RenderToScreen>False</RenderToScreen> - </Args> + <Behavior Id="running"> + <InheritsFrom>behaviors/RunningBehavior.xml</InheritsFrom> </Behavior> </BehaviorConfiguration> </LightInstallation> diff --git a/renderers/IndoorRenderer.py b/renderers/IndoorRenderer.py index c13d11f..138383c 100644 --- a/renderers/IndoorRenderer.py +++ b/renderers/IndoorRenderer.py @@ -29,6 +29,7 @@ class IndoorRenderer(Renderer): self.sockets[ip] = network.getConnectedSocket(ip,port) packet = composer.composePixelStripPacket(pixelStrip, port) self.sockets[ip].send(packet, 0x00) - except: - pass #Rendering error. Log it. LOG + #pdb.set_trace() + except Exception as inst: + print inst diff --git a/tests/testdata/inheritanceTESTout.xml b/tests/testdata/inheritanceTESTout.xml index 0d4bba0..e8fb228 100644 --- a/tests/testdata/inheritanceTESTout.xml +++ b/tests/testdata/inheritanceTESTout.xml @@ -2,7 +2,7 @@ <B> <SubB> <SubSubB> - <A param3="val3"> + <A> <param1>1</param1> <param2>2</param2> </A> diff --git a/util/PacketComposition.py b/util/PacketComposition.py index 2563c61..4c34fa1 100644 --- a/util/PacketComposition.py +++ b/util/PacketComposition.py @@ -44,7 +44,7 @@ def kinetPortOut(): def kinetPortOutPayload(argDict): payload = bytearray() payload.extend(struct.pack('B', argDict['port'])) - #payload.append(0x00) #somepadding? lolwtf. + payload.append(0x00) #somepadding? lolwtf. payload.extend(struct.pack('H', argDict['flags'])) #payload.append(0x00) #somepadding? lolwtf. payload.extend(struct.pack('H', argDict['len'])) |