diff -r 77d8eafe2a07 -r f6e1a4c75073 IOCINFRAApp/Db/devKeithley6487.proto
--- a/IOCINFRAApp/Db/devKeithley6487.proto	Thu Mar 07 09:23:26 2019 +0100
+++ b/IOCINFRAApp/Db/devKeithley6487.proto	Fri Jul 10 06:11:39 2020 +0200
@@ -5,12 +5,13 @@
 # in file LICENSE that is included with this distribution.
 ##########################################################################
 
-@writetimeout { disconnect; }
-@replytimeout { disconnect; }
-@readtimeout  { disconnect; }
-@mismatch     { disconnect; }
+#@writetimeout { disconnect; }
+#replytimeout { disconnect; }
+#readtimeout  { disconnect; }
+#mismatch     { disconnect; }
 
-ReplyTimeout = 1200;
+ReplyTimeout = 600;
+ReadTimeout = 100;
 InTerminator = "\n";
 OutTerminator = "\n";
 
@@ -23,10 +24,22 @@
     out "\$1";
 }
 
+setArmCount {
+    out "\$1 %d";
+#    @init { out "\$1?"; in "%d"; }
+}
+
+getArmCount {
+    out "\$1?";
+    in "%d";
+    ExtraInput = Ignore;
+}
+
 setD {
     out "\$1 %d";
     @init { out "\$1?"; in "%d"; }
 }
+
 getD {
     out "\$1?";
     in "%d";
@@ -81,7 +94,7 @@
 # Measure current
 #
 measureCurrent {
-    ReplyTimeout = 5000;
+    ReplyTimeout = 800;
     out "READ?";
     in "%f";
     ExtraInput = Ignore;
@@ -98,22 +111,23 @@
 #
 # Source
 #
-setIlimit {
-    out "SOUR:VOLT:ILIM 2.5E-%d";
-    @init { out "SOUR:VOLT:ILIM?"; in "2.5%*[^E]E-%d"; }
-}
-getIlimit {
-    out "SOUR:VOLT:ILIM?";
-    in "2.5%*[^E]E-%d";
-    ExtraInput = Ignore;
-}
-setSourceRange {
-    out "SOUR:VOLT:RANGE %d";
-    @init { out "SOUR:VOLT:RANGE?"; in "%{1.000000E+01|5.000000E+01|5.000000E+02}"; }
-}
-getSourceRange {
-    out "SOUR:VOLT:RANGE?";
-    in "%{1.000000E+01|5.000000E+01|5.000000E+02}";
-    ExtraInput = Ignore;
-}
+#not on 6485
+#setIlimit {
+#    out "SOUR:VOLT:ILIM 2.5E-%d";
+#    @init { out "SOUR:VOLT:ILIM?"; in "2.5%*[^E]E-%d"; }
+#}
+#getIlimit {
+#    out "SOUR:VOLT:ILIM?";
+#    in "2.5%*[^E]E-%d";
+#    ExtraInput = Ignore;
+#}
+#setSourceRange {
+#    out "SOUR:VOLT:RANGE %d";
+#    @init { out "SOUR:VOLT:RANGE?"; in "%{1.000000E+01|5.000000E+01|5.000000E+02}"; }
+#}
+#getSourceRange {
+#    out "SOUR:VOLT:RANGE?";
+#    in "%{1.000000E+01|5.000000E+01|5.000000E+02}";
+#    ExtraInput = Ignore;
+#}