From 8b038174a5fd799e0d43f686345be9dc493bb82d Mon Sep 17 00:00:00 2001
From: marcofilho <marco.filho@ess.eu>
Date: Tue, 16 Jul 2024 16:23:12 +0200
Subject: [PATCH] Adapt record names to fir naming pattern
Now, for VMM, the pattern is:
$(R)$(H)$(V)$(C)$(CH)
R: Usually "NDet-VMMHYB-00". No colon after.
H: Hybrid number in range 0-5
V: VMM chip number in range 0-1
C: Colon Between device name and property Should be ":" but is a macro in case anyone
decides that shouldn't be there anymore.
CH: Channel/register being set. Can be ST, SL, SC, STH, SM or SMX
Also, to make naming more visible and dynamic, stop using substitutions file.
---
cmds/st.cmd | 37 ++++++++++++++++++++++++++++++----
vmmTblApp/Db/channels.sub | 32 -----------------------------
vmmTblApp/Db/channels.template | 12 +++++------
3 files changed, 39 insertions(+), 42 deletions(-)
delete mode 100644 vmmTblApp/Db/channels.sub
diff --git a/cmds/st.cmd b/cmds/st.cmd
index 0ada86c..77a8cd9 100644
--- a/cmds/st.cmd
+++ b/cmds/st.cmd
@@ -2,7 +2,7 @@ require vmmTbl
epicsEnvSet("IPADDR", "192.168.50.2")
epicsEnvSet("IPPORT", "65535")
-epicsEnvSet("P", "LAB:")
+epicsEnvSet("P", "LAB-B02:")
epicsEnvSet("R", "NDet-RMM-001:")
drvAsynIPPortConfigure("L0", "$(IPADDR):$(IPPORT) UDP", 0, 0, 1)
@@ -11,7 +11,7 @@ drvAsynIPPortConfigure("L0", "$(IPADDR):$(IPPORT) UDP", 0, 0, 1)
#asynSetTraceIOMask( L0, -1, 0x4)
#asynSetTraceInfoMask ( L0, -1, 0x9)
-RMMConfig("RMM", "L0", "/home/iocuser/douglas/fe-vmm-tbl/cmds/config_file/lab_testbed.json", 0)
+RMMConfig("RMM", "L0", "/home/marcofilho/fe-vmm-tbl/cmds/config_file/lab_testbed.json", 0)
#VMMTblConfig("portName", ring, number_hybrids)
VMMTblConfig("RMM", 0, 2)
@@ -27,12 +27,41 @@ dbLoadRecords("$(rmm_DB)/topology.template", "P=$(P), R=$(R), PORT=RMM, RING=0,
dbLoadRecords("$(vmmTbl_DB)/vmm_tbl.db", "P=$(P), R=NDet-VMM-001:, PORT=RMM, RING=0, NODE=0, ADDR=0, TIMEOUT=1")
dbLoadRecords("$(vmmTbl_DB)/hybrid.db", "P=$(P), R=NDet-VMM-001:, PORT=RMM, HYB=0, ADDR=0, TIMEOUT=1")
dbLoadRecords("$(vmmTbl_DB)/hybrid.db", "P=$(P), R=NDet-VMM-001:, PORT=RMM, HYB=1, ADDR=0, TIMEOUT=1")
-dbLoadRecords("channels.db", "P=$(P), R=NDet-VMM-001:, PORT=RMM, ADDR=0, TIMEOUT=1")
+
+dbLoadRecords("$(vmmTbl_DB)/channels.db", "P=$(P), R=NDet-VMMHYB-00, HYB=0, VMM=0, C=:, CH=ST, PORT=RMM, ADDR=0, TIMEOUT=1")
+dbLoadRecords("$(vmmTbl_DB)/channels.db", "P=$(P), R=NDet-VMMHYB-00, HYB=0, VMM=1, C=:, CH=ST, PORT=RMM, ADDR=0, TIMEOUT=1")
+dbLoadRecords("$(vmmTbl_DB)/channels.db", "P=$(P), R=NDet-VMMHYB-00, HYB=1, VMM=0, C=:, CH=ST, PORT=RMM, ADDR=0, TIMEOUT=1")
+dbLoadRecords("$(vmmTbl_DB)/channels.db", "P=$(P), R=NDet-VMMHYB-00, HYB=1, VMM=1, C=:, CH=ST, PORT=RMM, ADDR=0, TIMEOUT=1")
+
+dbLoadRecords("$(vmmTbl_DB)/channels.db", "P=$(P), R=NDet-VMMHYB-00, HYB=0, VMM=0, C=:, CH=SC, PORT=RMM, ADDR=0, TIMEOUT=1")
+dbLoadRecords("$(vmmTbl_DB)/channels.db", "P=$(P), R=NDet-VMMHYB-00, HYB=0, VMM=1, C=:, CH=SC, PORT=RMM, ADDR=0, TIMEOUT=1")
+dbLoadRecords("$(vmmTbl_DB)/channels.db", "P=$(P), R=NDet-VMMHYB-00, HYB=1, VMM=0, C=:, CH=SC, PORT=RMM, ADDR=0, TIMEOUT=1")
+dbLoadRecords("$(vmmTbl_DB)/channels.db", "P=$(P), R=NDet-VMMHYB-00, HYB=1, VMM=1, C=:, CH=SC, PORT=RMM, ADDR=0, TIMEOUT=1")
+
+dbLoadRecords("$(vmmTbl_DB)/channels.db", "P=$(P), R=NDet-VMMHYB-00, HYB=0, VMM=0, C=:, CH=SL, PORT=RMM, ADDR=0, TIMEOUT=1")
+dbLoadRecords("$(vmmTbl_DB)/channels.db", "P=$(P), R=NDet-VMMHYB-00, HYB=0, VMM=1, C=:, CH=SL, PORT=RMM, ADDR=0, TIMEOUT=1")
+dbLoadRecords("$(vmmTbl_DB)/channels.db", "P=$(P), R=NDet-VMMHYB-00, HYB=1, VMM=0, C=:, CH=SL, PORT=RMM, ADDR=0, TIMEOUT=1")
+dbLoadRecords("$(vmmTbl_DB)/channels.db", "P=$(P), R=NDet-VMMHYB-00, HYB=1, VMM=1, C=:, CH=SL, PORT=RMM, ADDR=0, TIMEOUT=1")
+
+dbLoadRecords("$(vmmTbl_DB)/channels.db", "P=$(P), R=NDet-VMMHYB-00, HYB=0, VMM=0, C=:, CH=STH, PORT=RMM, ADDR=0, TIMEOUT=1")
+dbLoadRecords("$(vmmTbl_DB)/channels.db", "P=$(P), R=NDet-VMMHYB-00, HYB=0, VMM=1, C=:, CH=STH, PORT=RMM, ADDR=0, TIMEOUT=1")
+dbLoadRecords("$(vmmTbl_DB)/channels.db", "P=$(P), R=NDet-VMMHYB-00, HYB=1, VMM=0, C=:, CH=STH, PORT=RMM, ADDR=0, TIMEOUT=1")
+dbLoadRecords("$(vmmTbl_DB)/channels.db", "P=$(P), R=NDet-VMMHYB-00, HYB=1, VMM=1, C=:, CH=STH, PORT=RMM, ADDR=0, TIMEOUT=1")
+
+dbLoadRecords("$(vmmTbl_DB)/channels.db", "P=$(P), R=NDet-VMMHYB-00, HYB=0, VMM=0, C=:, CH=SM, PORT=RMM, ADDR=0, TIMEOUT=1")
+dbLoadRecords("$(vmmTbl_DB)/channels.db", "P=$(P), R=NDet-VMMHYB-00, HYB=0, VMM=1, C=:, CH=SM, PORT=RMM, ADDR=0, TIMEOUT=1")
+dbLoadRecords("$(vmmTbl_DB)/channels.db", "P=$(P), R=NDet-VMMHYB-00, HYB=1, VMM=0, C=:, CH=SM, PORT=RMM, ADDR=0, TIMEOUT=1")
+dbLoadRecords("$(vmmTbl_DB)/channels.db", "P=$(P), R=NDet-VMMHYB-00, HYB=1, VMM=1, C=:, CH=SM, PORT=RMM, ADDR=0, TIMEOUT=1")
+
+dbLoadRecords("$(vmmTbl_DB)/channels.db", "P=$(P), R=NDet-VMMHYB-00, HYB=0, VMM=0, C=:, CH=SMX, PORT=RMM, ADDR=0, TIMEOUT=1")
+dbLoadRecords("$(vmmTbl_DB)/channels.db", "P=$(P), R=NDet-VMMHYB-00, HYB=0, VMM=1, C=:, CH=SMX, PORT=RMM, ADDR=0, TIMEOUT=1")
+dbLoadRecords("$(vmmTbl_DB)/channels.db", "P=$(P), R=NDet-VMMHYB-00, HYB=1, VMM=0, C=:, CH=SMX, PORT=RMM, ADDR=0, TIMEOUT=1")
+dbLoadRecords("$(vmmTbl_DB)/channels.db", "P=$(P), R=NDet-VMMHYB-00, HYB=1, VMM=1, C=:, CH=SMX, PORT=RMM, ADDR=0, TIMEOUT=1")
iocInit()
dbpf $(P)$(R)Temperature-R.SCAN 2
-dbpf $(P)$(R)ProcessPktCount-S.SCAN 2
+#dbpf $(P)$(R)ProcessPktCount-S.SCAN 2
dbpf $(P)$(R)VoltVCCINT-R.SCAN 2
dbpf $(P)$(R)VoltVCC1V8-R.SCAN 2
dbpf $(P)$(R)VoltVADJ1V8-R.SCAN 2
diff --git a/vmmTblApp/Db/channels.sub b/vmmTblApp/Db/channels.sub
deleted file mode 100644
index 2918f9a..0000000
--- a/vmmTblApp/Db/channels.sub
+++ /dev/null
@@ -1,32 +0,0 @@
-file channels.template {
-pattern {HYB, VMM, CH}
- {0, 0, "ST"}
- {0, 1, "ST"}
- {1, 0, "ST"}
- {1, 1, "ST"}
-
- {0, 0, "SC"}
- {0, 1, "SC"}
- {1, 0, "SC"}
- {1, 1, "SC"}
-
- {0, 0, "SL"}
- {0, 1, "SL"}
- {1, 0, "SL"}
- {1, 1, "SL"}
-
- {0, 0, "STH"}
- {0, 1, "STH"}
- {1, 0, "STH"}
- {1, 1, "STH"}
-
- {0, 0, "SM"}
- {0, 1, "SM"}
- {1, 0, "SM"}
- {1, 1, "SM"}
-
- {0, 0, "SMX"}
- {0, 1, "SMX"}
- {1, 0, "SMX"}
- {1, 1, "SMX"}
-}
diff --git a/vmmTblApp/Db/channels.template b/vmmTblApp/Db/channels.template
index 13b8f45..4347f5b 100644
--- a/vmmTblApp/Db/channels.template
+++ b/vmmTblApp/Db/channels.template
@@ -4,7 +4,7 @@
# The aao record sets the register channel by channel.
# The bo record sets all channels at once.
-record(aao, "$(P)$(R)Hyb$(HYB)Vmm$(VMM)$(CH)-S") {
+record(aao, "$(P)$(R)$(HYB)$(VMM)$(C)$(CH)-S") {
field(DESC, "Set $(CH) channels array")
field(DTYP, "asynInt8ArrayOut")
field(NELM, "64")
@@ -12,16 +12,16 @@ record(aao, "$(P)$(R)Hyb$(HYB)Vmm$(VMM)$(CH)-S") {
field(OUT, "@asyn($(PORT),$(ADDR),$(TIMEOUT))HYB_$(HYB)_$(VMM)_$(CH)")
}
-record(bo, "$(P)$(R)Hyb$(HYB)Vmm$(VMM)All$(CH)-S") {
+record(bo, "$(P)$(R)$(HYB)$(VMM)$(C)All$(CH)-S") {
field(DESC, "Set all $(CH) channels")
field(VAL, "0")
}
-record(acalcout, "$(P)$(R)Hyb$(HYB)Vmm$(VMM)#All$(CH)-S") {
+record(acalcout, "$(P)$(R)$(HYB)$(VMM)$(C)#All$(CH)-S") {
field(NELM, "64")
field(CALC, "A=1?1:0")
field(OOPT, "On Change")
- field(INPA, "$(P)$(R)Hyb$(HYB)Vmm$(VMM)All$(CH)-S CPP")
- field(INAA, "$(P)$(R)Hyb$(HYB)Vmm$(VMM)$(CH)-S")
- field(OUT, "$(P)$(R)Hyb$(HYB)Vmm$(VMM)$(CH)-S PP")
+ field(INPA, "$(P)$(R)$(HYB)$(VMM)$(C)All$(CH)-S CPP")
+ field(INAA, "$(P)$(R)$(HYB)$(VMM)$(C)$(CH)-S")
+ field(OUT, "$(P)$(R)$(HYB)$(VMM)$(C)$(CH)-S PP")
}
--
GitLab