- improved serial test

git-svn-id: http://moon:8086/svn/projects/HendiControl@171 fda53097-d464-4ada-af97-ba876c37ca34

Control/brewpi/serial_test.py

@@ -2,6 +2,7 @@
 
 import time
 import serial
+import sys
 
 def reset():
 	ser.dtr = True
@@ -28,40 +29,33 @@ if __name__ == '__main__':
 		ser.open()
 
 	if 0:
-		time.sleep(1.0)
+		ser.timeout = 1.000
-		print ("RTS = {}, DTR = {}".format(ser.rts, ser.dtr))
-		time.sleep(0.5)
-
-		ser.rts = False
-		print ("RTS = {}, DTR = {}".format(ser.rts, ser.dtr))
-		time.sleep(0.5)
-
-		ser.dtr = False
-		print ("RTS = {}, DTR = {}".format(ser.rts, ser.dtr))
-		time.sleep(1.0)
-
-	print("Start firmware update")
-	enter_bootloader()
-	ser.timeout = 0.100
-	ser.readline()
-
-	ser.flushInput()
-	with open("HendiCtrl.srec", 'r') as fp:
 		while(True):
-			s = fp.readline()
+			print(ser.readline().decode('utf-8'), end='')
-			if s == '':
-				break
-			data = s.encode()
-#			print(data)
-			ser.write(data)
-#			print(ser.read())
 
-	time.sleep(1.0)
+	if 1:
-	ser.flushInput()
+		ser.timeout = 1.000
+		print("Start firmware update")
+		enter_bootloader()
+		ser.readline()
 
-	print("Start application")
+		ser.flushInput()
-	reset()
+		with open("HendiCtrl.srec", 'r') as fp:
-	print(ser.readline().decode('utf-8'))
+			while(True):
+				s = fp.readline()
+				if s == '':
+					break
+				data = s.encode()
+				ser.write(data)
+				ack = ser.read()
+				sys.stdout.write(ack.decode('utf-8'))
+				
+				sys.stdout.flush()
+				
+		reset()
+		ser.flushInput()
+		print("\nStart application")
+		print(ser.readline().decode('utf-8'))
 
 	ser.close()