From 8a7cbd0211b0e4db62334d66b9b17a6be5e1cb29 Mon Sep 17 00:00:00 2001
From: Gabriel Fedel <gabriel.fedel@ess.eu>
Date: Wed, 19 May 2021 12:19:23 +0200
Subject: [PATCH] Fix macro EVGPREFIX -> EVRPREFIX
---
cmds/evr-island-icslab.cmd | 2 +-
cmds/evr-island-rfq.cmd | 2 +-
.../evrislandApp/Db/evr-island.template | 32 +++++++++----------
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/cmds/evr-island-icslab.cmd b/cmds/evr-island-icslab.cmd
index e27a54b..5e0180d 100755
--- a/cmds/evr-island-icslab.cmd
+++ b/cmds/evr-island-icslab.cmd
@@ -18,7 +18,7 @@ iocshLoad "$(autosave_DIR)/autosave.iocsh" "AS_TOP=$(AS_TOP=/var/log/autosave),
# - Load EVR Island application
-dbLoadRecords("evr-island.template", "P=$(PREFIX):, EVGPREFIX=$(PREFIX):")
+dbLoadRecords("evr-island.template", "P=$(PREFIX):, EVRPREFIX=$(PREFIX):")
# - Load standard ESS modules
iocshLoad("$(iocstats_DIR)/iocStats.iocsh", "IOCNAME=$(PREFIX)")
diff --git a/cmds/evr-island-rfq.cmd b/cmds/evr-island-rfq.cmd
index 434342f..542e99c 100755
--- a/cmds/evr-island-rfq.cmd
+++ b/cmds/evr-island-rfq.cmd
@@ -18,7 +18,7 @@ iocshLoad "$(autosave_DIR)/autosave.iocsh" "AS_TOP=$(AS_TOP=/var/log/autosave),
# - Load EVR Island application
-dbLoadRecords("evr-island.template", "P=$(PREFIX):, EVGPREFIX=$(PREFIX):")
+dbLoadRecords("evr-island.template", "P=$(PREFIX):, EVRPREFIX=$(PREFIX):")
# - Load standard ESS modules
iocshLoad("$(iocstats_DIR)/iocStats.iocsh", "IOCNAME=$(PREFIX)")
diff --git a/evrisland-loc/evrislandApp/Db/evr-island.template b/evrisland-loc/evrislandApp/Db/evr-island.template
index f681438..37c699c 100644
--- a/evrisland-loc/evrislandApp/Db/evr-island.template
+++ b/evrisland-loc/evrislandApp/Db/evr-island.template
@@ -15,7 +15,7 @@ record(ao, "$(P)$(R=)CycleFreq-SP") {
record(calc, "$(P)$(R=)CycleFreq-RB") {
field(DESC, "Cycle frequency readback")
- field(INPA, "$(EVGPREFIX)PS0-Rate-I CP")
+ field(INPA, "$(EVRPREFIX)PS0-Rate-I CP")
field(CALC, "A*1000000")
field(PREC, "3")
field(EGU, "Hz")
@@ -24,7 +24,7 @@ record(calc, "$(P)$(R=)CycleFreq-RB") {
record(calcout, "$(P)$(R=)RFFreq-Divider") {
field(INPA, "$(P)$(R=)CycleFreq-SP")
field(CALC, "(88052500 / A)")
- field(OUT, "$(EVGPREFIX)PS0-Div-SP PP")
+ field(OUT, "$(EVRPREFIX)PS0-Div-SP PP")
field(TPRO, "0")
}
@@ -65,7 +65,7 @@ record(ao, "$(P)$(R=)RFSyncWdt-SP") {
field(DESC, "RF Sync Width")
field(VAL, "3000")
field(EGU, "us")
- field(OUT, "$(EVGPREFIX)DlyGen1-Width-SP PP")
+ field(OUT, "$(EVRPREFIX)DlyGen1-Width-SP PP")
info(autosaveFields_pass0, "VAL")
}
@@ -103,10 +103,10 @@ record(calcout, "$(P)$(R=)#SetBeamWidth"){
# Set fixed values
record(seq, "$(P)$(R=)#SeqFixedVals") {
field(DOL0, "$(P)$(R=)PrePulseDly-RB")
- field(LNK0, "$(EVGPREFIX)DlyGen0-Delay-SP PP")
+ field(LNK0, "$(EVRPREFIX)DlyGen0-Delay-SP PP")
field(DOL1, "$(P)$(R=)HVSyncWdt-RB")
- field(LNK1, "$(EVGPREFIX)DlyGen0-Width-SP PP")
+ field(LNK1, "$(EVRPREFIX)DlyGen0-Width-SP PP")
}
# Pulser 1
@@ -114,7 +114,7 @@ record(calcout, "$(P)$(R=)#SetPulser1Dly"){
field(INPA, "$(P)$(R=)PrePulseDly-RB")
field(INPB, "$(P)$(R=)RFSyncDly-SP CP") # When updates value, update evr
field(CALC, "A+B")
- field(OUT, "$(EVGPREFIX)DlyGen1-Delay-SP PP" )
+ field(OUT, "$(EVRPREFIX)DlyGen1-Delay-SP PP" )
}
# Pulser 2
@@ -122,7 +122,7 @@ record(calcout, "$(P)$(R=)#SetPulser2Dly"){
field(INPA, "$(P)$(R=)PrePulseDly-RB")
field(INPB, "$(P)$(R=)RFSyncDly-SP CP") # When updates value, update evr
field(CALC, "A+B")
- field(OUT, "$(EVGPREFIX)DlyGen2-Delay-SP PP" )
+ field(OUT, "$(EVRPREFIX)DlyGen2-Delay-SP PP" )
}
# Pulser 3
@@ -131,7 +131,7 @@ record(calcout, "$(P)$(R=)#SetPulser3Dly"){
field(INPB, "$(P)$(R=)RFSyncDly-SP CP") # When updates value, update evr
field(INPC, "$(P)$(R=)RFSyncWdt-SP CP") # When updates value, update evr
field(CALC, "A+B+C")
- field(OUT, "$(EVGPREFIX)DlyGen3-Delay-SP PP" )
+ field(OUT, "$(EVRPREFIX)DlyGen3-Delay-SP PP" )
}
# Pulser 4
@@ -140,7 +140,7 @@ record(calcout, "$(P)$(R=)#SetPulser4Dly"){
field(INPB, "$(P)$(R=)RFSyncDly-SP CP") # When updates value, update evr
field(INPC, "$(P)$(R=)BeamPulseDly-SP CP") # When updates value, update evr
field(CALC, "A+B+C")
- field(OUT, "$(EVGPREFIX)DlyGen4-Delay-SP PP" )
+ field(OUT, "$(EVRPREFIX)DlyGen4-Delay-SP PP" )
}
# Pulser 5
@@ -150,7 +150,7 @@ record(calcout, "$(P)$(R=)#SetPulser5Dly"){
field(INPC, "$(P)$(R=)BeamPulseDly-SP CP") # When updates value, update evr
field(INPD, "$(P)$(R=)BeamPulseWdt-SP CP") # When updates value, update evr
field(CALC, "A+B+C+D")
- field(OUT, "$(EVGPREFIX)DlyGen5-Delay-SP PP" )
+ field(OUT, "$(EVRPREFIX)DlyGen5-Delay-SP PP" )
}
# Pulser 6
@@ -160,7 +160,7 @@ record(calcout, "$(P)$(R=)#SetPulser6Dly"){
field(INPC, "$(P)$(R=)RFSyncWdt-SP CP") # When updates value, update evr
field(INPD, "$(P)$(R=)FIMDly-RB CP") # When updates value, update evr
field(CALC, "A+B+C+D")
- field(OUT, "$(EVGPREFIX)DlyGen6-Delay-SP PP" )
+ field(OUT, "$(EVRPREFIX)DlyGen6-Delay-SP PP" )
}
# Set all initial values
@@ -181,13 +181,13 @@ record(seq, "$(P)$(R=)Seq0-Enable") {
field(SELM, "All")
# Load sequencer 0
field(DOL0, "1")
- field(LNK0, "$(EVGPREFIX)SoftSeq0-Load-Cmd CP")
+ field(LNK0, "$(EVRPREFIX)SoftSeq0-Load-Cmd CP")
# Commit sequencer 0
field(DOL1, "1")
- field(LNK1, "$(EVGPREFIX)SoftSeq0-Commit-Cmd CP")
+ field(LNK1, "$(EVRPREFIX)SoftSeq0-Commit-Cmd CP")
# Enable sequencer 0
field(DOL2, "1")
- field(LNK2, "$(EVGPREFIX)SoftSeq0-Enable-Cmd CP")
+ field(LNK2, "$(EVRPREFIX)SoftSeq0-Enable-Cmd CP")
field(TPRO, "0")
}
@@ -200,7 +200,7 @@ record(calc, "$(P)$(R=)Cycle-Cnt")
field(DESC, "Cycle Counter")
field(CALC, "A")
field(SCAN, "Passive")
- field(INPA, "$(EVGPREFIX)SoftSeq0-NumOfStarts-I CPP")
+ field(INPA, "$(EVRPREFIX)SoftSeq0-NumOfStarts-I CPP")
}
########################################################
@@ -230,7 +230,7 @@ record(seq, "$(P)$(R=)SeqDisableAll") {
# Disable sequencer 0
field(DOL1, "1")
- field(LNK1, "$(EVGPREFIX)SoftSeq0-Disable-Cmd CP")
+ field(LNK1, "$(EVRPREFIX)SoftSeq0-Disable-Cmd CP")
# Save current number of cycles
field(DOL2, "$(P)$(R=)Cycle-Cnt")
--
GitLab