From b78232cc51f3baac912a3cc7cfba3a6aab2d3711 Mon Sep 17 00:00:00 2001
From: timmmooney <mooney@aps.anl.gov>
Date: Fri, 5 Jan 2007 19:35:27 +0000
Subject: [PATCH] 3.13.9 will require macros that include masros to be enclosed
in quotes
---
iocBoot/iocCygwin/motor.substitutions | 14 ++--
iocBoot/iocCygwin/scanParms.substitutions | 34 +++++-----
iocBoot/iocLinux/motor.substitutions | 16 ++---
iocBoot/iocLinux/scanParms.substitutions | 32 ++++-----
iocBoot/iocSolaris/motor.substitutions | 32 ++++-----
iocBoot/iocSolaris/scanParms.substitutions | 56 ++++++++--------
iocBoot/iocvxWorks/basic_motor.substitutions | 16 ++---
iocBoot/iocvxWorks/motor.substitutions | 32 ++++-----
iocBoot/iocvxWorks/scanParms.substitutions | 68 ++++++++++----------
iocBoot/iocvxWorks/st.cmd | 8 ++-
10 files changed, 157 insertions(+), 151 deletions(-)
diff --git a/iocBoot/iocCygwin/motor.substitutions b/iocBoot/iocCygwin/motor.substitutions
index c8d5a44..bd3f813 100644
--- a/iocBoot/iocCygwin/motor.substitutions
+++ b/iocBoot/iocCygwin/motor.substitutions
@@ -2,11 +2,11 @@ file "$(MOTOR)/db/motor.db"
{
pattern
{P, N, M, DTYP, C, S, DESC, EGU, DIR, VELO, VBAS, ACCL, BDST, BVEL, BACC, MRES, PREC, DHLM, DLLM, INIT}
-{xxx:, 1, m$(N), "MM4000", 0, 0, "motor $(N)", degrees, Pos, 10, 0., 1., 0, 1, .2, 1e-3, 3, 100, -100, ""}
-{xxx:, 2, m$(N), "MM4000", 0, 1, "motor $(N)", degrees, Pos, 60, 0., 1.5, 0, 1, .2, 1e-3, 3, 100, -100, ""}
-{xxx:, 3, m$(N), "MM4000", 0, 2, "motor $(N)", degrees, Pos, 60, 0., 1., 0, 1, .2, 1e-3, 3, 100, -100, ""}
-{xxx:, 4, m$(N), "ACS MCB-4B", 0, 0, "motor $(N)", steps, Pos, 1000., 1, .2, 0, 1, .2, 1, 1, 1e6, -1e6, ""}
-{xxx:, 5, m$(N), "ACS MCB-4B", 0, 1, "motor $(N)", degrees, Pos, 1000., 1, .2, 0, 1, .2, 1, 1, 100, -100, ""}
-{xxx:, 6, m$(N), "ACS MCB-4B", 0, 2, "motor $(N)", degrees, Pos, 1000., 1, .2, 0, 1, .2, 1, 1, 100, -100, ""}
-{xxx:, 7, m$(N), "ACS MCB-4B", 0, 3, "motor $(N)", degrees, Pos, 1000., 1, .2, 0, 1, .2, 1, 1, 100, -100, ""}
+{xxx:, 1, "m$(N)", "MM4000", 0, 0, "motor $(N)", degrees, Pos, 10, 0., 1., 0, 1, .2, 1e-3, 3, 100, -100, ""}
+{xxx:, 2, "m$(N)", "MM4000", 0, 1, "motor $(N)", degrees, Pos, 60, 0., 1.5, 0, 1, .2, 1e-3, 3, 100, -100, ""}
+{xxx:, 3, "m$(N)", "MM4000", 0, 2, "motor $(N)", degrees, Pos, 60, 0., 1., 0, 1, .2, 1e-3, 3, 100, -100, ""}
+{xxx:, 4, "m$(N)", "ACS MCB-4B", 0, 0, "motor $(N)", steps, Pos, 1000., 1, .2, 0, 1, .2, 1, 1, 1e6, -1e6, ""}
+{xxx:, 5, "m$(N)", "ACS MCB-4B", 0, 1, "motor $(N)", degrees, Pos, 1000., 1, .2, 0, 1, .2, 1, 1, 100, -100, ""}
+{xxx:, 6, "m$(N)", "ACS MCB-4B", 0, 2, "motor $(N)", degrees, Pos, 1000., 1, .2, 0, 1, .2, 1, 1, 100, -100, ""}
+{xxx:, 7, "m$(N)", "ACS MCB-4B", 0, 3, "motor $(N)", degrees, Pos, 1000., 1, .2, 0, 1, .2, 1, 1, 100, -100, ""}
}
diff --git a/iocBoot/iocCygwin/scanParms.substitutions b/iocBoot/iocCygwin/scanParms.substitutions
index cfe432b..f4241ec 100644
--- a/iocBoot/iocCygwin/scanParms.substitutions
+++ b/iocBoot/iocCygwin/scanParms.substitutions
@@ -1,13 +1,15 @@
+# Note beginning with 3.13.9, macro args that contain macro args must be
+# in quotes"
file "$(SSCAN)/sscanApp/Db/scanParms.db"
{
-{P=xxx:,SCANREC=xxx:scan1,Q=m1,POS=$(Q).VAL,RDBK=$(Q).RBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=m2,POS=$(Q).VAL,RDBK=$(Q).RBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=m3,POS=$(Q).VAL,RDBK=$(Q).RBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=m4,POS=$(Q).VAL,RDBK=$(Q).RBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=m5,POS=$(Q).VAL,RDBK=$(Q).RBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=m6,POS=$(Q).VAL,RDBK=$(Q).RBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=m7,POS=$(Q).VAL,RDBK=$(Q).RBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=m8,POS=$(Q).VAL,RDBK=$(Q).RBV}
+{P=xxx:,SCANREC=xxx:scan1,Q=m1,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=m2,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=m3,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=m4,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=m5,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=m6,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=m7,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=m8,POS="$(Q).VAL",RDBK="$(Q).RBV"}
{P=xxx:,SCANREC=xxx:scan1,Q=Table1X,POS=table1.X,RDBK=table1.XRB}
{P=xxx:,SCANREC=xxx:scan1,Q=Table1Y,POS=table1.Y,RDBK=table1.YRB}
@@ -34,13 +36,13 @@ file "$(SSCAN)/sscanApp/Db/scanParms.db"
{P=xxx:,SCANREC=xxx:scan1,Q=Slit1Vcenter,POS=Slit1Vcenter.VAL,RDBK=Slit1Vt2.D}
# new soft-motor-based slit
-#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Hxn,POS=$(Q).VAL,RDBK=$(Q).RBV}
-#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Hxp,POS=$(Q).VAL,RDBK=$(Q).RBV}
-#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Hsize,POS=$(Q).VAL,RDBK=$(Q).RBV}
-#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Hcenter,POS=$(Q).VAL,RDBK=$(Q).RBV}
-#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Vxn,POS=$(Q).VAL,RDBK=$(Q).RBV}
-#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Vxp,POS=$(Q).VAL,RDBK=$(Q).RBV}
-#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Vsize,POS=$(Q).VAL,RDBK=$(Q).RBV}
-#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Vcenter,POS=$(Q).VAL,RDBK=$(Q).RBV}
+#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Hxn,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Hxp,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Hsize,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Hcenter,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Vxn,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Vxp,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Vsize,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Vcenter,POS="$(Q).VAL",RDBK="$(Q).RBV"}
}
diff --git a/iocBoot/iocLinux/motor.substitutions b/iocBoot/iocLinux/motor.substitutions
index c8d5a44..cbf1184 100644
--- a/iocBoot/iocLinux/motor.substitutions
+++ b/iocBoot/iocLinux/motor.substitutions
@@ -1,12 +1,12 @@
file "$(MOTOR)/db/motor.db"
{
pattern
-{P, N, M, DTYP, C, S, DESC, EGU, DIR, VELO, VBAS, ACCL, BDST, BVEL, BACC, MRES, PREC, DHLM, DLLM, INIT}
-{xxx:, 1, m$(N), "MM4000", 0, 0, "motor $(N)", degrees, Pos, 10, 0., 1., 0, 1, .2, 1e-3, 3, 100, -100, ""}
-{xxx:, 2, m$(N), "MM4000", 0, 1, "motor $(N)", degrees, Pos, 60, 0., 1.5, 0, 1, .2, 1e-3, 3, 100, -100, ""}
-{xxx:, 3, m$(N), "MM4000", 0, 2, "motor $(N)", degrees, Pos, 60, 0., 1., 0, 1, .2, 1e-3, 3, 100, -100, ""}
-{xxx:, 4, m$(N), "ACS MCB-4B", 0, 0, "motor $(N)", steps, Pos, 1000., 1, .2, 0, 1, .2, 1, 1, 1e6, -1e6, ""}
-{xxx:, 5, m$(N), "ACS MCB-4B", 0, 1, "motor $(N)", degrees, Pos, 1000., 1, .2, 0, 1, .2, 1, 1, 100, -100, ""}
-{xxx:, 6, m$(N), "ACS MCB-4B", 0, 2, "motor $(N)", degrees, Pos, 1000., 1, .2, 0, 1, .2, 1, 1, 100, -100, ""}
-{xxx:, 7, m$(N), "ACS MCB-4B", 0, 3, "motor $(N)", degrees, Pos, 1000., 1, .2, 0, 1, .2, 1, 1, 100, -100, ""}
+{P, N, M, DTYP, C, S, DESC, EGU, DIR, VELO, VBAS, ACCL, BDST, BVEL, BACC, MRES, PREC, DHLM, DLLM, INIT}
+{xxx:, 1, "m$(N)", "MM4000", 0, 0, "motor $(N)", degrees, Pos, 10, 0., 1., 0, 1, .2, 1e-3, 3, 100, -100, ""}
+{xxx:, 2, "m$(N)", "MM4000", 0, 1, "motor $(N)", degrees, Pos, 60, 0., 1.5, 0, 1, .2, 1e-3, 3, 100, -100, ""}
+{xxx:, 3, "m$(N)", "MM4000", 0, 2, "motor $(N)", degrees, Pos, 60, 0., 1., 0, 1, .2, 1e-3, 3, 100, -100, ""}
+{xxx:, 4, "m$(N)", "ACS MCB-4B", 0, 0, "motor $(N)", steps, Pos, 1000., 1, .2, 0, 1, .2, 1, 1, 1e6, -1e6, ""}
+{xxx:, 5, "m$(N)", "ACS MCB-4B", 0, 1, "motor $(N)", degrees, Pos, 1000., 1, .2, 0, 1, .2, 1, 1, 100, -100, ""}
+{xxx:, 6, "m$(N)", "ACS MCB-4B", 0, 2, "motor $(N)", degrees, Pos, 1000., 1, .2, 0, 1, .2, 1, 1, 100, -100, ""}
+{xxx:, 7, "m$(N)", "ACS MCB-4B", 0, 3, "motor $(N)", degrees, Pos, 1000., 1, .2, 0, 1, .2, 1, 1, 100, -100, ""}
}
diff --git a/iocBoot/iocLinux/scanParms.substitutions b/iocBoot/iocLinux/scanParms.substitutions
index cfe432b..d8dd31e 100644
--- a/iocBoot/iocLinux/scanParms.substitutions
+++ b/iocBoot/iocLinux/scanParms.substitutions
@@ -1,13 +1,13 @@
file "$(SSCAN)/sscanApp/Db/scanParms.db"
{
-{P=xxx:,SCANREC=xxx:scan1,Q=m1,POS=$(Q).VAL,RDBK=$(Q).RBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=m2,POS=$(Q).VAL,RDBK=$(Q).RBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=m3,POS=$(Q).VAL,RDBK=$(Q).RBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=m4,POS=$(Q).VAL,RDBK=$(Q).RBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=m5,POS=$(Q).VAL,RDBK=$(Q).RBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=m6,POS=$(Q).VAL,RDBK=$(Q).RBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=m7,POS=$(Q).VAL,RDBK=$(Q).RBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=m8,POS=$(Q).VAL,RDBK=$(Q).RBV}
+{P=xxx:,SCANREC=xxx:scan1,Q=m1,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=m2,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=m3,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=m4,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=m5,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=m6,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=m7,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=m8,POS="$(Q).VAL",RDBK="$(Q).RBV"}
{P=xxx:,SCANREC=xxx:scan1,Q=Table1X,POS=table1.X,RDBK=table1.XRB}
{P=xxx:,SCANREC=xxx:scan1,Q=Table1Y,POS=table1.Y,RDBK=table1.YRB}
@@ -34,13 +34,13 @@ file "$(SSCAN)/sscanApp/Db/scanParms.db"
{P=xxx:,SCANREC=xxx:scan1,Q=Slit1Vcenter,POS=Slit1Vcenter.VAL,RDBK=Slit1Vt2.D}
# new soft-motor-based slit
-#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Hxn,POS=$(Q).VAL,RDBK=$(Q).RBV}
-#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Hxp,POS=$(Q).VAL,RDBK=$(Q).RBV}
-#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Hsize,POS=$(Q).VAL,RDBK=$(Q).RBV}
-#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Hcenter,POS=$(Q).VAL,RDBK=$(Q).RBV}
-#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Vxn,POS=$(Q).VAL,RDBK=$(Q).RBV}
-#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Vxp,POS=$(Q).VAL,RDBK=$(Q).RBV}
-#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Vsize,POS=$(Q).VAL,RDBK=$(Q).RBV}
-#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Vcenter,POS=$(Q).VAL,RDBK=$(Q).RBV}
+#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Hxn,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Hxp,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Hsize,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Hcenter,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Vxn,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Vxp,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Vsize,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Vcenter,POS="$(Q).VAL",RDBK="$(Q).RBV"}
}
diff --git a/iocBoot/iocSolaris/motor.substitutions b/iocBoot/iocSolaris/motor.substitutions
index a1c4a2a..8493e0a 100644
--- a/iocBoot/iocSolaris/motor.substitutions
+++ b/iocBoot/iocSolaris/motor.substitutions
@@ -2,20 +2,20 @@ file "$(MOTOR)/db/motor.db"
{
pattern
{P, N, M, DTYP, C, S, DESC, EGU, DIR, VELO, VBAS, ACCL, BDST, BVEL, BACC, MRES, PREC, DHLM, DLLM, INIT}
-{xxx:, 1, m$(N), "OMS VME8/44", 0, 0, "M0X", mm, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
-{xxx:, 2, m$(N), "OMS VME8/44", 0, 1, "M0Y", mm, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
-{xxx:, 3, m$(N), "OMS VME8/44", 0, 2, "M1Y", mm, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
-{xxx:, 4, m$(N), "OMS VME8/44", 0, 3, "M2X", mm, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
-{xxx:, 5, m$(N), "OMS VME8/44", 0, 4, "M2Y", mm, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
-{xxx:, 6, m$(N), "OMS VME8/44", 0, 5, "M2Z", mm, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
-{xxx:, 7, m$(N), "OMS VME8/44", 0, 6, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
-{xxx:, 8, m$(N), "OMS VME8/44", 0, 7, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
-{xxx:, 9, m$(N), "OMS VME58", 0, 0, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
-{xxx:, 10, m$(N), "OMS VME58", 0, 1, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
-{xxx:, 11, m$(N), "OMS VME58", 0, 2, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
-{xxx:, 12, m$(N), "OMS VME58", 0, 3, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
-{xxx:, 13, m$(N), "OMS VME58", 0, 4, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
-{xxx:, 14, m$(N), "OMS VME58", 0, 5, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
-{xxx:, 15, m$(N), "OMS VME58", 0, 6, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
-{xxx:, 16, m$(N), "OMS VME58", 0, 7, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
+{xxx:, 1, "m$(N)", "OMS VME8/44", 0, 0, "M0X", mm, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
+{xxx:, 2, "m$(N)", "OMS VME8/44", 0, 1, "M0Y", mm, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
+{xxx:, 3, "m$(N)", "OMS VME8/44", 0, 2, "M1Y", mm, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
+{xxx:, 4, "m$(N)", "OMS VME8/44", 0, 3, "M2X", mm, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
+{xxx:, 5, "m$(N)", "OMS VME8/44", 0, 4, "M2Y", mm, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
+{xxx:, 6, "m$(N)", "OMS VME8/44", 0, 5, "M2Z", mm, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
+{xxx:, 7, "m$(N)", "OMS VME8/44", 0, 6, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
+{xxx:, 8, "m$(N)", "OMS VME8/44", 0, 7, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
+{xxx:, 9, "m$(N)", "OMS VME58", 0, 0, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
+{xxx:, 10, "m$(N)", "OMS VME58", 0, 1, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
+{xxx:, 11, "m$(N)", "OMS VME58", 0, 2, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
+{xxx:, 12, "m$(N)", "OMS VME58", 0, 3, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
+{xxx:, 13, "m$(N)", "OMS VME58", 0, 4, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
+{xxx:, 14, "m$(N)", "OMS VME58", 0, 5, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
+{xxx:, 15, "m$(N)", "OMS VME58", 0, 6, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
+{xxx:, 16, "m$(N)", "OMS VME58", 0, 7, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
}
diff --git a/iocBoot/iocSolaris/scanParms.substitutions b/iocBoot/iocSolaris/scanParms.substitutions
index f78c561..9e81894 100644
--- a/iocBoot/iocSolaris/scanParms.substitutions
+++ b/iocBoot/iocSolaris/scanParms.substitutions
@@ -1,26 +1,26 @@
file "$(SSCAN)/sscanApp/Db/scanParms.db"
{
-{P=xxx:,SCANREC=xxx:scan1,Q=SM1,POS=$(Q).VAL,RDBK=$(Q).RBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=SM2,POS=$(Q).VAL,RDBK=$(Q).RBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=SM3,POS=$(Q).VAL,RDBK=$(Q).RBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=SM4,POS=$(Q).VAL,RDBK=$(Q).RBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=SM5,POS=$(Q).VAL,RDBK=$(Q).RBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=SM6,POS=$(Q).VAL,RDBK=$(Q).RBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=SM7,POS=$(Q).VAL,RDBK=$(Q).RBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=SM8,POS=$(Q).VAL,RDBK=$(Q).RBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=SM9,POS=$(Q).VAL,RDBK=$(Q).RBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=SM10,POS=$(Q).VAL,RDBK=$(Q).RBV}
+{P=xxx:,SCANREC=xxx:scan1,Q=SM1,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=SM2,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=SM3,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=SM4,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=SM5,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=SM6,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=SM7,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=SM8,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=SM9,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=SM10,POS="$(Q).VAL",RDBK="$(Q).RBV"}
-{P=xxx:,SCANREC=xxx:scan1,Q=SM1,POS=$(Q).DVAL,RDBK=$(Q).DRBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=SM2,POS=$(Q).DVAL,RDBK=$(Q).DRBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=SM3,POS=$(Q).DVAL,RDBK=$(Q).DRBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=SM4,POS=$(Q).DVAL,RDBK=$(Q).DRBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=SM5,POS=$(Q).DVAL,RDBK=$(Q).DRBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=SM6,POS=$(Q).DVAL,RDBK=$(Q).DRBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=SM7,POS=$(Q).DVAL,RDBK=$(Q).DRBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=SM8,POS=$(Q).DVAL,RDBK=$(Q).DRBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=SM9,POS=$(Q).DVAL,RDBK=$(Q).DRBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=SM10,POS=$(Q).DVAL,RDBK=$(Q).DRBV}
+{P=xxx:,SCANREC=xxx:scan1,Q=SM1,POS="$(Q).DVAL",RDBK="$(Q).DRBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=SM2,POS="$(Q).DVAL",RDBK="$(Q).DRBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=SM3,POS="$(Q).DVAL",RDBK="$(Q).DRBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=SM4,POS="$(Q).DVAL",RDBK="$(Q).DRBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=SM5,POS="$(Q).DVAL",RDBK="$(Q).DRBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=SM6,POS="$(Q).DVAL",RDBK="$(Q).DRBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=SM7,POS="$(Q).DVAL",RDBK="$(Q).DRBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=SM8,POS="$(Q).DVAL",RDBK="$(Q).DRBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=SM9,POS="$(Q).DVAL",RDBK="$(Q).DRBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=SM10,POS="$(Q).DVAL",RDBK="$(Q).DRBV"}
{P=xxx:,SCANREC=xxx:scan1,Q=Table1X,POS=table1.X,RDBK=table1.XRB}
{P=xxx:,SCANREC=xxx:scan1,Q=Table1Y,POS=table1.Y,RDBK=table1.YRB}
@@ -47,13 +47,13 @@ file "$(SSCAN)/sscanApp/Db/scanParms.db"
{P=xxx:,SCANREC=xxx:scan1,Q=Slit1Vcenter,POS=Slit1Vcenter.VAL,RDBK=Slit1Vt2.D}
# new soft-motor-based slit
-#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Hxn,POS=$(Q).VAL,RDBK=$(Q).RBV}
-#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Hxp,POS=$(Q).VAL,RDBK=$(Q).RBV}
-#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Hsize,POS=$(Q).VAL,RDBK=$(Q).RBV}
-#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Hcenter,POS=$(Q).VAL,RDBK=$(Q).RBV}
-#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Vxn,POS=$(Q).VAL,RDBK=$(Q).RBV}
-#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Vxp,POS=$(Q).VAL,RDBK=$(Q).RBV}
-#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Vsize,POS=$(Q).VAL,RDBK=$(Q).RBV}
-#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Vcenter,POS=$(Q).VAL,RDBK=$(Q).RBV}
+#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Hxn,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Hxp,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Hsize,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Hcenter,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Vxn,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Vxp,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Vsize,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Vcenter,POS="$(Q).VAL",RDBK="$(Q).RBV"}
}
diff --git a/iocBoot/iocvxWorks/basic_motor.substitutions b/iocBoot/iocvxWorks/basic_motor.substitutions
index e818580..963c410 100644
--- a/iocBoot/iocvxWorks/basic_motor.substitutions
+++ b/iocBoot/iocvxWorks/basic_motor.substitutions
@@ -2,12 +2,12 @@ file "$(MOTOR)/db/basic_motor.db"
{
pattern
{P, N, M, DTYP, C, S, DESC, EGU, DIR, VELO, VBAS, ACCL, BDST, BVEL, BACC, MRES, PREC, DHLM, DLLM, INIT}
-{xxx:, 1, m$(N), "OMS VME58", 0, 0, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
-{xxx:, 2, m$(N), "OMS VME58", 0, 1, "motor $(N)", degrees Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
-{xxx:, 3, m$(N), "OMS VME58", 0, 2, "motor $(N)", degrees Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
-{xxx:, 4, m$(N), "OMS VME58", 0, 3, "motor $(N)", degrees Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
-{xxx:, 5, m$(N), "OMS VME58", 0, 4, "motor $(N)", degrees Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
-{xxx:, 6, m$(N), "OMS VME58", 0, 5, "motor $(N)", degrees Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
-{xxx:, 7, m$(N), "OMS VME58", 0, 6, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
-{xxx:, 8, m$(N), "OMS VME58", 0, 7, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
+{xxx:, 1, "m$(N)", "OMS VME58", 0, 0, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
+{xxx:, 2, "m$(N)", "OMS VME58", 0, 1, "motor $(N)", degrees Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
+{xxx:, 3, "m$(N)", "OMS VME58", 0, 2, "motor $(N)", degrees Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
+{xxx:, 4, "m$(N)", "OMS VME58", 0, 3, "motor $(N)", degrees Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
+{xxx:, 5, "m$(N)", "OMS VME58", 0, 4, "motor $(N)", degrees Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
+{xxx:, 6, "m$(N)", "OMS VME58", 0, 5, "motor $(N)", degrees Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
+{xxx:, 7, "m$(N)", "OMS VME58", 0, 6, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
+{xxx:, 8, "m$(N)", "OMS VME58", 0, 7, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
}
diff --git a/iocBoot/iocvxWorks/motor.substitutions b/iocBoot/iocvxWorks/motor.substitutions
index a1c4a2a..8493e0a 100644
--- a/iocBoot/iocvxWorks/motor.substitutions
+++ b/iocBoot/iocvxWorks/motor.substitutions
@@ -2,20 +2,20 @@ file "$(MOTOR)/db/motor.db"
{
pattern
{P, N, M, DTYP, C, S, DESC, EGU, DIR, VELO, VBAS, ACCL, BDST, BVEL, BACC, MRES, PREC, DHLM, DLLM, INIT}
-{xxx:, 1, m$(N), "OMS VME8/44", 0, 0, "M0X", mm, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
-{xxx:, 2, m$(N), "OMS VME8/44", 0, 1, "M0Y", mm, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
-{xxx:, 3, m$(N), "OMS VME8/44", 0, 2, "M1Y", mm, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
-{xxx:, 4, m$(N), "OMS VME8/44", 0, 3, "M2X", mm, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
-{xxx:, 5, m$(N), "OMS VME8/44", 0, 4, "M2Y", mm, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
-{xxx:, 6, m$(N), "OMS VME8/44", 0, 5, "M2Z", mm, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
-{xxx:, 7, m$(N), "OMS VME8/44", 0, 6, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
-{xxx:, 8, m$(N), "OMS VME8/44", 0, 7, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
-{xxx:, 9, m$(N), "OMS VME58", 0, 0, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
-{xxx:, 10, m$(N), "OMS VME58", 0, 1, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
-{xxx:, 11, m$(N), "OMS VME58", 0, 2, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
-{xxx:, 12, m$(N), "OMS VME58", 0, 3, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
-{xxx:, 13, m$(N), "OMS VME58", 0, 4, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
-{xxx:, 14, m$(N), "OMS VME58", 0, 5, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
-{xxx:, 15, m$(N), "OMS VME58", 0, 6, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
-{xxx:, 16, m$(N), "OMS VME58", 0, 7, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
+{xxx:, 1, "m$(N)", "OMS VME8/44", 0, 0, "M0X", mm, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
+{xxx:, 2, "m$(N)", "OMS VME8/44", 0, 1, "M0Y", mm, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
+{xxx:, 3, "m$(N)", "OMS VME8/44", 0, 2, "M1Y", mm, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
+{xxx:, 4, "m$(N)", "OMS VME8/44", 0, 3, "M2X", mm, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
+{xxx:, 5, "m$(N)", "OMS VME8/44", 0, 4, "M2Y", mm, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
+{xxx:, 6, "m$(N)", "OMS VME8/44", 0, 5, "M2Z", mm, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
+{xxx:, 7, "m$(N)", "OMS VME8/44", 0, 6, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
+{xxx:, 8, "m$(N)", "OMS VME8/44", 0, 7, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
+{xxx:, 9, "m$(N)", "OMS VME58", 0, 0, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
+{xxx:, 10, "m$(N)", "OMS VME58", 0, 1, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
+{xxx:, 11, "m$(N)", "OMS VME58", 0, 2, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
+{xxx:, 12, "m$(N)", "OMS VME58", 0, 3, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
+{xxx:, 13, "m$(N)", "OMS VME58", 0, 4, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
+{xxx:, 14, "m$(N)", "OMS VME58", 0, 5, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
+{xxx:, 15, "m$(N)", "OMS VME58", 0, 6, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
+{xxx:, 16, "m$(N)", "OMS VME58", 0, 7, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 2.5e-4, 5, 100, -100, ""}
}
diff --git a/iocBoot/iocvxWorks/scanParms.substitutions b/iocBoot/iocvxWorks/scanParms.substitutions
index b253b1c..8db1cc2 100644
--- a/iocBoot/iocvxWorks/scanParms.substitutions
+++ b/iocBoot/iocvxWorks/scanParms.substitutions
@@ -1,32 +1,32 @@
file "$(SSCAN)/sscanApp/Db/scanParms.db"
{
-{P=xxx:,SCANREC=xxx:scan1,Q=m1,POS=$(Q).VAL,RDBK=$(Q).RBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=m2,POS=$(Q).VAL,RDBK=$(Q).RBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=m3,POS=$(Q).VAL,RDBK=$(Q).RBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=m4,POS=$(Q).VAL,RDBK=$(Q).RBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=m5,POS=$(Q).VAL,RDBK=$(Q).RBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=m6,POS=$(Q).VAL,RDBK=$(Q).RBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=m7,POS=$(Q).VAL,RDBK=$(Q).RBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=m8,POS=$(Q).VAL,RDBK=$(Q).RBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=m9,POS=$(Q).VAL,RDBK=$(Q).RBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=m10,POS=$(Q).VAL,RDBK=$(Q).RBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=m11,POS=$(Q).VAL,RDBK=$(Q).RBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=m12,POS=$(Q).VAL,RDBK=$(Q).RBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=m13,POS=$(Q).VAL,RDBK=$(Q).RBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=m14,POS=$(Q).VAL,RDBK=$(Q).RBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=m15,POS=$(Q).VAL,RDBK=$(Q).RBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=m16,POS=$(Q).VAL,RDBK=$(Q).RBV}
+{P=xxx:,SCANREC=xxx:scan1,Q=m1,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=m2,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=m3,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=m4,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=m5,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=m6,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=m7,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=m8,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=m9,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=m10,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=m11,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=m12,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=m13,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=m14,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=m15,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=m16,POS="$(Q).VAL",RDBK="$(Q).RBV"}
-{P=xxx:,SCANREC=xxx:scan1,Q=SM1,POS=$(Q).DVAL,RDBK=$(Q).DRBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=SM2,POS=$(Q).DVAL,RDBK=$(Q).DRBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=SM3,POS=$(Q).DVAL,RDBK=$(Q).DRBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=SM4,POS=$(Q).DVAL,RDBK=$(Q).DRBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=SM5,POS=$(Q).DVAL,RDBK=$(Q).DRBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=SM6,POS=$(Q).DVAL,RDBK=$(Q).DRBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=SM7,POS=$(Q).DVAL,RDBK=$(Q).DRBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=SM8,POS=$(Q).DVAL,RDBK=$(Q).DRBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=SM9,POS=$(Q).DVAL,RDBK=$(Q).DRBV}
-{P=xxx:,SCANREC=xxx:scan1,Q=SM10,POS=$(Q).DVAL,RDBK=$(Q).DRBV}
+{P=xxx:,SCANREC=xxx:scan1,Q=SM1,POS="$(Q).DVAL",RDBK="$(Q).DRBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=SM2,POS="$(Q).DVAL",RDBK="$(Q).DRBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=SM3,POS="$(Q).DVAL",RDBK="$(Q).DRBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=SM4,POS="$(Q).DVAL",RDBK="$(Q).DRBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=SM5,POS="$(Q).DVAL",RDBK="$(Q).DRBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=SM6,POS="$(Q).DVAL",RDBK="$(Q).DRBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=SM7,POS="$(Q).DVAL",RDBK="$(Q).DRBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=SM8,POS="$(Q).DVAL",RDBK="$(Q).DRBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=SM9,POS="$(Q).DVAL",RDBK="$(Q).DRBV"}
+{P=xxx:,SCANREC=xxx:scan1,Q=SM10,POS="$(Q).DVAL",RDBK="$(Q).DRBV"}
{P=xxx:,SCANREC=xxx:scan1,Q=Table1X,POS=table1.X,RDBK=table1.XRB}
{P=xxx:,SCANREC=xxx:scan1,Q=Table1Y,POS=table1.Y,RDBK=table1.YRB}
@@ -77,14 +77,14 @@ file "$(SSCAN)/sscanApp/Db/scanParms.db"
# new soft-motor-based slit
-#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Hxn,POS=$(Q).VAL,RDBK=$(Q).RBV}
-#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Hxp,POS=$(Q).VAL,RDBK=$(Q).RBV}
-#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Hsize,POS=$(Q).VAL,RDBK=$(Q).RBV}
-#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Hcenter,POS=$(Q).VAL,RDBK=$(Q).RBV}
-#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Vxn,POS=$(Q).VAL,RDBK=$(Q).RBV}
-#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Vxp,POS=$(Q).VAL,RDBK=$(Q).RBV}
-#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Vsize,POS=$(Q).VAL,RDBK=$(Q).RBV}
-#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Vcenter,POS=$(Q).VAL,RDBK=$(Q).RBV}
+#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Hxn,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Hxp,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Hsize,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Hcenter,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Vxn,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Vxp,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Vsize,POS="$(Q).VAL",RDBK="$(Q).RBV"}
+#{P=xxx:,SCANREC=xxx:scan1,Q=Slit2Vcenter,POS="$(Q).VAL",RDBK="$(Q).RBV"}
}
diff --git a/iocBoot/iocvxWorks/st.cmd b/iocBoot/iocvxWorks/st.cmd
index bb801c9..f76a5d0 100644
--- a/iocBoot/iocvxWorks/st.cmd
+++ b/iocBoot/iocvxWorks/st.cmd
@@ -248,14 +248,18 @@ seq &Io, "P=xxx:Io:,MONO=xxx:BraggEAO,VSC=xxx:scaler1"
### Start up the autosave task and tell it what to do.
# The task is actually named "save_restore".
+
+create_monitor_set("dummy.req",0,"")
+
+
# Note that you can reload these sets after creating them: e.g.,
# reload_monitor_set("auto_settings.req",30,"P=xxx:")
#save_restoreDebug=20
#
# save positions every five seconds
-create_monitor_set("auto_positions.req",5,"P=xxx:")
+#create_monitor_set("auto_positions.req",5,"P=xxx:")
# save other things every thirty seconds
-create_monitor_set("auto_settings.req",30,"P=xxx:")
+#create_monitor_set("auto_settings.req",30,"P=xxx:")
### Start the saveData task. If you start this task, scan records mentioned
# in saveData.req will *always* write data files. There is no programmable
--
GitLab