diff -r 77d8eafe2a07 -r f6e1a4c75073 IOCINFRAApp/Db/devKeithley6487.db
--- a/IOCINFRAApp/Db/devKeithley6487.db	Thu Mar 07 09:23:26 2019 +0100
+++ b/IOCINFRAApp/Db/devKeithley6487.db	Fri Jul 10 06:11:39 2020 +0200
@@ -81,24 +81,24 @@
 #
 # Unlock/Lock local controls
 #
-record(bo, "$(P)$(R)KLOCK")
-{
-    field(DESC, "Lock out all local controls")
-    field(DTYP, "stream")
-    field(OUT,  "@devKeithley6487.proto setD(SYST:KLOCK) $(PORT) $(A)")
-    field(ZNAM, "Unlocked")
-    field(ONAM, "Locked")
-    field(FLNK, "$(P)$(R)KLOCKRBV")
-}
-record(bi, "$(P)$(R)KLOCKRBV")
-{
-    field(DESC, "All local controls locked?")
-    field(DTYP, "stream")
-    field(INP,  "@devKeithley6487.proto getD(SYST:KLOCK) $(PORT) $(A)")
-    field(ZNAM, "Unlocked")
-    field(ONAM, "Locked")
-    field(PINI, "YES")
-}
+#record(bo, "$(P)$(R)KLOCK")
+#
+#   field(DESC, "Lock out all local controls")
+#   field(DTYP, "stream")
+#   field(OUT,  "@devKeithley6487.proto setD(SYST:KLOCK) $(PORT) $(A)")
+#   field(ZNAM, "Unlocked")
+#   field(ONAM, "Locked")
+#   field(FLNK, "$(P)$(R)KLOCKRBV")
+#
+#ecord(bi, "$(P)$(R)KLOCKRBV")
+#
+#   field(DESC, "All local controls locked?")
+#   field(DTYP, "stream")
+#   field(INP,  "@devKeithley6487.proto getD(SYST:KLOCK) $(PORT) $(A)")
+#   field(ZNAM, "Unlocked")
+#   field(ONAM, "Locked")
+#   field(PINI, "YES")
+#
 
 #
 # Reading
@@ -279,24 +279,24 @@
     field(ONAM, "Enable")
     field(PINI, "YES")
 }
-record(bo, "$(P)$(R)Damping")
-{
-    field(DESC, "Disable/Enable damping")
-    field(DTYP, "stream")
-    field(OUT,  "@devKeithley6487.proto setD(DAMP) $(PORT) $(A)")
-    field(ZNAM, "Disable")
-    field(ONAM, "Enable")
-    field(FLNK, "$(P)$(R)DampingRBV")
-}
-record(bi, "$(P)$(R)DampingRBV")
-{
-    field(DESC, "Disable/Enable damping")
-    field(DTYP, "stream")
-    field(INP,  "@devKeithley6487.proto getD(DAMP) $(PORT) $(A)")
-    field(ZNAM, "Disable")
-    field(ONAM, "Enable")
-    field(PINI, "YES")
-}
+#record(bo, "$(P)$(R)Damping")
+#{
+#    field(DESC, "Disable/Enable damping")
+#    field(DTYP, "stream")
+#    field(OUT,  "@devKeithley6487.proto setD(DAMP) $(PORT) $(A)")
+#    field(ZNAM, "Disable")
+#    field(ONAM, "Enable")
+#    field(FLNK, "$(P)$(R)DampingRBV")
+#}
+#record(bi, "$(P)$(R)DampingRBV")
+#{
+#    field(DESC, "Disable/Enable damping")
+#    field(DTYP, "stream")
+#    field(INP,  "@devKeithley6487.proto getD(DAMP) $(PORT) $(A)")
+#    field(ZNAM, "Disable")
+#    field(ONAM, "Enable")
+#    field(PINI, "YES")
+#}
 
 #
 # Triggering
@@ -413,7 +413,7 @@
 {
     field(DESC, "Arm count")
     field(DTYP, "stream")
-    field(OUT,  "@devKeithley6487.proto setD(ARM:COUN) $(PORT) $(A)")
+    field(OUT,  "@devKeithley6487.proto setArmCount(ARM:COUN) $(PORT) $(A)")
     field(LOPR, "1")
     field(HOPR, "2048")
     field(DRVL, "1")
@@ -424,7 +424,7 @@
 {
     field(DESC, "Arm count")
     field(DTYP, "stream")
-    field(INP,  "@devKeithley6487.proto getD(ARM:COUN) $(PORT) $(A)")
+    field(INP,  "@devKeithley6487.proto getArmCount(ARM:COUN) $(PORT) $(A)")
     field(LOPR, "1")
     field(HOPR, "2048")
     field(PINI, "YES")
@@ -440,6 +440,7 @@
     field(ONST, "Trigger Link")
     field(FLNK, "$(P)$(R)TriggerSourceRBV")
 }
+
 record(mbbi, "$(P)$(R)TriggerSourceRBV")
 {
     field(DESC, "Trigger source readback")
@@ -591,131 +592,3 @@
     field(LNK8, "$(P)$(R)TriggerDelayAutoRBV.PROC")
     field(LNK9, "$(P)$(R)TriggerCountRBV.PROC")
 }
-
-#
-# Voltage source
-#
-record(bo, "$(P)$(R)SourceEnable")
-{
-    field(DESC, "Disable/Enable voltage source")
-    field(DTYP, "stream")
-    field(OUT,  "@devKeithley6487.proto setD(SOUR:VOLT:STAT) $(PORT) $(A)")
-    field(ZNAM, "Off")
-    field(ONAM, "On")
-    field(FLNK, "$(P)$(R)SourceEnableRBV")
-}
-record(bi, "$(P)$(R)SourceEnableRBV")
-{
-    field(DESC, "Voltage source enabled?")
-    field(DTYP, "stream")
-    field(INP,  "@devKeithley6487.proto getD(SOUR:VOLT:STAT) $(PORT) $(A)")
-    field(ZNAM, "Off")
-    field(ONAM, "On")
-    field(PINI, "YES")
-}
-record(bo, "$(P)$(R)SourceInterlock")
-{
-    field(DESC, "Disable/Enable interlock")
-    field(DTYP, "stream")
-    field(OUT,  "@devKeithley6487.proto setD(SOUR:VOLT:INT) $(PORT) $(A)")
-    field(ZNAM, "Disable")
-    field(ONAM, "Enable")
-    field(FLNK, "$(P)$(R)SourceInterlockRBV")
-}
-record(bi, "$(P)$(R)SourceInterlockRBV")
-{
-    field(DESC, "Interlock status")
-    field(DTYP, "stream")
-    field(INP,  "@devKeithley6487.proto getD(SOUR:VOLT:INT) $(PORT) $(A)")
-    field(ONAM, "Good")
-    field(ZNAM, "Broken")
-    field(PINI, "YES")
-}
-record(mbbo, "$(P)$(R)SourceRange")
-{
-    field(DESC, "Full-scale range")
-    field(DTYP, "stream")
-    field(OUT,  "@devKeithley6487.proto setSourceRange $(PORT) $(A)")
-    field(ZRVL, "10")
-    field(ZRST, "10 V")
-    field(ONVL, "50")
-    field(ONST, "50 V")
-    field(TWVL, "500")
-    field(TWST, "500 V")
-    field(FLNK, "$(P)$(R)SourceRangeRBV")
-}
-record(mbbi, "$(P)$(R)SourceRangeRBV")
-{
-    field(DESC, "Full-scale range readback")
-    field(DTYP, "stream")
-    field(INP,  "@devKeithley6487.proto getSourceRange $(PORT) $(A)")
-    field(ZRVL, "0")
-    field(ZRST, "10 V")
-    field(ONVL, "1")
-    field(ONST, "50 V")
-    field(TWVL, "2")
-    field(TWST, "500 V")
-}
-record(mbbo, "$(P)$(R)SourceIlimit")
-{
-    field(DESC, "Source current limit")
-    field(DTYP, "stream")
-    field(OUT,  "@devKeithley6487.proto setIlimit $(PORT) $(A)")
-    field(ZRVL, "5")
-    field(ZRST, "25 uA")
-    field(ONVL, "4")
-    field(ONST, "250 uA")
-    field(TWVL, "3")
-    field(TWST, "2.5 mA")
-    field(THVL, "2")
-    field(THST, "25 mA")
-    field(FLNK, "$(P)$(R)SourceIlimitRBV")
-}
-record(mbbi, "$(P)$(R)SourceIlimitRBV")
-{
-    field(DESC, "Source current limit")
-    field(DTYP, "stream")
-    field(INP,  "@devKeithley6487.proto getIlimit $(PORT) $(A)")
-    field(ZRVL, "5")
-    field(ZRST, "25 uA")
-    field(ONVL, "4")
-    field(ONST, "250 uA")
-    field(TWVL, "3")
-    field(TWST, "2.5 mA")
-    field(THVL, "2")
-    field(THST, "25 mA")
-    field(PINI, "YES")
-}
-record(ao, "$(P)$(R)SourceVoltage")
-{
-    field(DESC, "Source voltage setpoint")
-    field(DTYP, "stream")
-    field(OUT,  "@devKeithley6487.proto setF(SOUR:VOLT) $(PORT) $(A)")
-    field(EGU,  "V")
-    field(PREC, "5")
-    field(LOPR, "-505")
-    field(HOPR, "505")
-    field(DRVL, "-505")
-    field(DRVH, "505")
-    field(FLNK, "$(P)$(R)SourceVoltageRBV")
-}
-record(ai, "$(P)$(R)SourceVoltageRBV")
-{
-    field(DESC, "Source voltage readback")
-    field(DTYP, "stream")
-    field(INP,  "@devKeithley6487.proto getF(SOUR:VOLT) $(PORT) $(A)")
-    field(EGU,  "V")
-    field(PREC, "5")
-    field(LOPR, "-505")
-    field(HOPR, "505")
-    field(PINI, "YES")
-}
-record(seq, "$(P)$(R)SourceReadSettings")
-{
-    field(DESC, "Read back source settings")
-    field(LNK1, "$(P)$(R)SourceVoltageRBV.PROC")
-    field(LNK2, "$(P)$(R)SourceEnableRBV.PROC")
-    field(LNK3, "$(P)$(R)SourceInterlockRBV.PROC")
-    field(LNK4, "$(P)$(R)SourceIlimitRBV.PROC")
-    field(LNK5, "$(P)$(R)SourceRangeRBV.PROC")
-}