a lot of fixes

[avr-crypto-lib.git] / host / get_test.rb

diff --git a/host/get_test.rb b/host/get_test.rb
index 8b3f940c5be60f7b5c85d7ad02fb7902f038b825..9d60a4a82551fbee4f0f4549bb37ba64329786ea 100644 (file)
--- a/host/get_test.rb
+++ b/host/get_test.rb
@@ -21,13 +21,23 @@
 require 'rubygems'
 require 'serialport'
 
+$debug = false
+
 def read_line(error_msg=true)
-  s = $sp.gets()
-  if s==nil
-    puts("ERROR: read timeout!\n") if error_msg
-       return nil
-  end  
-  s.gsub(/\006/, '');  
+  begin
+    i = $extended_wait
+    begin
+      s = $sp.gets()
+      i -= 1
+    end while !s && i > 0
+    if s==nil
+      puts("ERROR: read timeout!\n") if error_msg
+      return nil
+    end
+  putc('.') if s.include?(6.chr)       
+  puts(s.inspect) if $debug
+  end while s == 6.chr
+  s.gsub(/\006/, '')
 end
 
 def readTestVector(param)
@@ -112,8 +122,8 @@ param=(ARGV.size>=7)?ARGV[6]:"";
 puts("\nPort: "+ARGV[0]+ "@"+ARGV[1]+" "+ARGV[2]+"N"+ARGV[3]+"\n");
 $linewidth = 16
 $sp = SerialPort.new(ARGV[0], ARGV[1].to_i, ARGV[2].to_i, ARGV[3].to_i, SerialPort::NONE);
-$sp.read_timeout=1000; # 1 secound
-$extended_wait=100;
+$sp.read_timeout=1000; # 1 second
+$extended_wait=10;
 $sp.write(command);
 
 if(readTestVector(param)==false)