diff options
| author |  rcoh <rcoh@mit.edu> | 2011-01-03 22:28:28 -0500 |
|---|---|---|
| committer | rcoh <rcoh@mit.edu> | 2011-01-03 22:28:28 -0500 |
| commit | f5c29b39f3eef83227e3fb7c550d9b2922a19894 (patch) | |
| tree | d8b1575b49762756ae1cbd152b9c5f51f3f93801 /util | |
| parent | ba796403d111ffc3b29620647f38bc5541840ccb (diff) | |
fixed a bug caused by util stuff. some new functionality, not all fully implemented.
Diffstat (limited to 'util')
| -rw-r--r-- | util/Geo.py | 6 | ||||
| -rw-r--r-- | util/NetworkOps.py | 3 | ||||
| -rw-r--r-- | util/PacketComposition.py | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/util/Geo.py b/util/Geo.py index 885c585..a9243de 100644 --- a/util/Geo.py +++ b/util/Geo.py @@ -1,6 +1,7 @@ #Geometry code import math from bisect import * +import random def pointWithinBoundingBox(point, bb): #this could be in 4 lines, but I'm lazy. return sum([(point[i % 2] <= bb[i]) == (i>1) for i in range(4)]) == 4 print pointWithinBoundingBox((118,21), (10,8,298,42)) @@ -13,3 +14,8 @@ def gaussian(x,height,center,width): return a*math.exp(-((x-b)**2)/(2*c**2)) def dist(l1, l2): return math.sqrt(sum([(l1[i]-l2[i])**2 for i in range(len(l1))])) +def randomLoc(boundingBox): #TODO: make less shitty + loc = [] + loc.append(random.randint(0, boundingBox[0])) + loc.append(random.randint(0, boundingBox[1])) + return tuple(loc) diff --git a/util/NetworkOps.py b/util/NetworkOps.py index 2fa531e..6c50c6d 100644 --- a/util/NetworkOps.py +++ b/util/NetworkOps.py @@ -4,7 +4,8 @@ def getConnectedSocket(ip,port): sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) try: sock.connect((ip, port)) + return sock except Exception as inst: main_log.error('Network down. All network based renderers and sensors will not function.', inst) - return sock + print (ip, port) diff --git a/util/PacketComposition.py b/util/PacketComposition.py index 4c34fa1..73eefff 100644 --- a/util/PacketComposition.py +++ b/util/PacketComposition.py @@ -6,6 +6,7 @@ DEEPMAGIC = 0xc001d00d MAGICHASH = 0x69000420 PORTOUT = 0x0108 UNI = 0 +import pdb kinetDict = {'flags': 0, 'startcode': 0, 'pad':0} def composePixelStripData(pixelStrip): packet = bytearray() @@ -44,7 +45,6 @@ def kinetPortOut(): def kinetPortOutPayload(argDict): payload = bytearray() payload.extend(struct.pack('B', argDict['port'])) - payload.append(0x00) #somepadding? lolwtf. payload.extend(struct.pack('H', argDict['flags'])) #payload.append(0x00) #somepadding? lolwtf. payload.extend(struct.pack('H', argDict['len'])) |