diff --git a/iocBoot/iocxxx/common/filter.substitutions b/iocBoot/iocxxx/common/filter.substitutions index a3f1c6ce192ba33592858ae891c0897cbff49ee4..e217e7b6e1d3673e5ca5f02a45afa5219cc3da78 100644 --- a/iocBoot/iocxxx/common/filter.substitutions +++ b/iocBoot/iocxxx/common/filter.substitutions @@ -2,25 +2,25 @@ file "$(OPTICS)/opticsApp/Db/filterBladeNoSensor.db" { pattern - {P, R, N, DESC, OUT OUT_STRING, IN_STRING} - {xxx:, filter:, 1, "Filter 1", "xxx:userTran1.A", "Out", "In"} - {xxx:, filter:, 2, "Filter 2", "xxx:userTran1.B", "Out", "In"} - {xxx:, filter:, 3, "Filter 3", "xxx:userTran1.C", "Out", "In"} - {xxx:, filter:, 4, "Filter 4", "xxx:userTran1.D", "Out", "In"} - {xxx:, filter:, 5, "Filter 5", "xxx:userTran1.E", "Out", "In"} - {xxx:, filter:, 6, "Filter 6", "xxx:userTran1.F", "Out", "In"} - {xxx:, filter:, 7, "Filter 7", "xxx:userTran1.G", "Out", "In"} - {xxx:, filter:, 8, "Filter 8", "xxx:userTran1.H", "Out", "In"} - {xxx:, filter:, 9, "Filter 9", "xxx:userTran1.I", "Out", "In"} - {xxx:, filter:, 10, "Filter 10", "xxx:userTran1.J", "Out", "In"} - {xxx:, filter:, 11, "Filter 11", "xxx:userTran1.K", "Out", "In"} - {xxx:, filter:, 12, "Filter 12", "xxx:userTran1.L", "Out", "In"} - {xxx:, filter:, 13, "Filter 13", "xxx:userTran1.M", "Out", "In"} - {xxx:, filter:, 14, "Filter 14", "xxx:userTran1.N", "Out", "In"} - {xxx:, filter:, 15, "Filter 15", "xxx:userTran1.O", "Out", "In"} - {xxx:, filter:, 16, "Filter 16", "xxx:userTran1.P", "Out", "In"} + {N, DESC, OUT OUT_STRING, IN_STRING} + {1, "Filter $(N)", "xxx:userTran1.A", "Out", "In"} + {2, "Filter $(N)", "xxx:userTran1.B", "Out", "In"} + {3, "Filter $(N)", "xxx:userTran1.C", "Out", "In"} + {4, "Filter $(N)", "xxx:userTran1.D", "Out", "In"} + {5, "Filter $(N)", "xxx:userTran1.E", "Out", "In"} + {6, "Filter $(N)", "xxx:userTran1.F", "Out", "In"} + {7, "Filter $(N)", "xxx:userTran1.G", "Out", "In"} + {8, "Filter $(N)", "xxx:userTran1.H", "Out", "In"} + {9, "Filter $(N)", "xxx:userTran1.I", "Out", "In"} + {10, "Filter $(N)", "xxx:userTran1.J", "Out", "In"} + {11, "Filter $(N)", "xxx:userTran1.K", "Out", "In"} + {12, "Filter $(N)", "xxx:userTran1.L", "Out", "In"} + {13, "Filter $(N)", "xxx:userTran1.M", "Out", "In"} + {14, "Filter $(N)", "xxx:userTran1.N", "Out", "In"} + {15, "Filter $(N)", "xxx:userTran1.O", "Out", "In"} + {16, "Filter $(N)", "xxx:userTran1.P", "Out", "In"} } file "$(OPTICS)/opticsApp/Db/filterDrive.db" { - {P="xxx:", R="filter:", DESC="Filters", KEV="xxx:userCalc1.A"} + {DESC="Filters", KEV="xxx:userCalc1.A"} } diff --git a/iocBoot/iocxxx/common/optics.iocsh b/iocBoot/iocxxx/common/optics.iocsh index b6fb16da33fa9afb57d281ce190e346f08814018..208c949bd396374661489a98ef83289b8bdaede6 100644 --- a/iocBoot/iocxxx/common/optics.iocsh +++ b/iocBoot/iocxxx/common/optics.iocsh @@ -56,5 +56,5 @@ dbLoadRecords("$(DIR)/table.db","P=$(PREFIX),Q=Table1,T=table1,M0X=m1,M0Y=m2,M1Y #iocshLoad("OPTICS)/iocsh/pf4filters.iocsh", "PREFIX=$(PREFIX), INSTANCE=pf4") ### Load database records for alternative PF4-filter support -#dbLoadTemplate("common/filter.substitutions", "P=$(PREFIX)") +#dbLoadTemplate("common/filter.substitutions", "P=$(PREFIX), R=filter:") #doAfterIocInit("seq filterDrive,'NAME=filterDrive,P=$(PREFIX),R=filter:,NUM_FILTERS=16'")