--- a/libRDI.expect	Tue Sep 14 13:34:39 2010 -0400
+++ b/libRDI.expect	Fri Dec 10 15:29:27 2010 +0000
@@ -2,9 +2,9 @@
 #======================================================================
 #                    L I B R D I . E X P E C T 
 #                    doc: Mon Mar  8 02:57:35 2004
-#                    dlm: Thu Aug 26 00:23:09 2010
+#                    dlm: Fri Dec 10 15:28:39 2010
 #                    (c) 2004 A.M. Thurnherr
-#                    uE-Info: 42 0 NIL 0 0 72 2 2 8 NIL ofnI
+#                    uE-Info: 46 0 NIL 0 0 72 2 2 8 NIL ofnI
 #======================================================================
 
 # HISTORY:
@@ -40,7 +40,9 @@
 # Nov 19, 2009: - get_deployment_name needed a delay (sleep 1) for the
 #		  instruments sent to the DIMES cruise
 # Aug 25, 2010: - libBB.expect -> libRDI.expect
-
+# Dec  1, 2010: - replaced ! by * in upload_file
+# Dec  9, 2010: - increased timeout to 10s in load_factory_defaults
+# Dec 10, 2010: - changed version to 1.5
 
 # NOTE: after having written this, I am not much of a fan of TCL and and
 #	expect(1) syntax any more...
@@ -67,7 +69,7 @@
 set cid -1;						# current instrument
 
 proc print_version {} {
-	send_user "acquire V1.4beta\n"
+	send_user "acquire V1.5\n"
 }
 
 proc set_color {{cid -1}} {				# set instrument color
@@ -447,7 +449,7 @@
 		if {![regexp {^[ 	]*$} $line]} {
 			puts -nonewline $lf "$line ... ";
 			if {$line == "CS" || $line == "cs"} {
-				send_error "!";
+				send_error "*";
 				save_hardware_config $hwfn;
 				send "$line\r";
 				expect {
@@ -483,10 +485,10 @@
 	send "CR1\r";
 	expect {
 		timeout {error "Can't get prompt"};
-		-timeout 5 "ERR" {
+		-timeout 10 "ERR" {
 			error "command CR1 returned $expect_out(buffer)";
 		}
-		-timeout 5 ">"
+		-timeout 10 ">"
         }
 }