From 29724c6997ecba8b9970860158384c3521d7645c Mon Sep 17 00:00:00 2001 From: "Sode, Adedamola (DLSLtd,RAL,LSCI)" Date: Tue, 25 Aug 2026 09:35:39 +0000 Subject: [PATCH 1/2] made the fastcs enitity generic --- techui-support.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/techui-support.yaml b/techui-support.yaml index bc0ffea..056ccf0 100644 --- a/techui-support.yaml +++ b/techui-support.yaml @@ -227,10 +227,14 @@ support_modules: # Detectors +<<<<<<< HEAD fastcs_eiger.EigerController: +======= + fastcs*: +>>>>>>> 0fc062f (made the fastcs enitity generic) prefix: "{{ id }}" macros: - id screens: - - file: "fastcs-eiger/eigerController.bob" - type: "embedded" + - file: "$(IOC)/{{ id }}.bob" + type: "related" From f7e8db5a7e9e00b9b701a6057683f10321dac851 Mon Sep 17 00:00:00 2001 From: "Sode, Adedamola (DLSLtd,RAL,LSCI)" Date: Fri, 28 Aug 2026 13:11:35 +0000 Subject: [PATCH 2/2] Removed git merge conflict --- techui-support.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/techui-support.yaml b/techui-support.yaml index 056ccf0..6b97b55 100644 --- a/techui-support.yaml +++ b/techui-support.yaml @@ -227,11 +227,7 @@ support_modules: # Detectors -<<<<<<< HEAD - fastcs_eiger.EigerController: -======= fastcs*: ->>>>>>> 0fc062f (made the fastcs enitity generic) prefix: "{{ id }}" macros: - id