Skip to content

Commit 8ccd265

Browse files
committed
Read many data packets
1 parent db1a273 commit 8ccd265

File tree

4 files changed

+16
-11
lines changed

4 files changed

+16
-11
lines changed

etherdream.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ def respond_begin(self):
5454
p = ResponsePacket('b')
5555
respPacket = p.getStruct()
5656
self.socket.send(respPacket)
57+
print 'sent begin'
5758

5859
def respond_data(self):
5960
p = ResponsePacket('d')
@@ -68,7 +69,7 @@ def handle_packet(self, packet):
6869
t = packet.getType()
6970

7071
if t == PacketTypes.DATA:
71-
self._queue.put_nowait(buf)
72+
#self._queue.put_nowait(buf)
7273
#print 'data packet'
7374
self.respond_data()
7475
return
@@ -85,6 +86,7 @@ def handle_packet(self, packet):
8586

8687
def main(self):
8788
while 1:
89+
print 'read()'
8890
buf = self._reader.read()
8991
packet = ReceivedCommandPacket(buf)
9092

main.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,11 @@ def etherdream_thread(queue):
6565

6666
def main():
6767

68-
p3 = RepeaterProcess(DEVICE_MAC)
69-
queue = p3.getQueue()
70-
p3.start()
68+
#p3 = RepeaterProcess(DEVICE_MAC)
69+
#queue = p3.getQueue()
70+
#p3.start()
71+
72+
queue = None
7173

7274
p2 = Process(target=etherdream_process, args=(queue,))
7375
p2.start()

oldlib/dac2.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ def __init__(self, host, port = 7765):
136136
first_status.dump()
137137

138138
def begin(self, lwm, rate):
139+
print 'begin()'
139140
cmd = struct.pack("<cHI", "b", lwm, rate)
140141
self.conn.sendall(cmd)
141142
return self.readresp("b")
@@ -154,22 +155,24 @@ def encode_point(self, point):
154155
raise e
155156

156157
def write(self, points):
158+
print 'write()'
157159
epoints = map(self.encode_point, points)
158160
cmd = struct.pack("<cH", "d", len(epoints))
159161
data = cmd + "".join(epoints)
160162
npoints = len(points)
161163
ldata = len(data)
162164
avg = ldata/npoints
163165

164-
print 'write() length: %d, num points: %d' % (len(data), len(points))
165-
print 'Length per point: %d' % avg
166-
print 'Length encoded points: %d' % len(epoints[0])
167-
print 'Length command: %d' % len(cmd)
166+
#print 'write() length: %d, num points: %d' % (len(data), len(points))
167+
#print 'Length per point: %d' % avg
168+
#print 'Length encoded points: %d' % len(epoints[0])
169+
#print 'Length command: %d' % len(cmd)
168170

169171
self.conn.sendall(data)
170172
return self.readresp("d")
171173

172174
def prepare(self):
175+
print 'prepare()'
173176
self.conn.sendall("p")
174177
return self.readresp("p")
175178

@@ -216,6 +219,7 @@ def play_stream(self, stream):
216219
if not started:
217220
self.begin(0, 30000)
218221
started = 1
222+
print 'started now'
219223

220224

221225
def find_dac():

reader.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@ def _doRead(self):
3131
def read(self):
3232
self.count += 1
3333

34-
if self.count > 3:
35-
sys.exit()
36-
3734
buf = ''
3835
lengthRead = len(self._buf)
3936
lengthExpect = 1024

0 commit comments

Comments
 (0)