Change the edm abort button to use blueapi

DiamondLightSource · Jul 19, 2024 · f87693d · f87693d
1 parent 314b3fb
commit f87693d
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 49 deletions.
diff --git a/src/mx_bluesky/I24/serial/extruder/EX-gui-edm/DiamondExtruder-I24-py3v1.edl b/src/mx_bluesky/I24/serial/extruder/EX-gui-edm/DiamondExtruder-I24-py3v1.edl
@@ -4,7 +4,7 @@ major 4
 minor 0
 release 1
 x 1018
-y 134
+y 277
 w 700
 h 900
 font "arial-medium-r-18.0"
@@ -856,31 +856,6 @@ value {
 autoSize
 endObjectProperties
 
-# (Message Button)
-object activeMessageButtonClass
-beginObjectProperties
-major 4
-minor 1
-release 0
-x 561
-y 400
-w 100
-h 40
-fgColor index 0
-onColor index 21
-offColor index 21
-topShadowColor index 1
-botShadowColor index 11
-controlPv "BL24I-EA-IOC-12:GP8"
-pressValue "1"
-releaseValue "1"
-onLabel "Abort"
-offLabel "Abort"
-toggle
-3d
-font "arial-medium-r-24.0"
-endObjectProperties
-
 # (Message Button)
 object activeMessageButtonClass
 beginObjectProperties
@@ -2275,3 +2250,25 @@ displayFileName {
 }
 endObjectProperties
 
+# (Shell Command)
+object shellCmdClass
+beginObjectProperties
+major 4
+minor 3
+release 0
+x 559
+y 399
+w 100
+h 40
+fgColor index 0
+bgColor index 21
+topShadowColor index 0
+botShadowColor index 11
+font "arial-medium-r-24.0"
+buttonLabel "Abort"
+numCmds 1
+command {
+  0 "blueapi -c CONFIG_LOCATION controller abort"
+}
+endObjectProperties
+
diff --git a/src/mx_bluesky/I24/serial/fixed_target/FT-gui-edm/DiamondChipI24-py3v1.edl b/src/mx_bluesky/I24/serial/fixed_target/FT-gui-edm/DiamondChipI24-py3v1.edl
@@ -4,7 +4,7 @@ major 4
 minor 0
 release 1
 x 2870
-y 208
+y 245
 w 1030
 h 950
 font "arial-medium-r-18.0"
@@ -1350,28 +1350,6 @@ value {
 autoSize
 endObjectProperties
 
-# (Shell Command)
-object shellCmdClass
-beginObjectProperties
-major 4
-minor 3
-release 0
-x 805
-y 730
-w 135
-h 50
-fgColor index 1
-bgColor index 20
-topShadowColor index 3
-botShadowColor index 14
-font "helvetica-bold-r-24.0"
-buttonLabel "Abort"
-numCmds 1
-command {
-  0 "caput ME14E-MO-IOC-01:GP9 1"
-}
-endObjectProperties
-
 # (Static Text)
 object activeXTextClass
 beginObjectProperties
@@ -4090,3 +4068,25 @@ displayFileName {
 }
 endObjectProperties
 
+# (Shell Command)
+object shellCmdClass
+beginObjectProperties
+major 4
+minor 3
+release 0
+x 800
+y 730
+w 135
+h 50
+fgColor index 0
+bgColor index 20
+topShadowColor index 0
+botShadowColor index 14
+font "helvetica-bold-r-24.0"
+buttonLabel "Abort"
+numCmds 1
+command {
+  0 "blueapi -c CONFIG_LOCATION controller abort"
+}
+endObjectProperties
+