From dd82af191963ff616beffa8b7ca920e365510746 Mon Sep 17 00:00:00 2001
From: Jack Harper <jack.harper@stfc.ac.uk>
Date: Wed, 11 Oct 2023 11:13:15 +0100
Subject: [PATCH] make axis num a per controller load, add MTRCTRL record to
 find what MTRCTRL a beckhoff IOC is using retrospectively

---
 beckhoffApp/Db/Makefile                     |  1 +
 beckhoffApp/Db/per_controller.substitutions | 12 ++++++++++++
 beckhoffApp/Db/single_axis_tc.substitutions |  1 -
 beckhoffApp/beckhoff_soft_pv.template       |  3 +++
 4 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 beckhoffApp/Db/per_controller.substitutions
 create mode 100644 beckhoffApp/beckhoff_soft_pv.template

diff --git a/beckhoffApp/Db/Makefile b/beckhoffApp/Db/Makefile
index e5bbc67..86b2895 100644
--- a/beckhoffApp/Db/Makefile
+++ b/beckhoffApp/Db/Makefile
@@ -13,6 +13,7 @@ include $(TOP)/configure/CONFIG
 #DB += xxx.db
 DB += single_axis_tc.db
 DB += desc_tc.db
+DB += per_controller.db
 
 #----------------------------------------------------
 # If <anyname>.db template is not named <anyname>*.template add
diff --git a/beckhoffApp/Db/per_controller.substitutions b/beckhoffApp/Db/per_controller.substitutions
new file mode 100644
index 0000000..574d1c3
--- /dev/null
+++ b/beckhoffApp/Db/per_controller.substitutions
@@ -0,0 +1,12 @@
+
+
+file "$(TOP)/beckhoffApp/beckhoff_read_pv.template" {
+    pattern {P, NAME, PORT, ADSPORT, V, RECTYPE, EPICSDTYP, ADS_TYPE}
+    {"\$(P)", "AXIS_NUM", "\$(PORT)", "\$(ADSPORT)", "GVL_APP.nAXIS_NUM", "longin", "asynInt32", "BOOL"}
+}
+
+file "$(TOP)/beckhoffApp/beckhoff_soft_pv.template" {
+    pattern {P, NAME, VALUE, RECTYPE}
+    {"\$(P)", "MTRCTRL", "\$(MTRCTRL)", "stringin"}
+}
+
diff --git a/beckhoffApp/Db/single_axis_tc.substitutions b/beckhoffApp/Db/single_axis_tc.substitutions
index a6d7450..1c7d6e6 100644
--- a/beckhoffApp/Db/single_axis_tc.substitutions
+++ b/beckhoffApp/Db/single_axis_tc.substitutions
@@ -21,7 +21,6 @@ file "$(TOP)/beckhoffApp/beckhoff_write_pv.template" {
 
 file "$(TOP)/beckhoffApp/beckhoff_read_pv.template" {
     pattern {P, NAME, PORT, ADSPORT, V, RECTYPE, EPICSDTYP, ADS_TYPE}
-    {"\$(P)", "AXIS_NUM", "\$(PORT)", "\$(ADSPORT)", "GVL_APP.nAXIS_NUM", "longin", "asynInt32", "BOOL"}
     {"\$(P)", "ASTAXES_\$(AXIS_NUM):STSTATUS-BENABLED", "\$(PORT)", "\$(ADSPORT)", "GVL.astAxes[\$(AXIS_NUM)].stStatus.bEnabled", longin, "asynInt32", "BOOL"}
     {"\$(P)", "ASTAXES_\$(AXIS_NUM):STSTATUS-BCOMMANDABORTED", "\$(PORT)", "\$(ADSPORT)", "GVL.astAxes[\$(AXIS_NUM)].stStatus.bCommandAborted", longin, "asynInt32", "BOOL"}
     {"\$(P)", "ASTAXES_\$(AXIS_NUM):STSTATUS-BBUSY", "\$(PORT)", "\$(ADSPORT)", "GVL.astAxes[\$(AXIS_NUM)].stStatus.bBusy", longin, "asynInt32", "BOOL"}
diff --git a/beckhoffApp/beckhoff_soft_pv.template b/beckhoffApp/beckhoff_soft_pv.template
new file mode 100644
index 0000000..da9929a
--- /dev/null
+++ b/beckhoffApp/beckhoff_soft_pv.template
@@ -0,0 +1,3 @@
+record($(RECTYPE),"$(P)$(NAME)") {
+    field(VAL, "$(VALUE)")
+}