lin-epics-modules/sinqMotor
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'cleaning' into 'main'

Browse Source 
small cleaning changes

See merge request sinq-epics-modules/sinqmotor!1
This commit is contained in:
mathis_s
2024-11-21 15:27:28 +01:00
parent 5502c39219 a4943f3fe4
commit 97e80814e3
2 changed files with 17 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
db/asynRecord.db
View File

@ -1,9 +1,9 @@
record(asyn,"$(P)$(R)") record(asyn,"$(P)")
{ {
field(DTYP,"asynRecordDevice") field(DTYP,"asynRecordDevice")
field(PORT,"$(PORT)") field(PORT,"$(PORT)")
field(ADDR,"$(ADDR)") field(ADDR,"0")
field(OMAX,"$(OMAX)") field(OMAX,"80")
field(IMAX,"$(IMAX)") field(IMAX,"80")
} }

39
db/sinqMotor.db
View File

@ -1,29 +1,21 @@
record(motor,"$(P)$(M)") record(motor,"$(P)$(M)")
{ {
field(DESC,"$(DESC)") field(DESC,"$(DESC)")
field(DTYP,"$(DTYP)") field(DTYP,"asynMotor")
field(DIR,"$(DIR)") field(DIR,"$(DIR)")
field(VELO,"$(VELO)") field(OUT,"@asyn($(CONTROLLER),$(AXIS))")
field(VBAS,"$(VBAS)")
field(ACCL,"$(ACCL)")
field(BDST,"$(BDST)")
field(BVEL,"$(BVEL)")
field(BACC,"$(BACC)")
field(OUT,"@asyn($(PORT),$(ADDR))")
field(MRES,"$(MRES)") field(MRES,"$(MRES)")
field(PREC,"$(PREC)")
field(EGU,"$(EGU)") field(EGU,"$(EGU)")
field(INIT,"$(INIT)") field(INIT,"")
field(PINI, "NO") field(PINI, "NO")
field(TWV,"1") field(TWV,"1")
field(RDBD,"$(RDBD)")
field(RTRY, "0") field(RTRY, "0")
} }
# The message text # The message text
record(waveform, "$(P)$(M)-MsgTxt") { record(waveform, "$(P)$(M)-MsgTxt") {
field(DTYP, "asynOctetRead") field(DTYP, "asynOctetRead")
field(INP, "@asyn($(PORT),$(N),1) MOTOR_MESSAGE_TEXT") field(INP, "@asyn($(CONTROLLER),$(AXIS),1) MOTOR_MESSAGE_TEXT")
field(FTVL, "CHAR") field(FTVL, "CHAR")
field(NELM, "$(MsgTxtSize=200)") # Should be the same as MAXBUF in the driver code field(NELM, "$(MsgTxtSize=200)") # Should be the same as MAXBUF in the driver code
field(SCAN, "I/O Intr") field(SCAN, "I/O Intr")
@ -32,7 +24,7 @@ record(waveform, "$(P)$(M)-MsgTxt") {
# Encoder type # Encoder type
record(waveform, "$(P)$(M):Encoder_Type") { record(waveform, "$(P)$(M):Encoder_Type") {
field(DTYP, "asynOctetRead") field(DTYP, "asynOctetRead")
field(INP, "@asyn($(PORT),$(N),1) ENCODER_TYPE") field(INP, "@asyn($(CONTROLLER),$(AXIS),1) ENCODER_TYPE")
field(FTVL, "CHAR") field(FTVL, "CHAR")
field(NELM, "80") field(NELM, "80")
field(SCAN, "I/O Intr") field(SCAN, "I/O Intr")
@ -41,35 +33,35 @@ record(waveform, "$(P)$(M):Encoder_Type") {
# enable axis # enable axis
record(longout, "$(P)$(M):Enable") { record(longout, "$(P)$(M):Enable") {
field(DTYP, "asynInt32") field(DTYP, "asynInt32")
field(OUT, "@asyn($(PORT),$(N),1) ENABLE_AXIS") field(OUT, "@asyn($(CONTROLLER),$(AXIS),1) ENABLE_AXIS")
field(PINI, "NO") field(PINI, "NO")
} }
# enable axis # enable axis
record(longin, "$(P)$(M):Enable_RBV") { record(longin, "$(P)$(M):Enable_RBV") {
field(DTYP, "asynInt32") field(DTYP, "asynInt32")
field(INP, "@asyn($(PORT),$(N),1) AXIS_ENABLED") field(INP, "@asyn($(CONTROLLER),$(AXIS),1) AXIS_ENABLED")
field(PINI, "YES") field(PINI, "YES")
} }
# reread encoder # reread encoder
record(longout, "$(P)$(M):Reread_Encoder") { record(longout, "$(P)$(M):Reread_Encoder") {
field(DTYP, "asynInt32") field(DTYP, "asynInt32")
field(OUT, "@asyn($(PORT),$(N),1) REREAD_ENCODER_POSITION") field(OUT, "@asyn($(CONTROLLER),$(AXIS),1) REREAD_ENCODER_POSITION")
field(PINI, "NO") field(PINI, "NO")
} }
# reread encoder # reread encoder
record(longin, "$(P)$(M):Reread_Encoder_RBV") { record(longin, "$(P)$(M):Reread_Encoder_RBV") {
field(DTYP, "asynInt32") field(DTYP, "asynInt32")
field(INP, "@asyn($(PORT),$(N),1) REREAD_ENCODER_POSITION_RBV") field(INP, "@asyn($(CONTROLLER),$(AXIS),1) REREAD_ENCODER_POSITION_RBV")
field(PINI, "YES") field(PINI, "YES")
} }
# reread encoder # reread encoder
record(longout, "$(P)$(M):Read_Config") { record(longout, "$(P)$(M):Read_Config") {
field(DTYP, "asynInt32") field(DTYP, "asynInt32")
field(OUT, "@asyn($(PORT),$(N),1) READ_CONFIG") field(OUT, "@asyn($(CONTROLLER),$(AXIS),1) READ_CONFIG")
field(PINI, "NO") field(PINI, "NO")
} }
@ -80,8 +72,7 @@ record(ao,"$(P)$(M):Resolution") {
field(DOL, "$(P)$(M).MRES CP MS") field(DOL, "$(P)$(M).MRES CP MS")
field(OMSL, "closed_loop") field(OMSL, "closed_loop")
field(DTYP, "asynFloat64") field(DTYP, "asynFloat64")
field(OUT, "@asyn($(PORT),$(ADDR)) MOTOR_REC_RESOLUTION") field(OUT, "@asyn($(CONTROLLER),$(AXIS)) MOTOR_REC_RESOLUTION")
field(PREC, "$(PREC)")
} }
# =================================================================== # ===================================================================
@ -93,15 +84,13 @@ record(ao,"$(P)$(M):Resolution") {
record(ai, "$(P)$(M):MOTOR_HIGH_LIMIT-RBV") record(ai, "$(P)$(M):MOTOR_HIGH_LIMIT-RBV")
{ {
field(DTYP, "asynFloat64") field(DTYP, "asynFloat64")
field(PREC, "$(PREC)") field(INP, "@asyn($(CONTROLLER),$(AXIS)) MOTOR_HIGH_LIMIT_FROM_DRIVER")
field(INP, "@asyn($(PORT),$(ADDR)) MOTOR_HIGH_LIMIT_FROM_DRIVER")
field(SCAN, "I/O Intr") field(SCAN, "I/O Intr")
field(FLNK, "$(P)$(M):PUSH_DHLM_TO_FIELD") field(FLNK, "$(P)$(M):PUSH_DHLM_TO_FIELD")
} }
# Push the value into the field of the main motor record # Push the value into the field of the main motor record
record(ao, "$(P)$(M):PUSH_DHLM_TO_FIELD") { record(ao, "$(P)$(M):PUSH_DHLM_TO_FIELD") {
field(PREC, "$(PREC)")
field(DOL, "$(P)$(M):MOTOR_HIGH_LIMIT-RBV CP") field(DOL, "$(P)$(M):MOTOR_HIGH_LIMIT-RBV CP")
field(OUT, "$(P)$(M).DHLM") field(OUT, "$(P)$(M).DHLM")
field(OMSL, "closed_loop") # This configuration keeps the input value $(P)$(M):HLM_ADD_OFFSET and the output field $(P)$(M).DHLM in sync field(OMSL, "closed_loop") # This configuration keeps the input value $(P)$(M):HLM_ADD_OFFSET and the output field $(P)$(M).DHLM in sync
@ -111,15 +100,13 @@ record(ao, "$(P)$(M):PUSH_DHLM_TO_FIELD") {
record(ai, "$(P)$(M):MOTOR_LOW_LIMIT-RBV") record(ai, "$(P)$(M):MOTOR_LOW_LIMIT-RBV")
{ {
field(DTYP, "asynFloat64") field(DTYP, "asynFloat64")
field(PREC, "$(PREC)") field(INP, "@asyn($(CONTROLLER),$(AXIS)) MOTOR_LOW_LIMIT_FROM_DRIVER")
field(INP, "@asyn($(PORT),$(ADDR)) MOTOR_LOW_LIMIT_FROM_DRIVER")
field(SCAN, "I/O Intr") field(SCAN, "I/O Intr")
field(FLNK, "$(P)$(M):PUSH_DLLM_TO_FIELD") field(FLNK, "$(P)$(M):PUSH_DLLM_TO_FIELD")
} }
# Push the value into the field of the main motor record # Push the value into the field of the main motor record
record(ao, "$(P)$(M):PUSH_DLLM_TO_FIELD") { record(ao, "$(P)$(M):PUSH_DLLM_TO_FIELD") {
field(PREC, "$(PREC)")
field(DOL, "$(P)$(M):MOTOR_LOW_LIMIT-RBV CP") field(DOL, "$(P)$(M):MOTOR_LOW_LIMIT-RBV CP")
field(OUT, "$(P)$(M).DLLM") field(OUT, "$(P)$(M).DLLM")
field(OMSL, "closed_loop") # This configuration keeps the input value $(P)$(M):LLM_ADD_OFFSET and the output field $(P)$(M).DLLM in sync field(OMSL, "closed_loop") # This configuration keeps the input value $(P)$(M):LLM_ADD_OFFSET and the output field $(P)$(M).DLLM in sync