fix issues with PREC in direct motor PVs

DiamondLightSource · May 23, 2018 · 7db76cc · 7db76cc
1 parent 3310482
commit 7db76cc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/etc/makeIocs/lab-ppmac.xml b/etc/makeIocs/lab-ppmac.xml
@@ -52,7 +52,7 @@
 	<pmac.pmacDisableLimitsCheck Axis="6" Controller="Brick"/>
 	<pmac.pmacDisableLimitsCheck Axis="7" Controller="Brick"/>
 	<pmac.pmacDisableLimitsCheck Axis="8" Controller="Brick"/>
-	<!--<pmac.autohome GRP2="Axis1" P="PMAC_BRICK_TEST" PLC="10" PORT="Brick" name="HOME"/>-->
+	<pmac.autohome GRP2="Axis1" GRP3="Axis2" GRP4="Axis3" GRP5="Axes4-8" P="PMAC_BRICK_TEST" PLC="10" PORT="Brick" name="HOME"/>
 	<pmac.pmacSetCoordStepsPerUnit Axis="1" CS="CS2" Scale="1000"/>
 	<pmac.pmacSetCoordStepsPerUnit Axis="2" CS="CS2" Scale="100"/>
 </components>
diff --git a/pmacApp/Db/pmacDirectMotor.template b/pmacApp/Db/pmacDirectMotor.template
@@ -17,6 +17,7 @@
 # % macro, ADDR, The asyn address (real or CS axis number)
 # % macro, DESC, Description
 # % macro, PMAC, PV Prefix for the motor controller
+# % macro, P, PV Prefix for direct motors
 # % macro, M, Motor PV suffix ('Mx' for real and 'CSx:My' for CS axes)
 
 ##############################################################
@@ -25,6 +26,7 @@
 record(ao, "$(P)$(M):DirectDemand")
 {
     field(FLNK, "$(P)$(M):DirectCountsCalc.PROC")
+    field(PREC, 4)
 }
 
 record(scalcout, "$(P)$(M):DirectCountsCalc")
@@ -121,6 +123,7 @@ record(scalcout, "$(P)$(M):Mres")
     field(VAL, 1)
     field(PINI, "YES")
     field(OUT,  "$(P)$(M):MresDrv PP")
+    field(PREC, 6)
 }
 
 record(ao,"$(P)$(M):MresDrv") {
@@ -144,6 +147,7 @@ record(scalcout, $(P)$(M):Offset)
     field(CALC, "A")
     field(PINI, "YES")
     field(OUT,  "$(P)$(M):OffsetDrv PP")
+    field(PREC, 4)
 }
 
 

diff --git a/pmacApp/opi/edl/pmacCsAxis.edl b/pmacApp/opi/edl/pmacCsAxis.edl
@@ -3,8 +3,8 @@ beginScreenProperties
 major 4
 minor 0
 release 1
-x 356
-y 287
+x 1211
+y 591
 w 300
 h 20
 font "arial-bold-r-12.0"
@@ -35,8 +35,6 @@ y 0
 w 85
 h 20
 controlPv "$(pmac):CS$(CS):M$(axis):Mres"
-displayMode "decimal"
-precision 6
 fgColor index 16
 fgAlarm
 bgColor index 10
@@ -72,12 +70,11 @@ beginObjectProperties
 major 10
 minor 0
 release 0
-x 220
+x 215
 y 0
-w 70
+w 80
 h 20
 controlPv "$(pmac):CS$(CS):M$(axis):Offset"
-displayMode "decimal"
 fgColor index 16
 fgAlarm
 bgColor index 10