Merge pull request #40 from epics-motor/show-encoder-errors

Made the ENC and ENC2 bits of the FAULT status available as PVs
epics-motor · Feb 8, 2023 · 4e0273e · 4e0273e
2 parents 2cfc752 + 47daec5
commit 4e0273e
Show file tree

Hide file tree

Showing 5 changed files with 399 additions and 56 deletions.
diff --git a/acsMotionApp/Db/SPiiPlusFeedback.db b/acsMotionApp/Db/SPiiPlusFeedback.db
@@ -132,3 +132,23 @@ record(ai,"$(P)$(M):E_AOFFS") {
 #!    field(PINI, "1")
 #!    field(SCAN, "$(SCAN=2)")
 #!}
+
+record(bi,"$(P)$(M):FAULT:ENC") {
+    field(DESC, "Encoder Fault")
+    field(DTYP, "asynInt32")
+    field(INP,  "@asyn($(PORT),$(ADDR))SPIIPLUS_ENC_FAULT")
+    field(ZNAM, "OK")
+    field(ONAM, "ERROR")
+    field(PINI, "1")
+    field(SCAN, "$(SCAN=2)")
+}
+
+record(bi,"$(P)$(M):FAULT:ENC2") {
+    field(DESC, "Encoder 2 Fault")
+    field(DTYP, "asynInt32")
+    field(INP,  "@asyn($(PORT),$(ADDR))SPIIPLUS_ENC2_FAULT")
+    field(ZNAM, "OK")
+    field(ONAM, "ERROR")
+    field(PINI, "1")
+    field(SCAN, "$(SCAN=2)")
+}
diff --git a/acsMotionApp/op/adl/SPiiPlusFeedback.adl b/acsMotionApp/op/adl/SPiiPlusFeedback.adl
@@ -1,12 +1,12 @@
 
 file {
-	name="SPiiPlusFeedback.adl"
+	name="/home/beams3/KPETERSN/development/epics-motor/motorAcsMotion/acsMotionApp/op/adl/SPiiPlusFeedback.adl"
 	version=030111
 }
 display {
 	object {
-		x=247
-		y=109
+		x=238
+		y=101
 		width=680
 		height=250
 	}
@@ -645,6 +645,19 @@ composite {
 		}
 	}
 }
+text {
+	object {
+		x=10
+		y=10
+		width=390
+		height=29
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="$(P)$(M) feedback parameters"
+	align="horiz. centered"
+}
 composite {
 	object {
 		x=46
@@ -856,16 +869,96 @@ composite {
 		}
 	}
 }
-text {
+composite {
 	object {
-		x=100
-		y=10
-		width=500
-		height=29
+		x=421
+		y=12
+		width=225
+		height=45
 	}
-	"basic attribute" {
-		clr=14
+	"composite name"=""
+	children {
+		composite {
+			object {
+				x=546
+				y=12
+				width=100
+				height=45
+			}
+			"composite name"=""
+			children {
+				"text update" {
+					object {
+						x=546
+						y=37
+						width=100
+						height=20
+					}
+					monitor {
+						chan="$(P)$(M):FAULT:ENC2.VAL"
+						clr=54
+						bclr=4
+					}
+					align="horiz. centered"
+					format="string"
+					limits {
+					}
+				}
+				text {
+					object {
+						x=546
+						y=12
+						width=100
+						height=20
+					}
+					"basic attribute" {
+						clr=14
+					}
+					textix="FAULT:ENC2"
+					align="horiz. centered"
+				}
+			}
+		}
+		composite {
+			object {
+				x=421
+				y=12
+				width=100
+				height=45
+			}
+			"composite name"=""
+			children {
+				text {
+					object {
+						x=421
+						y=12
+						width=100
+						height=20
+					}
+					"basic attribute" {
+						clr=14
+					}
+					textix="FAULT:ENC"
+					align="horiz. centered"
+				}
+				"text update" {
+					object {
+						x=421
+						y=37
+						width=100
+						height=20
+					}
+					monitor {
+						chan="$(P)$(M):FAULT:ENC.VAL"
+						clr=54
+						bclr=4
+					}
+					align="horiz. centered"
+					format="string"
+					limits {
+					}
+				}
+			}
+		}
 	}
-	textix="$(P)$(M) feedback parameters"
-	align="horiz. centered"
 }