From 15d69917a44a6d3c21ca38186a9be924e4c16347 Mon Sep 17 00:00:00 2001 From: Xiaoqiang Wang Date: Tue, 6 Dec 2022 10:09:44 +0100 Subject: [PATCH] update caqtdm panel names --- X_X04SA_ES2_top_menu.json | 8 +------- X_X04SA_ES3_motors.json | 6 +++--- X_X04SA_ES3_top_menu.json | 2 +- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/X_X04SA_ES2_top_menu.json b/X_X04SA_ES2_top_menu.json index 3562004..acc6ce0 100644 --- a/X_X04SA_ES2_top_menu.json +++ b/X_X04SA_ES2_top_menu.json @@ -58,16 +58,10 @@ "text": "Sample Spinner", "command": "caqtdm -x -attach -noMsg -dg +300+100 -macro P=X04SA-ES2-,M=SM:ROX,T1=PD,T2=Spinner X_X04SA_spinner_small.ui" }, - { - "type": "cmd", - "text": "On-the-Fly", - "command": "caqtdm -x -attach -noMsg -dg +100+550 -macro P=X04SA-ES2-OTF G_OTFSCAN_user.ui", - "style": "color: black;background-color: #7300ff006b00;" - }, { "type": "cmd", "text": "Sample Camera", - "command": "caqtdm -x -attach -noMsg -macro P=X04SA-ES2-SAMCAM:,R=cam1: prosilica_MX.ui" + "command": "caqtdm -x -attach -noMsg -macro P=X04SA-ES2-SAMCAM:,R=cam1: prosilica.ui" }, { "type": "cmd", diff --git a/X_X04SA_ES3_motors.json b/X_X04SA_ES3_motors.json index 8701dec..d236402 100644 --- a/X_X04SA_ES3_motors.json +++ b/X_X04SA_ES3_motors.json @@ -100,12 +100,12 @@ { "type": "cmd", "text": "Motor 1", - "command": "caqtdm -x -attach -noMsg -dg +100+100 -macro P=X04SA-ES3-,M=USER:MOT1 G_DRV_motor_mp.ui" + "command": "caqtdm -x -attach -noMsg -dg +100+100 -macro P=X04SA-ES3-,M=USER:MOT1 motorx_all.ui" }, { "type": "cmd", "text": "Motor 2", - "command": "caqtdm -x -attach -noMsg -dg +120+120 -macro P=X04SA-ES3-,M=USER:MOT2 G_DRV_motor_mp.ui" + "command": "caqtdm -x -attach -noMsg -dg +120+120 -macro P=X04SA-ES3-,M=USER:MOT2 motorx_all.ui" } ] -} \ No newline at end of file +} diff --git a/X_X04SA_ES3_top_menu.json b/X_X04SA_ES3_top_menu.json index f0f9cbc..5c9b76b 100644 --- a/X_X04SA_ES3_top_menu.json +++ b/X_X04SA_ES3_top_menu.json @@ -44,7 +44,7 @@ { "type": "cmd", "text": "Eiger Control Panel", - "command": "caqtdm -x -attach -noMsg -dg +255+350 -macro P=X04SA-ES3-EIGER:,R=cam1: slsDetector5.ui" + "command": "caqtdm -x -attach -noMsg -dg +255+350 -macro P=X04SA-ES3-EIGER:,R=cam1: slsDetector.ui" }, { "type": "cmd",