From 2a42f7ac5cd5d9ab32d9f222eee954b4cb656a25 Mon Sep 17 00:00:00 2001
From: Tom Willemsen <tom.willemsen@stfc.ac.uk>
Date: Fri, 1 May 2026 15:10:29 +0100
Subject: [PATCH 1/3] Fix Nanodac PV DB generation

---
 NANODAC/NANODAC-IOC-01App/Db/nanodac.substitutions | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/NANODAC/NANODAC-IOC-01App/Db/nanodac.substitutions b/NANODAC/NANODAC-IOC-01App/Db/nanodac.substitutions
index 54957ab86..b16be62cf 100644
--- a/NANODAC/NANODAC-IOC-01App/Db/nanodac.substitutions
+++ b/NANODAC/NANODAC-IOC-01App/Db/nanodac.substitutions
@@ -1,8 +1,8 @@
 
-file nanodac.db
+file $(NANODAC)/db/nanodac.db
 {
 pattern {S, ND, NI}
-	{$(P),  "", 1}
+	{\$(P),  "", 1}
 }
 
 

From 761aa848ec566443719404f7b012f690201928eb Mon Sep 17 00:00:00 2001
From: Tom Willemsen <tom.willemsen@stfc.ac.uk>
Date: Fri, 1 May 2026 17:00:01 +0100
Subject: [PATCH 2/3] DB depends on busy record

---
 NANODAC/NANODAC-IOC-01App/src/build.mak | 2 ++
 1 file changed, 2 insertions(+)

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

From 42e95e3bfcbc3e8197d1d77cdf04674b49fa4405 Mon Sep 17 00:00:00 2001
From: Tom Willemsen <tom.willemsen@stfc.ac.uk>
Date: Sat, 2 May 2026 08:48:26 +0100
Subject: [PATCH 3/3] Load DB from support module directly

---
 NANODAC/NANODAC-IOC-01App/Db/Makefile              |  9 ---------
 NANODAC/NANODAC-IOC-01App/Db/nanodac.substitutions | 10 ----------
 NANODAC/iocBoot/iocNANODAC-IOC-01/st.cmd           |  2 +-
 3 files changed, 1 insertion(+), 20 deletions(-)
 delete mode 100644 NANODAC/NANODAC-IOC-01App/Db/nanodac.substitutions

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 <anyname>.db template is not named <anyname>*.template add
-# <anyname>_TEMPLATE = <templatename>
-
 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 b16be62cf..000000000
--- a/NANODAC/NANODAC-IOC-01App/Db/nanodac.substitutions
+++ /dev/null
@@ -1,10 +0,0 @@
-
-file $(NANODAC)/db/nanodac.db
-{
-pattern {S, ND, NI}
-	{\$(P),  "", 1}
-}
-
-
-
-
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