Accept host; mac parsing

Author: echelon

find_dac.py

@@ -9,6 +9,9 @@ def find_dac_with_mac(mac):
 	s = socket(AF_INET, SOCK_DGRAM)
 	s.bind(('0.0.0.0', BCAST_PORT))
 
+	if type(mac) is str:
+		mac = Mac(mac)
+
 	print 'Looking for DAC (%s)' % mac.macStr
 	macsFound = set()
 

main.py

@@ -13,7 +13,9 @@
 
 def main():
 
-	p1 = VirtualDac()
+	p1 = VirtualDac(
+			host='255.255.255.255'
+	)
 	q = p1.get_queue()
 	p1.start()
 
@@ -23,7 +25,6 @@ def main():
 	p1.join()
 	p2.join()
 
-
 if __name__ == '__main__':
 	main()
 

net/macs.py

@@ -1,5 +1,23 @@
+import struct
 
 def mac_to_str(mac):
+	"""
+	Convert a `mac-type` to a colon-separated user-friendly string.
+		* uuid.getnode (long)
+		* EtherDream packet subset/parsed struct (str)
+	"""
+
+	# Mac returned by uuid module's `getnode` is a long
+	if type(mac) is long:
+		byts = []
+		while mac > 0:
+			d = mac & 0xFF
+			byts.append('%02x' %d)
+			mac >>= 8
+
+		byteStr = int(''.join(byts), 16)
+		mac = struct.pack('<' + 'Q', byteStr)[:6] # Two wasted bits
+
 	# From Jacob Potter's EtherDream dac.py
 	return ':'.join('%02x' % (ord(x), ) for x in mac)
 

square.py

@@ -0,0 +1,109 @@
+#!/usr/bin/env python
+
+from oldlib import dac
+from oldlib.common import *
+from find_dac import find_dac_with_mac
+
+import math
+import itertools
+import sys
+import time
+
+COLOR_R = CMAX
+COLOR_G = CMAX
+COLOR_B = CMAX
+
+SIZE = 9000
+XOFF = 0
+YOFF = 0
+
+def line_generator(pt1, pt2, backward=False, steps = 100):
+	xdiff = pt1.x - pt2.x
+	ydiff = pt1.y - pt2.y
+	if not backward:
+		for i in xrange(0, steps, 1):
+			j = float(i)/steps
+			x = pt1.x + (xdiff * j)
+			y = pt1.y + (ydiff * j)
+			yield (x, y, COLOR_R, COLOR_G, COLOR_B)
+
+	else:
+		for i in xrange(steps, 0, -1):
+			j = float(i)/steps
+			x = pt1.x + (xdiff * j)
+			y = pt1.y + (ydiff * j)
+			yield (x, y, COLOR_R, COLOR_G, COLOR_B)
+
+class LinePointStream(object):
+
+	def __init__(self, size=500, r=0, g=0, b=0, x=0, y=0):
+		self.size = size
+		self.r = r
+		self.g = g
+		self.b = b
+
+		self.stream = self.produce()
+
+		self.linePts = [
+			(Point(0+x, 0+y), Point(0+x, size+y)),
+			(Point(0+x, -size+y), Point(-size+x, -size+y)),
+			(Point(size+x, -size+y), Point(size+x, -2*size+y)),
+			(Point(size+x, 0+y), Point(2*size+x, 0+y))
+		]
+
+		self.curLineIdx = len(self.linePts)-1
+		self.advanceLine()
+
+	def advanceLine(self):
+		self.curLineIdx = (self.curLineIdx+1) % len(self.linePts)
+		self.curLine = line_generator(
+							self.linePts[self.curLineIdx][0],
+						    self.linePts[self.curLineIdx][1])
+
+	def produce(self):
+		while True:
+			try:
+				yield self.curLine.next()
+			except:
+				self.advanceLine()
+
+			"""
+			# Line out
+			for i in xrange(0, steps, 1):
+				j = float(i)/steps
+				x = self.x1 + (xdiff * j)
+				y = self.y1 + (ydiff * j)
+				yield (x, y, self.r, self.g, self.b)
+
+			# Line back in
+			for i in xrange(0, steps, 1):
+				j = float(i)/steps
+				x = self.x2 - xdiff * j
+				y = self.y2 - ydiff * j
+				yield (x, y, self.r, self.g, self.b)
+			"""
+
+	def read(self, n):
+		d = [self.stream.next() for i in xrange(n)]
+		return d
+
+while True:
+	macaddr = sys.argv[1]
+	print 'Going to find DAC w/ mac %s' % macaddr
+	m = find_dac_with_mac(macaddr)
+	try:
+		d = dac.DAC(m)
+		ps = LinePointStream(SIZE, x=XOFF, y=YOFF)
+		print 'Play stream...'
+		d.play_stream(ps)
+
+	except KeyboardInterrupt:
+		sys.exit()
+
+	except Exception as e:
+		# Hopefully the galvos aren't melting... 
+		print "EXCEPTION"
+		print e
+		time.sleep(0.01)
+		continue
+

util/macs.py

@@ -33,7 +33,11 @@ def run(self):
 		s.setsockopt(SOL_SOCKET, SO_REUSEADDR, 1)
 		s.setsockopt(SOL_SOCKET, SO_BROADCAST, 1)
 
-		bp = BroadcastPacket().toStruct()
+		bp = BroadcastPacket()
+
+		print 'Broadcasting as available MAC %s' % bp.getMacStr()
+
+		bp = bp.toStruct()
 
 		running = True
 

vdac/broadcast.py

@@ -1,5 +1,6 @@
 import struct
 from uuid import getnode as get_mac
+from net.macs import mac_to_str
 
 class BroadcastPacket(object):
 	"""
@@ -32,6 +33,9 @@ def __init__(self):
 		self.point_rate = 0
 		self.point_count = 0
 
+	def getMacStr(self):
+		return mac_to_str(self.mac)
+
 	def toStruct(self):
 		byts = []
 		mac = self.mac

vdac/packets.py

@@ -14,7 +14,7 @@ class VirtualDac(Process):
 	usage.
 	"""
 
-	def __init__(self, queue=None):
+	def __init__(self, queue=None, host=''):
 		super(VirtualDac, self).__init__()
 
 		if not queue:
@@ -24,6 +24,8 @@ def __init__(self, queue=None):
 		self._is_running = False
 		self._lock = RLock()
 
+		self._host = host
+
 	def get_queue(self):
 		return self._queue
 
@@ -42,7 +44,7 @@ def get_client():
 			# Listen for client connection
 			s = socket(AF_INET, SOCK_STREAM)
 			s.setsockopt(SOL_SOCKET, SO_REUSEADDR, 1)
-			s.bind(('localhost', 7765))
+			s.bind(('', 7765))
 			s.listen(3)
 			return s.accept() # return (csock, addr)
 
@@ -52,7 +54,7 @@ def get_client():
 		running = True
 
 		while running:
-			bt = BroadcastThread()
+			bt = BroadcastThread(self._host)
 
 			try:
 				print 'Broadcasting...'