From cba5fe384d85bbd590e3e549c5ca3891cdfb5f5b Mon Sep 17 00:00:00 2001
From: MarkRivers <rivers@cars.uchicago.edu>
Date: Tue, 5 Apr 2011 02:07:13 +0000
Subject: [PATCH] Added M macro for motor name, changed AXIS to ADDR

---
 motorApp/Db/profileMoveAxisXPS.template | 27 +++++++++++++------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/motorApp/Db/profileMoveAxisXPS.template b/motorApp/Db/profileMoveAxisXPS.template
index 0def5509..ab61e0b4 100644
--- a/motorApp/Db/profileMoveAxisXPS.template
+++ b/motorApp/Db/profileMoveAxisXPS.template
@@ -8,18 +8,19 @@
 # Macro paramters:
 #   $(P)         - PV name prefix
 #   $(R)         - PV base record name
+#   $(M)         - PV motor name
 #   $(PORT)      - asyn port for this controller
-#   $(AXIS)      - asyn addr for this axis
+#   $(ADDR)      - asyn addr for this axis
 #   $(TIMEOUT)   - asyn timeout for this axis
 #   $(PREC)      - Precision for this axis
 
 #
 # Readback of minimum position
 #
-record(ai,"$(P)$(R)MinPosition") {
-    field(DESC, "Axis $(AXIS) min position")
+record(ai,"$(P)$(R)$(M)MinPosition") {
+    field(DESC, "Axis $(ADDR) min position")
     field(DTYP, "asynFloat64")
-    field(INP,  "@asyn($(PORT),$(AXIS),$(TIMEOUT))XPS_PROFILE_MIN_POSITION")
+    field(INP,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))XPS_PROFILE_MIN_POSITION")
     field(PREC, "$(PREC)")
     field(SCAN, "I/O Intr")
 }
@@ -27,10 +28,10 @@ record(ai,"$(P)$(R)MinPosition") {
 #
 # Readback of maximum position
 #
-record(ai,"$(P)$(R)MaxPosition") {
-    field(DESC, "Axis $(AXIS) max position")
+record(ai,"$(P)$(R)$(M)MaxPosition") {
+    field(DESC, "Axis $(ADDR) max position")
     field(DTYP, "asynFloat64")
-    field(INP,  "@asyn($(PORT),$(AXIS),$(TIMEOUT))XPS_PROFILE_MAX_POSITION")
+    field(INP,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))XPS_PROFILE_MAX_POSITION")
     field(PREC, "$(PREC)")
     field(SCAN, "I/O Intr")
 }
@@ -38,10 +39,10 @@ record(ai,"$(P)$(R)MaxPosition") {
 #
 # Readback of maximum velocity
 #
-record(ai,"$(P)$(R)MaxVelocity") {
-    field(DESC, "Axis $(AXIS) max velocity")
+record(ai,"$(P)$(R)$(M)MaxVelocity") {
+    field(DESC, "Axis $(ADDR) max velocity")
     field(DTYP, "asynFloat64")
-    field(INP,  "@asyn($(PORT),$(AXIS),$(TIMEOUT))XPS_PROFILE_MAX_VELOCITY")
+    field(INP,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))XPS_PROFILE_MAX_VELOCITY")
     field(PREC, "$(PREC)")
     field(SCAN, "I/O Intr")
 }
@@ -49,10 +50,10 @@ record(ai,"$(P)$(R)MaxVelocity") {
 #
 # Readback of maximum acceleration
 #
-record(ai,"$(P)$(R)MaxAcceleration") {
-    field(DESC, "Axis $(AXIS) max acceleration")
+record(ai,"$(P)$(R)$(M)MaxAcceleration") {
+    field(DESC, "Axis $(ADDR) max acceleration")
     field(DTYP, "asynFloat64")
-    field(INP,  "@asyn($(PORT),$(AXIS),$(TIMEOUT))XPS_PROFILE_MAX_ACCELERATION")
+    field(INP,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))XPS_PROFILE_MAX_ACCELERATION")
     field(PREC, "$(PREC)")
     field(SCAN, "I/O Intr")
 }