X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pkernel%2Fkernel.py;fp=pkernel%2Fkernel.py;h=afadfcd4662e95c9a81625ed1cb75479b20ccbb5;hb=27d7ace7819c76c6c8326003a3e4e38697df156e;hp=e495a86b693f10d2a9557d15a57f1052898e5ca4;hpb=3d2bcfa368af1ffb347209c34a433df16554dde7;p=pyfrprog.git

diff --git a/pkernel/kernel.py b/pkernel/kernel.py
index e495a86..afadfcd 100755
--- a/pkernel/kernel.py
+++ b/pkernel/kernel.py
@@ -11,6 +11,22 @@ def recvByte():
 	i = tty.read()
 	return ord(i)
 
+def recvByteTO(b): #with timeout
+	j = 0
+	i = tty.read()
+	while len(i)==0 and j < 400:
+		time.sleep(0.03)
+		i = tty.read()
+		j = j + 1
+	if j == 400:
+		print "ack it!"
+		sendByte(0x23)
+		if(recvByte() != 0xaa):
+			raise Exception #ok, something really failed
+	else:
+		if(ord(i) != b):
+			raise Exception
+
 def sendByte(byte):
 	time.sleep(0.005) # just to get sure, wait 5ms
 	tty.write(chr(byte))
@@ -50,28 +66,16 @@ def pkernWRITE(address, size, data):
 	print "address:", hex(address), "size:", size
 	# send WRITE command
 	sendByte(0x13)
-	if (recvByte() != 0x37):
-		raise Exception
+	recvByteTO(0x37)
+
 	# tell desired address and size
 	sendDWord(address)
 	sendWord(size)
 
-	if (recvByte() != 0x04):
-		raise Exception
-	print "Received Metadata."
-
 	# write binary stream of data
 	for i in range(0, size):
 		sendByte(data[i])
 
-	if (recvByte() != 0x08):
-		raise Exception
-	print "Received Data."
-
-	if (recvByte() != 0x28):
-		raise Exception
-	print "Flashing done."
-
 
 class FlashSequence(object):
 	def __init__(self, address, data):
@@ -144,6 +148,8 @@ for seq in flashseqs:
 	print "Flashing", len(seq.data), "bytes at address", hex(seq.address)
 	pkernWRITE(seq.address, len(seq.data), seq.data)
 
-sendByte(0x99);
+#sendByte(0x99); #exit and wait
+#print "Reset your board now to run code from Flash"
+
 
-print "Reset your board now to run code from Flash"
+sendByte(0x97); #exit and restart