Merge pull request #843 from ISISComputingGroup/Ticket_8284_Allow_cer…

…tain_values_to_be_editable_without_restarting_IOC Ticket_8284_Allow_certain_values_to_be_editable_without_restarting_IOC
ISISComputingGroup · Apr 18, 2024 · 0a5042b · 0a5042b
2 parents da47ce8 + 4b38c6d
commit 0a5042b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/MCLEN/MCLEN-IOC-01App/Db/mclen_motor_extra.db b/MCLEN/MCLEN-IOC-01App/Db/mclen_motor_extra.db
@@ -10,5 +10,5 @@ record(motor, "$(P)$(M)") {
   # get tracking aborts from encoder failure we do not want to retry
   field(RTRY, "0")
   field(FOFF, "Frozen")
-  field(ASG,  "WASL0")
+  field(ASG, "$(MOTOR_ASG=WASL0)")
 }
diff --git a/MCLEN/MCLEN-IOC-01App/Db/motor.substitutions b/MCLEN/MCLEN-IOC-01App/Db/motor.substitutions
@@ -11,8 +11,8 @@ pattern {P, M, OFF, JVEL}
 }
 
 file "$(TOP)/MCLEN-IOC-01App/Db/mclen_motor_extra.db" {
-pattern {P, M, PCOFF, HVEL, RDBD}
-{"\$(P)", "\$(M)", "\$(PCOFF)", "\$(HVEL)", "\$(RDBD)"}
+pattern {P, M, PCOFF, HVEL, RDBD, MOTOR_ASG}
+{"\$(P)", "\$(M)", "\$(PCOFF)", "\$(HVEL)", "\$(RDBD)", "\$(MOTOR_ASG)"}
 }
 
 file $(MOTOR)/db/periodic_polling.db {

diff --git a/MCLEN/iocBoot/iocMCLEN-IOC-01/st-motor.cmd b/MCLEN/iocBoot/iocMCLEN-IOC-01/st-motor.cmd
@@ -57,7 +57,7 @@ dbLoadRecords("$(ASYN)/db/asynRecord.db", "P=$(MYPVPREFIX),R=$(AMOTORPV):ASYN,PO
 # on an absolute move unless the speed and base speed are different
 #
 $(IFRECSIM) dbLoadRecords("$(TOP)/db/motorSim.db", "P=$(MYPVPREFIX),M=$(AMOTORPV),VELO=$(VELOI),JVEL=$(JVELI),VBAS=0.0,ACCL=$(ACCLI),MRES=$(MRESI),ERES=$(ERESI),DHLM=$(DHLMI),DLLM=$(DLLMI),NAME=$(NAMEI),S=$(SN),C=0,UEIP=1,EGU=$(EGUI),OFF=$(OFSTI)")
-$(IFNOTRECSIM) dbLoadRecords("$(TOP)/db/motor.db", "P=$(MYPVPREFIX),M=$(AMOTORPV),VELO=$(VELOI),JVEL=$(JVELI),HVEL=$(HVELI),VBAS=0.0,ACCL=$(ACCLI),MRES=$(MRESI),ERES=$(ERESI),DHLM=$(DHLMI),DLLM=$(DLLMI),NAME=$(NAMEI),S=$(SN),C=0,UEIP=1,EGU=$(EGUI),OFF=$(OFSTI),POLL_RATE=$(POLL_RATE=10),PCOF=$(PCOF),RDBD=$(RDBDI)")
+$(IFNOTRECSIM) dbLoadRecords("$(TOP)/db/motor.db", "P=$(MYPVPREFIX),M=$(AMOTORPV),VELO=$(VELOI),JVEL=$(JVELI),HVEL=$(HVELI),VBAS=0.0,ACCL=$(ACCLI),MRES=$(MRESI),ERES=$(ERESI),DHLM=$(DHLMI),DLLM=$(DLLMI),NAME=$(NAMEI),S=$(SN),C=0,UEIP=1,EGU=$(EGUI),OFF=$(OFSTI),POLL_RATE=$(POLL_RATE=10),PCOF=$(PCOF),RDBD=$(RDBDI), MOTOR_ASG=$(MOTOR_ASG)")
 dbLoadRecords("$(MOTOR)/db/motorStatus.db", "P=$(MYPVPREFIX),M=$(AMOTORPV),IOCNAME=$(IOCNAME)") 
 dbLoadRecords("$(AXIS)/db/axis.db", "P=$(MYPVPREFIX),AXIS=$(IOCNAME):AXIS$(MN),mAXIS=$(AMOTORPV)")