Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions NANODAC/NANODAC-IOC-01App/Db/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 <anyname>.db template is not named <anyname>*.template add
# <anyname>_TEMPLATE = <templatename>

include $(TOP)/configure/RULES
#----------------------------------------
# ADD RULES AFTER THIS LINE
Expand Down
10 changes: 0 additions & 10 deletions NANODAC/NANODAC-IOC-01App/Db/nanodac.substitutions

This file was deleted.

2 changes: 2 additions & 0 deletions NANODAC/NANODAC-IOC-01App/src/build.mak
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion NANODAC/iocBoot/iocNANODAC-IOC-01/st.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down