diff --git a/NANODAC/NANODAC-IOC-01App/Db/Makefile b/NANODAC/NANODAC-IOC-01App/Db/Makefile index 048bea0e4..d87e51a75 100644 --- a/NANODAC/NANODAC-IOC-01App/Db/Makefile +++ b/NANODAC/NANODAC-IOC-01App/Db/Makefile @@ -7,15 +7,6 @@ include $(TOP)/configure/CONFIG # Optimization of db files using dbst (DEFAULT: NO) #DB_OPT = YES -#---------------------------------------------------- -# Create and install (or just install) -# databases, templates, substitutions like this -DB += nanodac.db - -#---------------------------------------------------- -# If .db template is not named *.template add -# _TEMPLATE = - include $(TOP)/configure/RULES #---------------------------------------- # ADD RULES AFTER THIS LINE diff --git a/NANODAC/NANODAC-IOC-01App/Db/nanodac.substitutions b/NANODAC/NANODAC-IOC-01App/Db/nanodac.substitutions deleted file mode 100644 index 54957ab86..000000000 --- a/NANODAC/NANODAC-IOC-01App/Db/nanodac.substitutions +++ /dev/null @@ -1,10 +0,0 @@ - -file nanodac.db -{ -pattern {S, ND, NI} - {$(P), "", 1} -} - - - - diff --git a/NANODAC/NANODAC-IOC-01App/src/build.mak b/NANODAC/NANODAC-IOC-01App/src/build.mak index 873456bfa..e969b4f23 100644 --- a/NANODAC/NANODAC-IOC-01App/src/build.mak +++ b/NANODAC/NANODAC-IOC-01App/src/build.mak @@ -31,6 +31,7 @@ $(APPNAME)_DBD += drvAsynSerialPort.dbd $(APPNAME)_DBD += drvAsynIPPort.dbd $(APPNAME)_DBD += modbusSupport.dbd $(APPNAME)_DBD += stream.dbd +$(APPNAME)_DBD += busyRecord.dbd #$(APPNAME)_DBD += xxx.dbd # Add all the support libraries needed by this IOC @@ -47,6 +48,7 @@ $(APPNAME)_LIBS += pcrecpp pcre $(APPNAME)_LIBS += modbus $(APPNAME)_LIBS += asyn calc sscan $(APPNAME)_LIBS += seq pv +$(APPNAME)_LIBS += busy #$(APPNAME)_LIBS += xxx # NANODAC-IOC-01_registerRecordDeviceDriver.cpp derives from NANODAC-IOC-01.dbd diff --git a/NANODAC/iocBoot/iocNANODAC-IOC-01/st.cmd b/NANODAC/iocBoot/iocNANODAC-IOC-01/st.cmd index b5775fb95..dbab31b58 100644 --- a/NANODAC/iocBoot/iocNANODAC-IOC-01/st.cmd +++ b/NANODAC/iocBoot/iocNANODAC-IOC-01/st.cmd @@ -41,7 +41,7 @@ epicsEnvSet("NI","1") #################################################################### ## Load record instances -dbLoadRecords("db/nanodac.db","P=$(MYPVPREFIX)$(IOCNAME):") +dbLoadRecords("$(NANODAC)/db/nanodac.db","S=$(MYPVPREFIX)$(IOCNAME):,ND=$(ND=),NI=$(NI=1)") cd ${TOP}/iocBoot/${IOC} iocInit