From 062078a44fb7e4defc308fe0e77014ea8c613c33 Mon Sep 17 00:00:00 2001 From: Ollie Copping Date: Tue, 27 Jan 2026 09:50:47 +0000 Subject: [PATCH 1/2] Add manual control disabled text --- bob/zebraShutter/fastShutter.bob | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/bob/zebraShutter/fastShutter.bob b/bob/zebraShutter/fastShutter.bob index 28a2c5e..e23d91f 100644 --- a/bob/zebraShutter/fastShutter.bob +++ b/bob/zebraShutter/fastShutter.bob @@ -1,5 +1,5 @@ - + fastShutter 610 @@ -51,6 +51,16 @@ 290 186 true + + Label_9 + Not Default + Manual Control +Disabled + 255 + 150 + 1 + 1 + Choice Button_1 $(P):CTRL2 From 3c65af3ea31229c802c50a154768fa3578e20d87 Mon Sep 17 00:00:00 2001 From: Ollie Copping Date: Tue, 27 Jan 2026 09:54:31 +0000 Subject: [PATCH 2/2] Update fastShutter to use dls settings --- bob/zebraShutter/fastShutter.bob | 356 +++++++++++++++++++++++++++++-- 1 file changed, 338 insertions(+), 18 deletions(-) diff --git a/bob/zebraShutter/fastShutter.bob b/bob/zebraShutter/fastShutter.bob index e23d91f..030ee7a 100644 --- a/bob/zebraShutter/fastShutter.bob +++ b/bob/zebraShutter/fastShutter.bob @@ -1,29 +1,38 @@ - + fastShutter + 0 610 420 + + + + 5 5 Label TITLE Fast Shutter Control - $(P) - 0 - 0 610 31 - + - + - true - 1 + + + + + 0 + 0 + 0 + true Output Mode (SOFT IN1) @@ -31,12 +40,41 @@ 30 290 186 + + + + + + + + + + + + + true Choice Button $(P):CTRL1 - 255 - 150 + 250 + 145 + + + + + + + + + + + + + + + + false Item 1 @@ -50,6 +88,19 @@ 220 290 186 + + + + + + + + + + + + + true Label_9 @@ -57,15 +108,31 @@ Manual Control Disabled 255 - 150 + 145 1 1 Choice Button_1 $(P):CTRL2 - 255 - 150 + 250 + 145 + + + + + + + + + + + + + + + + false @@ -87,6 +154,19 @@ Disabled 30 290 186 + + + + + + + + + + + + + true Text Entry @@ -95,23 +175,63 @@ Disabled 7 120 30 + + + + + + + + + + + + + -1 + true + 1 + 1 + true + 1 + + + + Label_1 + Not Default deg 217 7 55 30 + + + + + + + + 1 Label_2 + Not Default Gate Start 7 7 86 30 + + + + + + + + 1 @@ -121,23 +241,63 @@ Disabled 42 120 30 + + + + + + + + + + + + + -1 + true + 1 + 1 + true + 1 + + + + Label_3 + Not Default deg 217 42 55 30 + + + + + + + + 1 Label_4 + Not Default Gate Width 7 42 86 30 + + + + + + + + 1 @@ -147,6 +307,18 @@ Disabled 62 82 125 + + + + + + + + + + + + Action Button_1 @@ -155,6 +327,18 @@ Disabled 17 117 105 + + + + + + + + + + + + Action Button_2 @@ -163,6 +347,18 @@ Disabled 132 117 105 + + + + + + + + + + + + @@ -171,41 +367,98 @@ Disabled 220 290 156 + + + + + + + + + + + + + true Text Update $(P):STA 137 32 - 110 + 108 30 - 1 + + + + + + + + + + + + + 1 + 1 + + + + Label_5 + Not Default Output 2 32 130 30 + + + + + + + + 1 Label_6 + Not Default Current Position 2 62 130 30 + + + + + + + + 1 Label_7 + Not Default Shutter Output 2 2 130 30 + + + + + + + + 1 @@ -213,26 +466,69 @@ Disabled $(ZEBRA):M2:RBV 137 62 - 120 + 108 30 - 1 + + + + + + + + + + + + + 1 + 1 + + + + Text Update_2 $(P):STOP:RBV 137 92 - 120 + 108 30 - 1 + + + + + + + + + + + + + 1 + 1 + + + + Label_8 + Not Default Stop Position Actual 2 92 130 30 + + + + + + + + 1 @@ -242,6 +538,18 @@ Disabled 5 24 24 + + + + + + + + + + + + @@ -251,6 +559,18 @@ Disabled 375 270 25 + + + + + + + + + + + + $(actions)