From 7487f9dbad5286c52d50ccdcf41b815a9bfe0b5e Mon Sep 17 00:00:00 2001 From: debenjak_l Date: Wed, 9 Jul 2025 11:19:07 +0200 Subject: [PATCH] adding FE panel --- X_X12SA.json | 4 ++-- X_X12SA_FE-tools.json | 45 ++++++++++++++++++++++++++++++++++++------- X_X12SA_OP-tools.json | 4 ++-- 3 files changed, 42 insertions(+), 11 deletions(-) diff --git a/X_X12SA.json b/X_X12SA.json index c31b95a..4b73234 100644 --- a/X_X12SA.json +++ b/X_X12SA.json @@ -36,14 +36,14 @@ "type": "caqtdm", "text": "Double Multilayer Mono", "panel": "X_X12SA_OP_DMM_User.ui", - "macros": "P=X12SA-OP-DMM1", + "macros": "P=X12SA-OP-DMM1,BML=X12SA", "param": "-noMsg -attach -stylefile slses.qss" }, { "type": "caqtdm", "text": "Channelcut Mono", "panel": "X_X12SA_OP_CCM_User.ui", - "macros": "P=X12SA-OP-CCM1", + "macros": "P=X12SA-OP-CCM1,BML=X12SA", "param": "-noMsg -attach -stylefile slses.qss" }, { diff --git a/X_X12SA_FE-tools.json b/X_X12SA_FE-tools.json index 98d2587..fbd2f22 100644 --- a/X_X12SA_FE-tools.json +++ b/X_X12SA_FE-tools.json @@ -1,14 +1,45 @@ { "menu": [ { - "type": "menu", - "text": "Front End Motors", - "file": "X_X12SA_FE-motors.json" + "type": "title", + "text": "Devices Panels" }, { - "type": "menu", - "text": "Front End Encoders", - "file": "X_X12SA_FE-encoder.json" + "type": "caqtdm", + "text": "XBPM1 Readout", + "panel": "X_FE_XBPM.ui", + "macros": "P=X12SA-FE-,R=XBPM1:", + "param": "-noMsg -attach -stylefile slses.qss" + }, + { + "type": "caqtdm", + "text": "XBPM1 Motors", + "panel": "motor2x.ui", + "macros": "P=X12SA-FE-XBPM1:,M1=TRX,M2=TRY", + "param": "-noMsg -attach -stylefile slses.qss" + + }, + { + "type": "caqtdm", + "text": "Slit Center and Size", + "panel": "motor4x.ui", + "macros": "P=X12SA-FE-SLDI1:,M1=CENTERX,M2=SIZEX,M3=CENTERY,M4=SIZEY", + "param": "-noMsg -attach -stylefile slses.qss" + + }, + { + "type": "separator" + }, + { + "type": "title", + "text": "Expert Panels" + }, + { + "type": "caqtdm", + "text": "Front End Motors", + "panel": "X12SA_FE_SLDI_Overview.ui", + "macros": "BML=X12SA", + "param": "-noMsg -attach -stylefile slses.qss" } ] -} \ No newline at end of file +} diff --git a/X_X12SA_OP-tools.json b/X_X12SA_OP-tools.json index d3eba6a..352dd61 100644 --- a/X_X12SA_OP-tools.json +++ b/X_X12SA_OP-tools.json @@ -22,14 +22,14 @@ "type": "caqtdm", "text": "Double Multilayer Mono", "panel": "X_X12SA_OP_DMM_Axes.ui", - "macros": "IOC=X12SA-CPCL-DMM,DEV=X12SA-OP-DMM1", + "macros": "IOC=X12SA-CPCL-DMM,DEV=X12SA-OP-DMM1,BML=X12SA", "param": "-noMsg -attach -stylefile slses.qss" }, { "type": "caqtdm", "text": "Channelcut Mono", "panel": "X_X12SA_OP_CCM_Axes.ui", - "macros": "IOC=X12SA-CPCL-CCM,DEV=X12SA-OP-CCM1", + "macros": "IOC=X12SA-CPCL-CCM,DEV=X12SA-OP-CCM1,BML=X12SA", "param": "-noMsg -attach -stylefile slses.qss" }, {