From 6071e7efd6d9292410aa6f7b0e5e4953f558e257 Mon Sep 17 00:00:00 2001 From: Ron Sluiter Date: Wed, 6 Oct 2004 20:30:34 +0000 Subject: [PATCH] Removed /motorExApp/Db. --- motorExApp/Db/Makefile | 32 ----------- motorExApp/Db/NoMPF.substitutions | 13 ----- motorExApp/Db/NoMPF_MX.substitutions | 6 -- motorExApp/Db/SoftMotorEx.db | 84 ---------------------------- motorExApp/Db/WithMPF.substitutions | 9 --- motorExApp/Makefile | 1 - 6 files changed, 145 deletions(-) delete mode 100644 motorExApp/Db/Makefile delete mode 100644 motorExApp/Db/NoMPF.substitutions delete mode 100644 motorExApp/Db/NoMPF_MX.substitutions delete mode 100644 motorExApp/Db/SoftMotorEx.db delete mode 100644 motorExApp/Db/WithMPF.substitutions diff --git a/motorExApp/Db/Makefile b/motorExApp/Db/Makefile deleted file mode 100644 index 3bcbc98a..00000000 --- a/motorExApp/Db/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# Makefile -TOP = ../.. -include $(TOP)/configure/CONFIG -#---------------------------------------- -# ADD MACRO DEFINITIONS AFTER THIS LINE -#============================= - -DB += NoMPF.db -DB += NoMPF_MX.db -DB += WithMPF.db - -#=========================== -include $(TOP)/configure/RULES -#---------------------------------------- -# ADD RULES AFTER THIS LINE - - -# !!WARNING!! Delete the following line after coping -# this file to your application. -MOTOR = $(TOP) - -#Cancel implicit rule. -$(COMMON_DIR)/%.db$(RAW): %.substitutions %.template - -#Replace rule with rule without %.template dependency. -$(COMMON_DIR)/%.db$(RAW): %.substitutions - @$(RM) $@$(DEP) - @$(DBDDEPENDS_CMD) - @echo "Inflating database from $<" - @$(RM) $@ - $(MSI) -V -I $(MOTOR)/db -S $^ > $@ - diff --git a/motorExApp/Db/NoMPF.substitutions b/motorExApp/Db/NoMPF.substitutions deleted file mode 100644 index 5a49ae6d..00000000 --- a/motorExApp/Db/NoMPF.substitutions +++ /dev/null @@ -1,13 +0,0 @@ -file 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), "OMS VME58", 0, 0, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} -{rls:, 2, m$(N), "OMS VME58", 0, 1, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} -{rls:, 3, m$(N), "OMS VME58", 0, 2, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} -{rls:, 4, m$(N), "OMS VME58", 0, 3, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} -{rls:, 5, m$(N), "OMS VME58", 0, 4, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} -{rls:, 6, m$(N), "OMS VME58", 0, 5, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} -{rls:, 7, m$(N), "OMS VME58", 0, 6, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} -{rls:, 8, m$(N), "OMS VME58", 0, 7, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} -} diff --git a/motorExApp/Db/NoMPF_MX.substitutions b/motorExApp/Db/NoMPF_MX.substitutions deleted file mode 100644 index a946419a..00000000 --- a/motorExApp/Db/NoMPF_MX.substitutions +++ /dev/null @@ -1,6 +0,0 @@ -file 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), "MXmotor", 0, 0, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} -} diff --git a/motorExApp/Db/SoftMotorEx.db b/motorExApp/Db/SoftMotorEx.db deleted file mode 100644 index 9c56e30e..00000000 --- a/motorExApp/Db/SoftMotorEx.db +++ /dev/null @@ -1,84 +0,0 @@ -#! Generated by VisualDCT for Java v2.1 -record(calc,"$(user):height") { - field(CALC,"1000") -} - -record(calcout,"$(user):convertDriverValue") { - field(DESC,"Convert rotary to linear") - field(CALC,"TAN(A / 57.296) * B") - field(INPB,"$(user):height.VAL PP MS") - field(OUT,"$(user):linear.DVAL PP MS") - field(PREC,"3") -} - -record(calcout,"$(user):convertReadbackValue") { - field(DESC,"Convert linear to rotary") - field(CALC,"ATAN(A / B) * 57.296") - field(INPA,"$(user):linear.DRBV CP MS") - field(INPB,"$(user):height.VAL PP MS") - field(PREC,"3") -} - -record(motor,"$(user):linear") { - field(DTYP,"OMS VME58") - field(VELO,"25.0") - field(VBAS,"1.0") - field(OUT,"#C0 S0 @") - field(MRES,"0.001") - field(PREC,"3") - field(EGU,"mm.") - field(DHLM,"1000") - field(DLLM,"-1000") - field(RTRY,"0") - field(TWV,"1") - field(DMOV,"") -} - -record(motor,"$(user):rotary") { - field(DTYP,"Soft Channel") - field(OUT,"$(user):convertDriverValue.A PP MS") - field(RDBL,"$(user):convertReadbackValue.VAL NPP MS") - field(MRES,"0.001") - field(RRES,"1.0") - field(URIP,"Yes") - field(PREC,"3") - field(EGU,"deg.") - field(DHLM,"45") - field(DLLM,"-45") - field(RTRY,"0") - field(TWV,"5") - field(STOO,"$(user):linear.STOP PP MS") - field(DINP,"$(user):linear.DMOV") -} - -#! Further lines contain layout data used by VisualDCT - -#! Group("$(user)",1120,1860,0,"") -#! Record("$(user):height",420,180,0,0,"$(user):height") -#! Field("$(user):height.VAL",0,1,"$(user):height.VAL") -#! Record("$(user):convertDriverValue",740,180,0,0,"$(user):convertDriverValue") -#! Field("$(user):convertDriverValue.INPB",0,0,"$(user):convertDriverValue.INPB") -#! Link("$(user):convertDriverValue.INPB","$(user):height.VAL") -#! Field("$(user):convertDriverValue.OUT",0,1,"$(user):convertDriverValue.OUT") -#! Link("$(user):convertDriverValue.OUT","$(user):linear.DVAL") -#! Field("$(user):convertDriverValue.A",0,0,"$(user):convertDriverValue.A") -#! Record("$(user):convertReadbackValue",740,680,0,0,"$(user):convertReadbackValue") -#! Field("$(user):convertReadbackValue.INPA",0,1,"$(user):convertReadbackValue.INPA") -#! Link("$(user):convertReadbackValue.INPA","$(user):linear.DRBV") -#! Field("$(user):convertReadbackValue.INPB",0,0,"$(user):convertReadbackValue.INPB") -#! Link("$(user):convertReadbackValue.INPB","$(user):height.VAL") -#! Field("$(user):convertReadbackValue.VAL",0,0,"$(user):convertReadbackValue.VAL") -#! Record("$(user):linear",1040,320,0,0,"$(user):linear") -#! Field("$(user):linear.DRBV",0,0,"$(user):linear.DRBV") -#! Field("$(user):linear.STOP",0,0,"$(user):linear.STOP") -#! Field("$(user):linear.DVAL",0,0,"$(user):linear.DVAL") -#! Field("$(user):linear.DMOV",0,0,"$(user):linear.DMOV") -#! Record("$(user):rotary",420,320,0,0,"$(user):rotary") -#! Field("$(user):rotary.OUT",0,1,"$(user):rotary.OUT") -#! Link("$(user):rotary.OUT","$(user):convertDriverValue.A") -#! Field("$(user):rotary.RDBL",0,1,"$(user):rotary.RDBL") -#! Link("$(user):rotary.RDBL","$(user):convertReadbackValue.VAL") -#! Field("$(user):rotary.STOO",0,1,"$(user):rotary.STOO") -#! Link("$(user):rotary.STOO","$(user):linear.STOP") -#! Field("$(user):rotary.DINP",0,1,"$(user):rotary.DINP") -#! Link("$(user):rotary.DINP","$(user):linear.DMOV") diff --git a/motorExApp/Db/WithMPF.substitutions b/motorExApp/Db/WithMPF.substitutions deleted file mode 100644 index e1cc09eb..00000000 --- a/motorExApp/Db/WithMPF.substitutions +++ /dev/null @@ -1,9 +0,0 @@ -file 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, ""} -} diff --git a/motorExApp/Makefile b/motorExApp/Makefile index e4962b3a..50d0cf85 100644 --- a/motorExApp/Makefile +++ b/motorExApp/Makefile @@ -1,7 +1,6 @@ TOP = .. include $(TOP)/configure/CONFIG -DIRS += Db DIRS += NoMPF ifdef ASYN DIRS += WithMPF