Merge branch 'master' into behaviors

Conflicts:
	LightInstallation.py

1 files changed, 11 insertions, 14 deletions

diff --git a/util/PacketComposition.py b/util/PacketComposition.py
index 3574170..c4fcdc3 100644
--- a/util/PacketComposition.py
+++ b/util/PacketComposition.py
@@ -1,14 +1,11 @@
 import struct
 VERSION = 0x0001
 MAGIC = 0x4adc0104
-MOREMAGIC = 0xdeadbeef
-DEEPMAGIC = 0xc001d00d
-MAGICHASH = 0x69000420
 PORTOUT = 0x0108
 UNI = 0
 import pdb
 import util.TimeOps as timeops
-kinetDict = {'flags': 0, 'startcode': 0, 'pad':0}
+argDict = {'flags': 0, 'startcode': 0, 'pad':0}
 def composePixelStripData(pixelStrip,currentTime=timeops.time()):
     packet = bytearray()
     for light in pixelStrip:
@@ -32,10 +29,10 @@ def memoize(f):
 @memoize
 def cachePacketHeader(port):
     packet = bytearray()
-    subDict = dict(kinetDict)
-    subDict['len'] = 38000 #I have no idea why this works.
+    subDict = dict(argDict)
+    subDict['len'] = 38500 #I have no idea why this works.
     subDict['port'] = port
-    packet.extend(kinetPortOutPacket(subDict))
+    packet.extend(portOutPacket(subDict))
     packet.append(0x0)
     return packet
 def composePixelStripPacket(pixelStrip,port, currentTime):
@@ -43,18 +40,18 @@ def composePixelStripPacket(pixelStrip,port, currentTime):
     data = composePixelStripData(pixelStrip, currentTime)
     packet.extend(data)
     return packet
-def kinetHeader():
+def packheader():
     header = bytearray()
     header.extend(struct.pack('L', MAGIC))
     header.extend(struct.pack('H', VERSION))
     header.extend(struct.pack('H', PORTOUT))
     header.extend(struct.pack('L', 0))
     return header
-def kinetPortOut():
-    header = kinetHeader()
+def portOut():
+    header = packheader()
     header.extend(struct.pack('L', UNI))
     return header
-def kinetPortOutPayload(argDict):
+def portOutPayload(argDict):
     payload = bytearray()
     payload.extend(struct.pack('B', argDict['port']))
     payload.extend(struct.pack('H', argDict['flags']))
@@ -62,8 +59,8 @@ def kinetPortOutPayload(argDict):
     payload.extend(struct.pack('H', argDict['len']))
     payload.extend(struct.pack('H', argDict['startcode']))
     return payload
-def kinetPortOutPacket(payloadArgs):
+def portOutPacket(payloadArgs):
     packet = bytearray()
-    packet.extend(kinetPortOut())
-    packet.extend(kinetPortOutPayload(payloadArgs))
+    packet.extend(portOut())
+    packet.extend(portOutPayload(payloadArgs))
     return packet