Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Archiver info tag #223

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Archiver info tag #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
35fd455
Improve formatting
Aug 27, 2024
ccca0f7
Add archiver info tags to motor record PV
Aug 27, 2024
1720b23
Merge branch 'paulscherrerinstitute:master' into archiver-info-tag
cdn-lnk Aug 28, 2024
83ded70
Improve archiver info tags implementation
Sep 2, 2024
1a713dd
Remove ECMC_AXISFIELDINIT
Sep 2, 2024
099c5be
Merge branch 'master' into archiver-info-tag
cdn-lnk Oct 9, 2024
ee3ed2c
Fix formatting after rebase
Oct 9, 2024
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
157 changes: 75 additions & 82 deletions db/core/ecmcMotorRecord.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
record(motor,"$(PREFIX)$(MOTOR_NAME)")
{
record(motor, "$(PREFIX)$(MOTOR_NAME)") {
field(DESC, "$(DESC)")
field(DTYP, "asynMotor")
field(DIR, "$(DIR=0)")
Expand All @@ -24,7 +23,7 @@ record(motor,"$(PREFIX)$(MOTOR_NAME)")
field(RTRY, "$(RTRY=1)")
field(RMOD, "$(RMOD=3)")
field(DLY, "$(DLY=0)")
field(OFF, "$(OFF=0)")
field(OFF, "$(OFF=0)")
field(FOFF, "$(FOFF=0)")
field(NTM, "$(NTM=1)")
field(TWV, "$(TWV=1)")
Expand All @@ -36,17 +35,20 @@ record(motor,"$(PREFIX)$(MOTOR_NAME)")
field(UREV, "$(UREV=1.0)")
field(VMAX, "$(VMAX=0)")
field(SPAM, "$(SPAM=15)")

$(ECMC_BLOCK_ARCHIVER)info(aa_policy, "$(ECMC_ARCHIVER_POLICY)")
$(ECMC_BLOCK_ARCHIVER)info(archiver, "$(ECMC_ARCHIVER_CLUSTER)")
}

# The message text
record(stringin,"$(PREFIX)$(MOTOR_NAME)-MsgTxt") {
record(stringin, "$(PREFIX)$(MOTOR_NAME)-MsgTxt") {
field(DTYP, "asynOctetRead")
field(INP, "@asyn($(MOTOR_PORT),$(AXIS_NO))MOTOR_MESSAGE_TEXT")
field(SCAN, "I/O Intr")
}

# Debug message in IOC log
record(stringout,"$(PREFIX)$(MOTOR_NAME)-DbgStrToLOG") {
record(stringout, "$(PREFIX)$(MOTOR_NAME)-DbgStrToLOG") {
field(DESC, "Log String in IOC log")
field(VAL, "")
field(DTYP, "asynOctetWrite")
Expand All @@ -65,38 +67,34 @@ record(longout, "$(PREFIX)$(MOTOR_NAME)-DIR_") {
field(OUT, "@asyn($(MOTOR_PORT),$(AXIS_NO))MOTOR_REC_DIRECTION")
}

record(ai, "$(PREFIX)$(MOTOR_NAME)-Vel-RB")
{
record(ai, "$(PREFIX)$(MOTOR_NAME)-Vel-RB") {
field(DTYP, "asynFloat64")
field(PREC, "$(PREC)")
field(INP, "@asyn($(MOTOR_PORT),$(AXIS_NO))Vel-RB")
field(SCAN, "I/O Intr")
}

record(ai, "$(PREFIX)$(MOTOR_NAME)-Acc-RB")
{
record(ai, "$(PREFIX)$(MOTOR_NAME)-Acc-RB") {
field(DTYP, "asynFloat64")
field(PREC, "$(PREC)")
field(INP, "@asyn($(MOTOR_PORT),$(AXIS_NO))Acc-RB")
field(SCAN, "I/O Intr")
}

record(ai, "$(PREFIX)$(MOTOR_NAME)-EncAct")
{
record(ai, "$(PREFIX)$(MOTOR_NAME)-EncAct") {
field(DTYP, "asynFloat64")
field(PREC, "0")
field(INP, "@asyn($(MOTOR_PORT),$(AXIS_NO))EncAct")
field(SCAN, "I/O Intr")
}

record(longin, "$(PREFIX)$(MOTOR_NAME)-MR-ErrId")
{
record(longin, "$(PREFIX)$(MOTOR_NAME)-MR-ErrId") {
field(DTYP, "asynInt32")
field(INP, "@asyn($(MOTOR_PORT),$(AXIS_NO))ErrId")
field(SCAN, "I/O Intr")
}

record(longout,"$(PREFIX)$(MOTOR_NAME)-ErrRst") {
record(longout, "$(PREFIX)$(MOTOR_NAME)-ErrRst") {
field(DESC, "Error Reset")
field(VAL, 0)
field(DTYP, "asynInt32")
Expand All @@ -105,7 +103,7 @@ record(longout,"$(PREFIX)$(MOTOR_NAME)-ErrRst") {
}

# Motor offset for this axis
record(ao,"$(PREFIX)$(MOTOR_NAME)-OFF_") {
record(ao, "$(PREFIX)$(MOTOR_NAME)-OFF_") {
field(DESC, "$(MOTOR_NAME) offset")
field(DOL, "$(PREFIX)$(MOTOR_NAME).OFF CP MS")
field(OMSL, "closed_loop")
Expand All @@ -116,7 +114,7 @@ record(ao,"$(PREFIX)$(MOTOR_NAME)-OFF_") {


# Motor resolution for this axis
record(ao,"$(PREFIX)$(MOTOR_NAME)-MRES_") {
record(ao, "$(PREFIX)$(MOTOR_NAME)-MRES_") {
field(DESC, "$(MOTOR_NAME) resolution")
field(DOL, "$(PREFIX)$(MOTOR_NAME).MRES CP MS")
field(OMSL, "closed_loop")
Expand All @@ -125,115 +123,115 @@ record(ao,"$(PREFIX)$(MOTOR_NAME)-MRES_") {
field(OUT, "@asyn($(MOTOR_PORT),$(AXIS_NO))MOTOR_REC_RESOLUTION")
}

record(ai,"$(PREFIX)$(MOTOR_NAME)-CfgSREV-RB") {
record(ai, "$(PREFIX)$(MOTOR_NAME)-CfgSREV-RB") {
field(DESC, "Micro Steps / Revolution")
field(DTYP, "asynFloat64")
field(PREC, "$(PREC)")
field(INP, "@asyn($(MOTOR_PORT),$(AXIS_NO))CfgSREV-RB")
field(SCAN, "I/O Intr")
}

record(ai,"$(PREFIX)$(MOTOR_NAME)-CfgUREV-RB") {
record(ai, "$(PREFIX)$(MOTOR_NAME)-CfgUREV-RB") {
field(DESC, "EGU / Revolution")
field(DTYP, "asynFloat64")
field(PREC, "$(PREC)")
field(INP, "@asyn($(MOTOR_PORT),$(AXIS_NO))CfgUREV-RB")
field(SCAN, "I/O Intr")
}

record(ai,"$(PREFIX)$(MOTOR_NAME)-CfgPMIN-RB") {
record(ai, "$(PREFIX)$(MOTOR_NAME)-CfgPMIN-RB") {
field(DESC, "Absolute Minimum")
field(DTYP, "asynFloat64")
field(PREC, "$(PREC)")
field(INP, "@asyn($(MOTOR_PORT),$(AXIS_NO))CfgPMIN-RB")
field(SCAN, "I/O Intr")
}
record(ai,"$(PREFIX)$(MOTOR_NAME)-CfgPMAX-RB") {
record(ai, "$(PREFIX)$(MOTOR_NAME)-CfgPMAX-RB") {
field(DESC, "Absolute Maximum")
field(DTYP, "asynFloat64")
field(PREC, "$(PREC)")
field(INP, "@asyn($(MOTOR_PORT),$(AXIS_NO))CfgPMAX-RB")
field(SCAN, "I/O Intr")
}

record(ai,"$(PREFIX)$(MOTOR_NAME)-CfgSPDB-RB") {
record(ai, "$(PREFIX)$(MOTOR_NAME)-CfgSPDB-RB") {
field(DESC, "Set point dead band window")
field(DTYP, "asynFloat64")
field(PREC, "$(PREC)")
field(INP, "@asyn($(MOTOR_PORT),$(AXIS_NO))CfgSPDB-RB")
field(SCAN, "I/O Intr")
}

record(ai,"$(PREFIX)$(MOTOR_NAME)-CfgRDBD-RB") {
record(ai, "$(PREFIX)$(MOTOR_NAME)-CfgRDBD-RB") {
field(DESC, "In target position window")
field(DTYP, "asynFloat64")
field(PREC, "$(PREC)")
field(INP, "@asyn($(MOTOR_PORT),$(AXIS_NO))CfgRDBD-RB")
field(SCAN, "I/O Intr")
}

record(ai,"$(PREFIX)$(MOTOR_NAME)-CfgRDBD-Tim-RB") {
record(ai, "$(PREFIX)$(MOTOR_NAME)-CfgRDBD-Tim-RB") {
field(DESC, "In target position time")
field(DTYP, "asynFloat64")
field(PREC, "$(PREC)")
field(INP, "@asyn($(MOTOR_PORT),$(AXIS_NO))CfgRDBD-Tim-RB")
field(SCAN, "I/O Intr")
}

record(longin,"$(PREFIX)$(MOTOR_NAME)-CfgRDBD-En-RB") {
record(longin, "$(PREFIX)$(MOTOR_NAME)-CfgRDBD-En-RB") {
field(DESC, "In target position enabled")
field(DTYP, "asynInt32")
field(INP, "@asyn($(MOTOR_PORT),$(AXIS_NO))CfgRDBD-En-RB")
field(SCAN, "I/O Intr")
}

record(ai,"$(PREFIX)$(MOTOR_NAME)-CfgPOSLAG-RB") {
record(ai, "$(PREFIX)$(MOTOR_NAME)-CfgPOSLAG-RB") {
field(DESC, "In target position window")
field(DTYP, "asynFloat64")
field(PREC, "$(PREC)")
field(INP, "@asyn($(MOTOR_PORT),$(AXIS_NO))CfgPOSLAG-RB")
field(SCAN, "I/O Intr")
}

record(ai,"$(PREFIX)$(MOTOR_NAME)-CfgPOSLAG-Tim-RB") {
record(ai, "$(PREFIX)$(MOTOR_NAME)-CfgPOSLAG-Tim-RB") {
field(DESC, "In target position time")
field(DTYP, "asynFloat64")
field(PREC, "$(PREC)")
field(INP, "@asyn($(MOTOR_PORT),$(AXIS_NO))CfgPOSLAG-Tim-RB")
field(SCAN, "I/O Intr")
}

record(longin,"$(PREFIX)$(MOTOR_NAME)-CfgPOSLAG-En-RB") {
record(longin, "$(PREFIX)$(MOTOR_NAME)-CfgPOSLAG-En-RB") {
field(DESC, "In target position enabled")
field(DTYP, "asynInt32")
field(INP, "@asyn($(MOTOR_PORT),$(AXIS_NO))CfgPOSLAG-En-RB")
field(SCAN, "I/O Intr")
}

record(ai,"$(PREFIX)$(MOTOR_NAME)-CfgDHLM-RB") {
record(ai, "$(PREFIX)$(MOTOR_NAME)-CfgDHLM-RB") {
field(DESC, "EC High Soft Limit RB")
field(DTYP, "asynFloat64")
field(PREC, "$(PREC)")
field(INP, "@asyn($(MOTOR_PORT),$(AXIS_NO))CfgDHLM")
field(SCAN, "I/O Intr")
}

record(ai,"$(PREFIX)$(MOTOR_NAME)-CfgDLLM-RB") {
record(ai, "$(PREFIX)$(MOTOR_NAME)-CfgDLLM-RB") {
field(DESC, "EC Low Soft Limit RB")
field(DTYP, "asynFloat64")
field(PREC, "$(PREC)")
field(INP, "@asyn($(MOTOR_PORT),$(AXIS_NO))CfgDLLM")
field(SCAN, "I/O Intr")
}

record(longin,"$(PREFIX)$(MOTOR_NAME)-CfgDHLM-En-RB") {
record(longin, "$(PREFIX)$(MOTOR_NAME)-CfgDHLM-En-RB") {
field(DESC, "EC High Soft Limit enabled RB")
field(DTYP, "asynInt32")
field(INP, "@asyn($(MOTOR_PORT),$(AXIS_NO))CfgDHLM-En")
field(SCAN, "I/O Intr")
}

record(longin,"$(PREFIX)$(MOTOR_NAME)-CfgDLLM-En-RB") {
record(longin, "$(PREFIX)$(MOTOR_NAME)-CfgDLLM-En-RB") {
field(DESC, "EC Low Soft Limit enabled RB")
field(DTYP, "asynInt32")
field(INP, "@asyn($(MOTOR_PORT),$(AXIS_NO))CfgDLLM-En")
Expand All @@ -242,41 +240,37 @@ record(longin,"$(PREFIX)$(MOTOR_NAME)-CfgDLLM-En-RB") {

# Config records, the values will be pushed into the motor record fields

record(ai, "$(PREFIX)$(MOTOR_NAME)-CfgVELO-RB")
{
record(ai, "$(PREFIX)$(MOTOR_NAME)-CfgVELO-RB") {
field(DTYP, "asynFloat64")
field(PREC, "$(PREC)")
field(INP, "@asyn($(MOTOR_PORT),$(AXIS_NO))CfgVELO")
field(SCAN, "I/O Intr")
}

record(ai, "$(PREFIX)$(MOTOR_NAME)-CfgVMAX-RB")
{
record(ai, "$(PREFIX)$(MOTOR_NAME)-CfgVMAX-RB") {
field(DTYP, "asynFloat64")
field(PREC, "$(PREC)")
field(INP, "@asyn($(MOTOR_PORT),$(AXIS_NO))CfgVMAX")
field(SCAN, "I/O Intr")
}


record(ai, "$(PREFIX)$(MOTOR_NAME)-CfgJVEL-RB")
{
record(ai, "$(PREFIX)$(MOTOR_NAME)-CfgJVEL-RB") {
field(DTYP, "asynFloat64")
field(PREC, "$(PREC)")
field(INP, "@asyn($(MOTOR_PORT),$(AXIS_NO))CfgJVEL")
field(SCAN, "I/O Intr")
}

record(ai, "$(PREFIX)$(MOTOR_NAME)-CfgACCS-RB")
{
record(ai, "$(PREFIX)$(MOTOR_NAME)-CfgACCS-RB") {
field(DTYP, "asynFloat64")
field(PREC, "$(PREC)")
field(INP, "@asyn($(MOTOR_PORT),$(AXIS_NO))CfgACCS")
field(SCAN, "I/O Intr")
}

record(mbbi,"$(PREFIX)$(MOTOR_NAME)-HomProc-RB") {
field(DESC,"Homing procedure")
record(mbbi, "$(PREFIX)$(MOTOR_NAME)-HomProc-RB") {
field(DESC, "Homing procedure")
field(DTYP, "asynInt32")
field(INP, "@asyn($(MOTOR_PORT),$(AXIS_NO))HomProc-RB")
field(SCAN, "I/O Intr")
Expand Down Expand Up @@ -315,46 +309,45 @@ record(mbbi,"$(PREFIX)$(MOTOR_NAME)-HomProc-RB") {
field(FFST, "ManSetPos")
}

record(ai,"$(PREFIX)$(MOTOR_NAME)-HomPos-RB") {
record(ai, "$(PREFIX)$(MOTOR_NAME)-HomPos-RB") {
field(DESC, "Home Position")
field(DTYP, "asynFloat64")
field(PREC, "$(PREC)")
field(INP, "@asyn($(MOTOR_PORT),$(AXIS_NO))HomPos-RB")
field(SCAN, "I/O Intr")
}

record (asyn, "$(PREFIX)$(MOTOR_NAME)-$(MOTOR_PORT)-asyn")
{
record (asyn, "$(PREFIX)$(MOTOR_NAME)-$(MOTOR_PORT)-asyn") {
}

################################################################
# Sync and stop on interlock
record(calcout,"$(PREFIX)$(MOTOR_NAME)-MR-SyncTrgH2L"){
#field(PINI, "1")
field(DESC, "Trigg MR Sync")
field(SCAN, "Passive")
field(INPA, "$(PREFIX)$(MOTOR_NAME)-SumIlockBwd CP")
field(INPB, "$(PREFIX)$(MOTOR_NAME)-SumIlockFwd CP")
field(INPC, "1")
field(CALC, "A && B")
field(OCAL, "C")
field(DOPT, "Use OCAL")
field(OOPT, "Transition To Zero")
field(OUT, "$(PREFIX)$(MOTOR_NAME)-MR-SyncTrgSeq PP")
}

record(calcout,"$(PREFIX)$(MOTOR_NAME)-MR-SyncTrgL2H"){
#field(PINI, "1")
field(DESC, "Trigg MR Sync")
field(SCAN, "Passive")
field(INPA, "$(PREFIX)$(MOTOR_NAME)-SumIlockBwd CP")
field(INPB, "$(PREFIX)$(MOTOR_NAME)-SumIlockFwd CP")
field(INPC, "1")
field(CALC, "A && B")
field(OCAL, "C")
field(DOPT, "Use OCAL")
field(OOPT, "Transition To Non-zero")
field(OUT, "$(PREFIX)$(MOTOR_NAME)-MR-SyncTrgSeq PP")
record(calcout, "$(PREFIX)$(MOTOR_NAME)-MR-SyncTrgH2L") {
#field(PINI, "1")
field(DESC, "Trigg MR Sync")
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you're fixing the formatting here you could consider removing this (same in the following record def) - your call 🔧

field(SCAN, "Passive")
field(INPA, "$(PREFIX)$(MOTOR_NAME)-SumIlockBwd CP")
field(INPB, "$(PREFIX)$(MOTOR_NAME)-SumIlockFwd CP")
field(INPC, "1")
field(CALC, "A && B")
field(OCAL, "C")
field(DOPT, "Use OCAL")
field(OOPT, "Transition To Zero")
field(OUT, "$(PREFIX)$(MOTOR_NAME)-MR-SyncTrgSeq PP")
}

record(calcout, "$(PREFIX)$(MOTOR_NAME)-MR-SyncTrgL2H") {
#field(PINI, "1")
field(DESC, "Trigg MR Sync")
field(SCAN, "Passive")
field(INPA, "$(PREFIX)$(MOTOR_NAME)-SumIlockBwd CP")
field(INPB, "$(PREFIX)$(MOTOR_NAME)-SumIlockFwd CP")
field(INPC, "1")
field(CALC, "A && B")
field(OCAL, "C")
field(DOPT, "Use OCAL")
field(OOPT, "Transition To Non-zero")
field(OUT, "$(PREFIX)$(MOTOR_NAME)-MR-SyncTrgSeq PP")
}

record(seq, "$(PREFIX)$(MOTOR_NAME)-MR-SyncTrgSeq") {
Expand All @@ -378,22 +371,22 @@ record(seq, "$(PREFIX)$(MOTOR_NAME)-MR-SyncTrgSeq") {
}

record(seq, "${PREFIX}${MOTOR_NAME}-StpCmd_") {
field(DESC, "Stop Axis")
field(DOL1, "${PREFIX}${MOTOR_NAME}-StpCmd CP")
field(DO2, "1")
field(LNK1, "")
field(LNK2, "${PREFIX}${MOTOR_NAME}.STOP PP")
field(DESC, "Stop Axis")
field(DOL1, "${PREFIX}${MOTOR_NAME}-StpCmd CP")
field(DO2, "1")
field(LNK1, "")
field(LNK2, "${PREFIX}${MOTOR_NAME}.STOP PP")
}

################################################################
# Sync only
record(longin,"${PREFIX}${MOTOR_NAME}-SyncMrCmd"){
field(DESC, "${MOTOR_NAME}: Sync MR")
field(DTYP, "asynInt32")
field(INP, "@asyn($(MOTOR_PORT),$(AXIS_NO))TRIGG_SYNC")
field(SCAN, "I/O Intr")
field(FLNK, "${PREFIX}${MOTOR_NAME}-MR-SyncOnly.PROC")
field(TSE, "$(TSE=-2)")
record(longin, "${PREFIX}${MOTOR_NAME}-SyncMrCmd") {
field(DESC, "${MOTOR_NAME}: Sync MR")
field(DTYP, "asynInt32")
field(INP, "@asyn($(MOTOR_PORT),$(AXIS_NO))TRIGG_SYNC")
field(SCAN, "I/O Intr")
field(FLNK, "${PREFIX}${MOTOR_NAME}-MR-SyncOnly.PROC")
field(TSE, "$(TSE=-2)")
}

record(seq, "$(PREFIX)$(MOTOR_NAME)-MR-SyncOnly") {
Expand Down
Loading
Loading