Merge pull request #55 from epics-motor/issue54

Added homingCurrLimit. Fixes #54
epics-motor · Sep 28, 2023 · db3c0bd · db3c0bd
2 parents de7c903 + cb4b901
commit db3c0bd
Show file tree

Hide file tree

Showing 7 changed files with 594 additions and 40 deletions.
diff --git a/acsMotionApp/Db/SPiiPlusHoming.db b/acsMotionApp/Db/SPiiPlusHoming.db
@@ -50,3 +50,12 @@ record(ao,"$(P)$(M):homingOffsetNeg") {
     field(PREC, "$(PREC=4)")
     field(PINI, "YES")
 }
+
+record(ao,"$(P)$(M):homingCurrLimit") {
+    field(DESC, "Homing Current Limit")
+    field(DTYP, "asynFloat64")
+    field(OUT,  "@asyn($(PORT),$(ADDR))SPIIPLUS_HOMING_CURR_LIMIT")
+    field(VAL,  "$(CURR_LIMIT=0)")
+    field(PREC, "$(PREC=4)")
+    field(PINI, "YES")
+}
diff --git a/acsMotionApp/Db/SPiiPlusHoming_settings.req b/acsMotionApp/Db/SPiiPlusHoming_settings.req
@@ -2,3 +2,4 @@ $(P)$(M):homingMethod.VAL
 $(P)$(M):homingMaxDist.VAL
 $(P)$(M):homingOffsetPos.VAL
 $(P)$(M):homingOffsetNeg.VAL
+$(P)$(M):homingCurrLimit.VAL
diff --git a/acsMotionApp/op/adl/SPiiPlusAxisHoming.adl b/acsMotionApp/op/adl/SPiiPlusAxisHoming.adl
@@ -1,14 +1,14 @@
 
 file {
-	name="SPiiPlusAxisHoming.adl"
+	name="/home/beams3/KPETERSN/development/epics-motor/motorAcsMotion/acsMotionApp/op/adl/SPiiPlusAxisHoming.adl"
 	version=030111
 }
 display {
 	object {
-		x=748
-		y=302
-		width=400
-		height=400
+		x=739
+		y=294
+		width=350
+		height=200
 	}
 	clr=14
 	bclr=4
@@ -89,27 +89,157 @@ display {
 }
 text {
 	object {
-		x=16
-		y=32
+		x=124
+		y=3
 		width=100
-		height=17
+		height=14
 	}
 	"basic attribute" {
 		clr=14
-		fill="outline"
 	}
-	textix="Homing Method"
+	textix="($(P)$(M))"
+	align="horiz. centered"
 }
 menu {
 	object {
-		x=121
+		x=241
 		y=32
-		width=100
-		height=18
+		width=97
+		height=27
 	}
 	control {
 		chan="$(P)$(M):homingMethod.VAL"
 		clr=14
 		bclr=51
 	}
 }
+text {
+	object {
+		x=6
+		y=63
+		width=230
+		height=25
+	}
+	"basic attribute" {
+		clr=14
+		fill="outline"
+	}
+	textix="Homing Max Dist"
+	align="horiz. centered"
+}
+text {
+	object {
+		x=6
+		y=32
+		width=230
+		height=25
+	}
+	"basic attribute" {
+		clr=14
+		fill="outline"
+	}
+	textix="Homing Method"
+	align="horiz. centered"
+}
+text {
+	object {
+		x=6
+		y=94
+		width=230
+		height=25
+	}
+	"basic attribute" {
+		clr=14
+		fill="outline"
+	}
+	textix="Homing Offset Pos"
+	align="horiz. centered"
+}
+text {
+	object {
+		x=6
+		y=125
+		width=230
+		height=25
+	}
+	"basic attribute" {
+		clr=14
+		fill="outline"
+	}
+	textix="Homing Offset Neg"
+	align="horiz. centered"
+}
+text {
+	object {
+		x=6
+		y=156
+		width=230
+		height=25
+	}
+	"basic attribute" {
+		clr=14
+		fill="outline"
+	}
+	textix="Homing Curr Limit"
+	align="horiz. centered"
+}
+"text entry" {
+	object {
+		x=241
+		y=63
+		width=94
+		height=27
+	}
+	control {
+		chan="$(P)$(M):homingMaxDist.VAL"
+		clr=14
+		bclr=51
+	}
+	limits {
+	}
+}
+"text entry" {
+	object {
+		x=241
+		y=94
+		width=94
+		height=27
+	}
+	control {
+		chan="$(P)$(M):homingOffsetPos.VAL"
+		clr=14
+		bclr=51
+	}
+	limits {
+	}
+}
+"text entry" {
+	object {
+		x=241
+		y=125
+		width=94
+		height=27
+	}
+	control {
+		chan="$(P)$(M):homingOffsetNeg.VAL"
+		clr=14
+		bclr=51
+	}
+	limits {
+	}
+}
+"text entry" {
+	object {
+		x=241
+		y=156
+		width=94
+		height=27
+	}
+	control {
+		chan="$(P)$(M):homingCurrLimit.VAL"
+		clr=14
+		bclr=51
+	}
+	limits {
+	}
+}