From a42c3b8fa8f52cede1616c5e8d8ada0a05628252 Mon Sep 17 00:00:00 2001 From: Adam Howell Date: Mon, 23 Jan 2023 11:04:25 +0000 Subject: [PATCH 1/3] Removed unused ADPilatus param from ADAndor3 --- malcolm/modules/ADAndor3/blocks/ADAndor3_runnable_block.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/malcolm/modules/ADAndor3/blocks/ADAndor3_runnable_block.yaml b/malcolm/modules/ADAndor3/blocks/ADAndor3_runnable_block.yaml index 3129d59d5..c327909cf 100644 --- a/malcolm/modules/ADAndor3/blocks/ADAndor3_runnable_block.yaml +++ b/malcolm/modules/ADAndor3/blocks/ADAndor3_runnable_block.yaml @@ -29,10 +29,6 @@ mri: $(mri_prefix) config_dir: $(config_dir) -- ADPilatus.blocks.ADPilatus_driver_block: - mri: $(mri_prefix):DRV - prefix: $(pv_prefix):CAM - - ADCore.parts.DetectorDriverPart: name: $(detector_name) mri: $(mri_prefix):DRV From 6a923a298e52a1b90d5dcb8f16a4363015dc85fa Mon Sep 17 00:00:00 2001 From: Adam Howell Date: Mon, 23 Jan 2023 15:06:43 +0000 Subject: [PATCH 2/3] Renamed ADAndor3 driver_block --- malcolm/modules/ADAndor3/blocks/ADAndor3_runnable_block.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/malcolm/modules/ADAndor3/blocks/ADAndor3_runnable_block.yaml b/malcolm/modules/ADAndor3/blocks/ADAndor3_runnable_block.yaml index c327909cf..bb6a339b1 100644 --- a/malcolm/modules/ADAndor3/blocks/ADAndor3_runnable_block.yaml +++ b/malcolm/modules/ADAndor3/blocks/ADAndor3_runnable_block.yaml @@ -29,6 +29,10 @@ mri: $(mri_prefix) config_dir: $(config_dir) +- ADCore.blocks.ADAndor3_driver_block: + mri: $(mri_prefix):DRV + prefix: $(pv_prefix):CAM + - ADCore.parts.DetectorDriverPart: name: $(detector_name) mri: $(mri_prefix):DRV From 88ad7b93b49eea63c14731a2adeb689033f9dfd7 Mon Sep 17 00:00:00 2001 From: Adam Howell Date: Mon, 23 Jan 2023 15:21:05 +0000 Subject: [PATCH 3/3] Fixed typo with ADAndor3_driver_block --- malcolm/modules/ADAndor3/blocks/ADAndor3_runnable_block.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/malcolm/modules/ADAndor3/blocks/ADAndor3_runnable_block.yaml b/malcolm/modules/ADAndor3/blocks/ADAndor3_runnable_block.yaml index bb6a339b1..6b96abad0 100644 --- a/malcolm/modules/ADAndor3/blocks/ADAndor3_runnable_block.yaml +++ b/malcolm/modules/ADAndor3/blocks/ADAndor3_runnable_block.yaml @@ -29,7 +29,7 @@ mri: $(mri_prefix) config_dir: $(config_dir) -- ADCore.blocks.ADAndor3_driver_block: +- ADAndor3.blocks.ADAndor3_driver_block: mri: $(mri_prefix):DRV prefix: $(pv_prefix):CAM