From 768c26aa93c7667034a59558f6d64ea011b54f72 Mon Sep 17 00:00:00 2001 From: Ron Sluiter Date: Thu, 23 Feb 2006 20:13:26 +0000 Subject: [PATCH] User "IOC" for ioc name. --- iocBoot/iocNoAsyn/motor.substitutions | 20 ++++++++++---------- iocBoot/iocNoAsyn/st.cmd.Vx | 4 ++-- iocBoot/iocNoMPF/motor.substitutions | 20 ++++++++++---------- iocBoot/iocNoMPF/st.cmd.Vx | 4 ++-- iocBoot/iocWithAsyn/motor.substitutions | 8 ++++---- iocBoot/iocWithAsyn/st.cmd.Vx | 2 +- iocBoot/iocWithAsyn/st.cmd.unix | 2 +- iocBoot/iocWithAsyn/st.cmd.win32 | 2 +- iocBoot/iocWithMPF/motor.substitutions | 8 ++++---- iocBoot/iocWithMPF/st.cmd.Vx | 2 +- iocBoot/iocWithMPF/st.cmd.unix | 2 +- iocBoot/iocWithMPF/st.cmd.win32 | 2 +- 12 files changed, 38 insertions(+), 38 deletions(-) diff --git a/iocBoot/iocNoAsyn/motor.substitutions b/iocBoot/iocNoAsyn/motor.substitutions index 70a541b8..a2bf64a2 100644 --- a/iocBoot/iocNoAsyn/motor.substitutions +++ b/iocBoot/iocNoAsyn/motor.substitutions @@ -1,14 +1,14 @@ 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} -{rls:, 1, m$(N), "PMAC", 0, 0, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} -{rls:, 2, m$(N), "PMAC", 0, 1, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} -{rls:, 3, m$(N), "PMAC", 0, 2, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} -{rls:, 4, m$(N), "PMAC", 0, 3, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} -{rls:, 5, m$(N), "PMAC", 0, 4, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} -{rls:, 6, m$(N), "PMAC", 0, 5, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} -{rls:, 7, m$(N), "PMAC", 0, 6, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} -{rls:, 8, m$(N), "PMAC", 0, 7, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} -{rls:, 9, m$(N), "PMAC", 0, 8, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} +{P, N, M, DTYP, C, S, DESC, EGU, DIR, VELO, VBAS, ACCL, BDST, BVEL, BACC, MRES, PREC, DHLM, DLLM, INIT} +{IOC:, 1, m$(N), "PMAC", 0, 0, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} +{IOC:, 2, m$(N), "PMAC", 0, 1, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} +{IOC:, 3, m$(N), "PMAC", 0, 2, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} +{IOC:, 4, m$(N), "PMAC", 0, 3, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} +{IOC:, 5, m$(N), "PMAC", 0, 4, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} +{IOC:, 6, m$(N), "PMAC", 0, 5, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} +{IOC:, 7, m$(N), "PMAC", 0, 6, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} +{IOC:, 8, m$(N), "PMAC", 0, 7, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} +{IOC:, 9, m$(N), "PMAC", 0, 8, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} } diff --git a/iocBoot/iocNoAsyn/st.cmd.Vx b/iocBoot/iocNoAsyn/st.cmd.Vx index 86412f91..ad0b06ef 100644 --- a/iocBoot/iocNoAsyn/st.cmd.Vx +++ b/iocBoot/iocNoAsyn/st.cmd.Vx @@ -23,7 +23,7 @@ dbLoadDatabase("$(TOP)/dbd/NoMPFVx.dbd") NoMPFVx_registerRecordDeviceDriver(pdbbase) dbLoadTemplate("motor.substitutions") -#!dbLoadRecords("$(TOP)/motorApp/Db/SoftMotorEx.db","user=USER,motor=m1", startup) +#!dbLoadRecords("$(TOP)/motorApp/Db/SoftMotorEx.db","user=IOC,motor=m1", startup) # OMS VME driver setup parameters: # (1)cards, (2)base address(short, 16-byte boundary), @@ -77,5 +77,5 @@ dbLoadTemplate("motor.substitutions") iocInit # motorUtil (allstop & alldone) -motorUtilInit("USER:") +motorUtilInit("IOC:") diff --git a/iocBoot/iocNoMPF/motor.substitutions b/iocBoot/iocNoMPF/motor.substitutions index 70a541b8..a2bf64a2 100644 --- a/iocBoot/iocNoMPF/motor.substitutions +++ b/iocBoot/iocNoMPF/motor.substitutions @@ -1,14 +1,14 @@ 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} -{rls:, 1, m$(N), "PMAC", 0, 0, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} -{rls:, 2, m$(N), "PMAC", 0, 1, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} -{rls:, 3, m$(N), "PMAC", 0, 2, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} -{rls:, 4, m$(N), "PMAC", 0, 3, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} -{rls:, 5, m$(N), "PMAC", 0, 4, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} -{rls:, 6, m$(N), "PMAC", 0, 5, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} -{rls:, 7, m$(N), "PMAC", 0, 6, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} -{rls:, 8, m$(N), "PMAC", 0, 7, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} -{rls:, 9, m$(N), "PMAC", 0, 8, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} +{P, N, M, DTYP, C, S, DESC, EGU, DIR, VELO, VBAS, ACCL, BDST, BVEL, BACC, MRES, PREC, DHLM, DLLM, INIT} +{IOC:, 1, m$(N), "PMAC", 0, 0, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} +{IOC:, 2, m$(N), "PMAC", 0, 1, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} +{IOC:, 3, m$(N), "PMAC", 0, 2, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} +{IOC:, 4, m$(N), "PMAC", 0, 3, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} +{IOC:, 5, m$(N), "PMAC", 0, 4, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} +{IOC:, 6, m$(N), "PMAC", 0, 5, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} +{IOC:, 7, m$(N), "PMAC", 0, 6, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} +{IOC:, 8, m$(N), "PMAC", 0, 7, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} +{IOC:, 9, m$(N), "PMAC", 0, 8, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} } diff --git a/iocBoot/iocNoMPF/st.cmd.Vx b/iocBoot/iocNoMPF/st.cmd.Vx index 86412f91..ad0b06ef 100644 --- a/iocBoot/iocNoMPF/st.cmd.Vx +++ b/iocBoot/iocNoMPF/st.cmd.Vx @@ -23,7 +23,7 @@ dbLoadDatabase("$(TOP)/dbd/NoMPFVx.dbd") NoMPFVx_registerRecordDeviceDriver(pdbbase) dbLoadTemplate("motor.substitutions") -#!dbLoadRecords("$(TOP)/motorApp/Db/SoftMotorEx.db","user=USER,motor=m1", startup) +#!dbLoadRecords("$(TOP)/motorApp/Db/SoftMotorEx.db","user=IOC,motor=m1", startup) # OMS VME driver setup parameters: # (1)cards, (2)base address(short, 16-byte boundary), @@ -77,5 +77,5 @@ dbLoadTemplate("motor.substitutions") iocInit # motorUtil (allstop & alldone) -motorUtilInit("USER:") +motorUtilInit("IOC:") diff --git a/iocBoot/iocWithAsyn/motor.substitutions b/iocBoot/iocWithAsyn/motor.substitutions index 9ec503f5..07ca79cb 100644 --- a/iocBoot/iocWithAsyn/motor.substitutions +++ b/iocBoot/iocWithAsyn/motor.substitutions @@ -2,8 +2,8 @@ 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} -{rls:, 1, m$(N), "MM4000", 0, 0, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} -{rls:, 2, m$(N), "MM4000", 0, 1, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} -{rls:, 3, m$(N), "MM4000", 0, 2, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} -{rls:, 4, m$(N), "MM4000", 0, 3, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} +{IOC:, 1, m$(N), "MM4000", 0, 0, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} +{IOC:, 2, m$(N), "MM4000", 0, 1, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} +{IOC:, 3, m$(N), "MM4000", 0, 2, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} +{IOC:, 4, m$(N), "MM4000", 0, 3, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} } diff --git a/iocBoot/iocWithAsyn/st.cmd.Vx b/iocBoot/iocWithAsyn/st.cmd.Vx index 602a4d00..041f3067 100644 --- a/iocBoot/iocWithAsyn/st.cmd.Vx +++ b/iocBoot/iocWithAsyn/st.cmd.Vx @@ -205,5 +205,5 @@ dbLoadTemplate("motor.substitutions") iocInit # motorUtil (allstop & alldone) -motorUtilInit("USER:") +motorUtilInit("IOC:") diff --git a/iocBoot/iocWithAsyn/st.cmd.unix b/iocBoot/iocWithAsyn/st.cmd.unix index 8bbdb216..2177febe 100644 --- a/iocBoot/iocWithAsyn/st.cmd.unix +++ b/iocBoot/iocWithAsyn/st.cmd.unix @@ -148,5 +148,5 @@ MM4000Config(0, "L0") iocInit # motorUtil (allstop & alldone) -motorUtilInit("USER:") +motorUtilInit("IOC:") diff --git a/iocBoot/iocWithAsyn/st.cmd.win32 b/iocBoot/iocWithAsyn/st.cmd.win32 index 64eda61a..48367b6b 100755 --- a/iocBoot/iocWithAsyn/st.cmd.win32 +++ b/iocBoot/iocWithAsyn/st.cmd.win32 @@ -136,5 +136,5 @@ MM4000Config(0, "L0") iocInit # motorUtil (allstop & alldone) -motorUtilInit("USER:") +motorUtilInit("IOC:") diff --git a/iocBoot/iocWithMPF/motor.substitutions b/iocBoot/iocWithMPF/motor.substitutions index 9ec503f5..07ca79cb 100644 --- a/iocBoot/iocWithMPF/motor.substitutions +++ b/iocBoot/iocWithMPF/motor.substitutions @@ -2,8 +2,8 @@ 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} -{rls:, 1, m$(N), "MM4000", 0, 0, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} -{rls:, 2, m$(N), "MM4000", 0, 1, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} -{rls:, 3, m$(N), "MM4000", 0, 2, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} -{rls:, 4, m$(N), "MM4000", 0, 3, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} +{IOC:, 1, m$(N), "MM4000", 0, 0, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} +{IOC:, 2, m$(N), "MM4000", 0, 1, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} +{IOC:, 3, m$(N), "MM4000", 0, 2, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} +{IOC:, 4, m$(N), "MM4000", 0, 3, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} } diff --git a/iocBoot/iocWithMPF/st.cmd.Vx b/iocBoot/iocWithMPF/st.cmd.Vx index 602a4d00..041f3067 100644 --- a/iocBoot/iocWithMPF/st.cmd.Vx +++ b/iocBoot/iocWithMPF/st.cmd.Vx @@ -205,5 +205,5 @@ dbLoadTemplate("motor.substitutions") iocInit # motorUtil (allstop & alldone) -motorUtilInit("USER:") +motorUtilInit("IOC:") diff --git a/iocBoot/iocWithMPF/st.cmd.unix b/iocBoot/iocWithMPF/st.cmd.unix index 8bbdb216..2177febe 100644 --- a/iocBoot/iocWithMPF/st.cmd.unix +++ b/iocBoot/iocWithMPF/st.cmd.unix @@ -148,5 +148,5 @@ MM4000Config(0, "L0") iocInit # motorUtil (allstop & alldone) -motorUtilInit("USER:") +motorUtilInit("IOC:") diff --git a/iocBoot/iocWithMPF/st.cmd.win32 b/iocBoot/iocWithMPF/st.cmd.win32 index 64eda61a..48367b6b 100755 --- a/iocBoot/iocWithMPF/st.cmd.win32 +++ b/iocBoot/iocWithMPF/st.cmd.win32 @@ -136,5 +136,5 @@ MM4000Config(0, "L0") iocInit # motorUtil (allstop & alldone) -motorUtilInit("USER:") +motorUtilInit("IOC:")