From 12d25201605889bea959a91552ff4cea55bae4b8 Mon Sep 17 00:00:00 2001 From: Keenan Lang <klang@aps.anl.gov> Date: Fri, 15 Jul 2016 16:15:53 -0500 Subject: [PATCH] Fixed two issues with startup on vxWorks --- iocBoot/iocxxx/common.iocsh | 4 ++-- .../common/filter.substituions} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename iocBoot/{iocLinux/filter.substitutions => iocxxx/common/filter.substituions} (100%) diff --git a/iocBoot/iocxxx/common.iocsh b/iocBoot/iocxxx/common.iocsh index 4e25bdc..eb96d18 100644 --- a/iocBoot/iocxxx/common.iocsh +++ b/iocBoot/iocxxx/common.iocsh @@ -194,7 +194,7 @@ dbLoadRecords("$(STD)/stdApp/Db/pvHistory.db","P=$(PREFIX),N=1,MAXSAMPLES=1440") dbLoadRecords("$(STD)/stdApp/Db/timer.db","P=$(PREFIX),N=1") # Slow feedback -dbLoadTemplate "pid_slow.substitutions" +dbLoadTemplate "common/pid_slow.substitutions" dbLoadTemplate "$(PLATFORM)/async_pid_slow.substitutions" #dbLoadTemplate "common/fb_epid.substitutions" @@ -232,7 +232,7 @@ epicsEnvSet("FBO", "$(PREFIX)Unidig1Bo") #doAfterIocInit("seq pf4,'name=pf2,P=$(PREFIX),H=pf4:,B=B,M=$(PREFIX)userTran10.I,B1=$(PREFIX)userTran10.E,B2=$(PREFIX)userTran10.F,B3=$(PREFIX)userTran10.G,B4=$(PREFIX)userTran10.H'") ### Load database records for alternative PF4-filter support -#dbLoadTemplate "filter.substitutions" +#dbLoadTemplate "common/filter.substitutions" #doAfterIocInit("seq filterDrive,'NAME=filterDrive,P=$(PREFIX),R=filter:,NUM_FILTERS=16'") # trajectory scan diff --git a/iocBoot/iocLinux/filter.substitutions b/iocBoot/iocxxx/common/filter.substituions similarity index 100% rename from iocBoot/iocLinux/filter.substitutions rename to iocBoot/iocxxx/common/filter.substituions -- GitLab