From d1af3ec8e40f6cbfcd85c6577104362148ded877 Mon Sep 17 00:00:00 2001
From: Xiaoqiang Wang <xiaoqiangwang@gmail.com>
Date: Mon, 16 Jun 2025 12:42:00 +0200
Subject: [PATCH] FE: update to SLS2

---
 X_X04SA.json             |  2 +-
 X_X04SA_FE_motors.json   | 28 +++++++++++++++++++---------
 X_X04SA_FE_top_menu.json | 39 +++++++--------------------------------
 3 files changed, 27 insertions(+), 42 deletions(-)

diff --git a/X_X04SA.json b/X_X04SA.json
index 2debd0b..c700767 100644
--- a/X_X04SA.json
+++ b/X_X04SA.json
@@ -68,7 +68,7 @@
         },
         {
             "type": "menu",
-            "text": "Undulator + FE",
+            "text": "FrontEnd",
             "file": "X_X04SA_FE_top_menu.json"
         },
         {
diff --git a/X_X04SA_FE_motors.json b/X_X04SA_FE_motors.json
index 58da9f3..8e5316d 100644
--- a/X_X04SA_FE_motors.json
+++ b/X_X04SA_FE_motors.json
@@ -6,23 +6,33 @@
         },
         {
             "type": "cmd",
-            "text": "FE BM1 (Vert.)",
-            "command": "caqtdm -x -attach -noMsg -dg +670+130 -macro P=X04SA-FE-,M=BM1:TRV motorx_du.ui"
+            "text": "XBPM1 X",
+            "command": "caqtdm -x -attach -noMsg -macro SYS=X04SA-FE-XBPM1,Axis=TRX ecmcAxisExpert_v2.ui"
         },
         {
             "type": "cmd",
-            "text": "FE BM1 (Horz.)",
-            "command": "caqtdm -x -attach -noMsg -dg +410+130 -macro P=X04SA-FE-,M=BM1:TRH motorx_wr.ui"
+            "text": "XBPM1 Y",
+            "command": "caqtdm -x -attach -noMsg -macro SYS=X04SA-FE-XBPM1,Axis=TRY ecmcAxisExpert_v2.ui"
         },
         {
             "type": "cmd",
-            "text": "FE BM2 (Vert.)",
-            "command": "caqtdm -x -attach -noMsg -dg +540+030 -macro P=X04SA-FE-,M=BM2:TRV motorx_du.ui"
+            "text": "SLDI 1 X-ring",
+            "command": "caqtdm -x -attach -noMsg -macro SYS=X04SA-FE-SLDI,Axis=TRXR ecmcAxisExpert_v2.ui"
         },
         {
             "type": "cmd",
-            "text": "FE BM2 (Horz.)",
-            "command": "caqtdm -x -attach -noMsg -dg +540+260 -macro P=X04SA-FE-,M=BM2:TRH motorx_wr.ui"
+            "text": "SLDI 1 Y-bottom",
+            "command": "caqtdm -x -attach -noMsg -macro SYS=X04SA-FE-SLDI,Axis=TRYB ecmcAxisExpert_v2.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "SLDI 2 X-wall",
+            "command": "caqtdm -x -attach -noMsg -macro SYS=X04SA-FE-SLDI,Axis=TRXW ecmcAxisExpert_v2.ui"
+        },
+        {
+            "type": "cmd",
+            "text": "SLDI 2 Y-top",
+            "command": "caqtdm -x -attach -noMsg -macro SYS=X04SA-FE-SLDI,Axis=TRYT ecmcAxisExpert_v2.ui"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/X_X04SA_FE_top_menu.json b/X_X04SA_FE_top_menu.json
index 6d87b87..0b1d7ec 100644
--- a/X_X04SA_FE_top_menu.json
+++ b/X_X04SA_FE_top_menu.json
@@ -4,50 +4,25 @@
     },
     "menu": [
         {
-            "type": "title",
-            "text": "Undulator"
+            "type": "cmd",
+            "text": "XBPM 1 readout",
+            "command": "caqtdm -x -attach -noMsg -macro \"P=X04SA-FE-,R=XBPM1:,\" X_FE_XBPM.ui"
         },
         {
             "type": "cmd",
-            "text": "Gap",
-            "command": "caqtdm -x -attach -noMsg -dg +500+170 -stylefile slses.qss -macro DEVICE=X04SA-UIND Gap.ui"
+            "text": "XBPM 1 motors",
+            "command": "caqtdm -x -attach -noMsg -macro \"P=X04SA-FE-XBPM1:,M1=TRX,M2=TRY\" motor2x.ui"
         },
         {
             "type": "cmd",
-            "text": "Cooling",
-            "command": "caqtdm -x -attach -noMsg X_ID_X04SA_Cooling.ui"
-        },
-        {
-            "type": "title",
-            "text": "Fontend"
-        },
-        {
-            "type": "cmd",
-            "text": "XBPM1",
-            "command": "caqtdm -x -attach -noMsg -macro \"XBPM=X04SA-FE-XBPM1,BML=X04SA,ID=ID\" X_XBPM_xbpm_new2.ui"
-        },
-        {
-            "type": "cmd",
-            "text": "XBPM2",
-            "command": "caqtdm -x -attach -noMsg -macro \"XBPM=X04SA-FE-XBPM2,BML=X04SA,ID-ID\" X_XBPM_xbpm_new2.ui"
+            "text": "Slits Center and Size",
+            "command": "caqtdm -x -attach -noMsg -macro \"P=X04SA-FE-SLDI:,M1=CENTERX,M2=SIZEX,M3=CENTERY,M4=SIZEY\" motor4x.ui"
         },
         {
             "type": "menu",
             "text": "Motors",
             "file": "X_X04SA_FE_motors.json",
             "style": "color: blue;"
-        },
-        {
-            "type": "separator"
-        },
-        {
-            "type": "title",
-            "text": "Exp Hutch 1"
-        },
-        {
-            "type": "menu",
-            "text": "EH1 Slits",
-            "file": "X_X04SA_EH1_slits.json"
         }
     ]
 }