From d112ab1035f42d7ef7c50ba15881475dc30ab961 Mon Sep 17 00:00:00 2001
From: Ollie Copping <oliver.copping@diamond.ac.uk>
Date: Wed, 5 Aug 2026 13:32:05 +0100
Subject: [PATCH 1/2] Add generic BPM screens

---
 bob/bpm/bpm_embed.bob | 225 +++++++++++++++++
 bob/bpm/bpm_setup.bob | 561 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 786 insertions(+)
 create mode 100644 bob/bpm/bpm_embed.bob
 create mode 100644 bob/bpm/bpm_setup.bob

diff --git a/bob/bpm/bpm_embed.bob b/bob/bpm/bpm_embed.bob
new file mode 100644
index 0000000..d3ff407
--- /dev/null
+++ b/bob/bpm/bpm_embed.bob
@@ -0,0 +1,225 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Saved on 2026-08-05 11:27:34 by ryi58813-->
+<display version="2.0.0">
+  <name>bpm_embed</name>
+  <width>220</width>
+  <height>120</height>
+  <background_color>
+    <color name="Read_Background" red="240" green="240" blue="240">
+    </color>
+  </background_color>
+  <grid_color>
+    <color red="127" green="127" blue="127">
+    </color>
+  </grid_color>
+  <widget type="group" version="3.0.0">
+    <name>$(label)</name>
+    <width>220</width>
+    <height>120</height>
+    <font>
+      <font family="Arial" style="REGULAR" size="15.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color red="29" green="41" blue="69">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="Read_Background" red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <widget type="action_button" version="3.0.0">
+      <name>Open PVI</name>
+      <actions>
+        <action type="open_display">
+          <description>Open Display</description>
+          <file>bpm_setup.bob</file>
+          <macros>
+            <bpm>$(bpm)</bpm>
+          </macros>
+          <target>tab</target>
+        </action>
+      </actions>
+      <text>More</text>
+      <x>20</x>
+      <y>60</y>
+      <width>70</width>
+      <height>20</height>
+      <font>
+        <font family="Arial" style="REGULAR" size="14.0">
+        </font>
+      </font>
+      <foreground_color>
+        <color red="255" green="255" blue="255">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color red="29" green="41" blue="69">
+        </color>
+      </background_color>
+      <tooltip>$(actions)</tooltip>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Readback PV</name>
+      <pv_name>$(bpm):INTEN</pv_name>
+      <x>20</x>
+      <width>70</width>
+      <height>15</height>
+      <font>
+        <font family="Arial" style="REGULAR" size="14.0">
+        </font>
+      </font>
+      <background_color>
+        <color red="184" green="195" blue="223">
+        </color>
+      </background_color>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <border_color>
+        <color red="196" green="196" blue="196">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="xyplot" version="3.0.0">
+      <name>X/Y Plot</name>
+      <x>100</x>
+      <width>80</width>
+      <height>80</height>
+      <title_font>
+        <font name="Comment" family="Liberation Sans" style="ITALIC" size="14.0">
+        </font>
+      </title_font>
+      <show_legend>false</show_legend>
+      <x_axis>
+        <title></title>
+        <autoscale>false</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>-3.0</minimum>
+        <maximum>3.0</maximum>
+        <show_grid>false</show_grid>
+        <title_font>
+          <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font family="Liberation Sans" style="REGULAR" size="10.0">
+          </font>
+        </scale_font>
+        <visible>true</visible>
+      </x_axis>
+      <y_axes>
+        <y_axis>
+          <title></title>
+          <autoscale>false</autoscale>
+          <log_scale>false</log_scale>
+          <minimum>-3.0</minimum>
+          <maximum>3.0</maximum>
+          <show_grid>false</show_grid>
+          <title_font>
+            <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+            </font>
+          </title_font>
+          <scale_font>
+            <font family="Liberation Sans" style="REGULAR" size="10.0">
+            </font>
+          </scale_font>
+          <on_right>false</on_right>
+          <visible>true</visible>
+          <color>
+            <color name="Text" red="0" green="0" blue="0">
+            </color>
+          </color>
+        </y_axis>
+      </y_axes>
+      <traces>
+        <trace>
+          <name></name>
+          <x_pv>$(bpm):XPOS</x_pv>
+          <y_pv>$(bpm):YPOS</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>0</trace_type>
+          <color>
+            <color red="0" green="0" blue="255">
+            </color>
+          </color>
+          <line_width>0</line_width>
+          <line_style>0</line_style>
+          <point_type>2</point_type>
+          <point_size>1</point_size>
+          <visible>false</visible>
+        </trace>
+      </traces>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Readback PV_1</name>
+      <pv_name>$(bpm):XPOS</pv_name>
+      <x>20</x>
+      <y>20</y>
+      <width>70</width>
+      <height>15</height>
+      <font>
+        <font family="Arial" style="REGULAR" size="14.0">
+        </font>
+      </font>
+      <background_color>
+        <color red="184" green="195" blue="223">
+        </color>
+      </background_color>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <border_color>
+        <color red="196" green="196" blue="196">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Readback PV_2</name>
+      <pv_name>$(bpm):YPOS</pv_name>
+      <x>20</x>
+      <y>40</y>
+      <width>70</width>
+      <height>15</height>
+      <font>
+        <font family="Arial" style="REGULAR" size="14.0">
+        </font>
+      </font>
+      <background_color>
+        <color red="184" green="195" blue="223">
+        </color>
+      </background_color>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <border_color>
+        <color red="196" green="196" blue="196">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label</name>
+      <text>I</text>
+      <width>15</width>
+      <height>15</height>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_1</name>
+      <text>X</text>
+      <y>20</y>
+      <width>15</width>
+      <height>15</height>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_2</name>
+      <text>Y#</text>
+      <y>40</y>
+      <width>15</width>
+      <height>15</height>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+  </widget>
+</display>
diff --git a/bob/bpm/bpm_setup.bob b/bob/bpm/bpm_setup.bob
new file mode 100644
index 0000000..117b348
--- /dev/null
+++ b/bob/bpm/bpm_setup.bob
@@ -0,0 +1,561 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Saved on 2026-08-05 13:31:26 by ryi58813-->
+<display version="2.0.0">
+  <name>bpm_setup</name>
+  <width>510</width>
+  <height>265</height>
+  <background_color>
+    <color name="Read_Background" red="240" green="240" blue="240">
+    </color>
+  </background_color>
+  <grid_color>
+    <color red="127" green="127" blue="127">
+    </color>
+  </grid_color>
+  <grid_step_x>5</grid_step_x>
+  <grid_step_y>5</grid_step_y>
+  <widget type="group" version="3.0.0">
+    <name>Inputs</name>
+    <width>260</width>
+    <height>135</height>
+    <font>
+      <font family="Arial" style="REGULAR" size="15.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color red="29" green="41" blue="69">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="Read_Background" red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <widget type="textupdate" version="2.0.0">
+      <name>Readback PV</name>
+      <pv_name>$(bpm):BPMI1</pv_name>
+      <x>140</x>
+      <width>80</width>
+      <font>
+        <font family="Arial" style="REGULAR" size="14.0">
+        </font>
+      </font>
+      <background_color>
+        <color red="184" green="195" blue="223">
+        </color>
+      </background_color>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <border_color>
+        <color red="196" green="196" blue="196">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Readback PV_1</name>
+      <pv_name>$(bpm):BPMI2</pv_name>
+      <x>140</x>
+      <y>25</y>
+      <width>80</width>
+      <font>
+        <font family="Arial" style="REGULAR" size="14.0">
+        </font>
+      </font>
+      <background_color>
+        <color red="184" green="195" blue="223">
+        </color>
+      </background_color>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <border_color>
+        <color red="196" green="196" blue="196">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Readback PV_2</name>
+      <pv_name>$(bpm):BPMI3</pv_name>
+      <x>140</x>
+      <y>50</y>
+      <width>80</width>
+      <font>
+        <font family="Arial" style="REGULAR" size="14.0">
+        </font>
+      </font>
+      <background_color>
+        <color red="184" green="195" blue="223">
+        </color>
+      </background_color>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <border_color>
+        <color red="196" green="196" blue="196">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Readback PV_3</name>
+      <pv_name>$(bpm):BPMI4</pv_name>
+      <x>140</x>
+      <y>75</y>
+      <width>80</width>
+      <font>
+        <font family="Arial" style="REGULAR" size="14.0">
+        </font>
+      </font>
+      <background_color>
+        <color red="184" green="195" blue="223">
+        </color>
+      </background_color>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <border_color>
+        <color red="196" green="196" blue="196">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label</name>
+      <text>A</text>
+      <x>120</x>
+      <width>20</width>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_1</name>
+      <text>B</text>
+      <x>120</x>
+      <y>25</y>
+      <width>20</width>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_2</name>
+      <text>C</text>
+      <x>120</x>
+      <y>50</y>
+      <width>20</width>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_3</name>
+      <text>D</text>
+      <x>120</x>
+      <y>75</y>
+      <width>20</width>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="group" version="3.0.0">
+      <name>Group</name>
+      <y>10</y>
+      <width>115</width>
+      <height>80</height>
+      <style>3</style>
+      <transparent>true</transparent>
+      <widget type="ellipse" version="2.0.0">
+        <name>Ellipse</name>
+        <x>50</x>
+        <width>65</width>
+        <height>65</height>
+        <line_width>2</line_width>
+        <line_color>
+          <color name="Text" red="0" green="0" blue="0">
+          </color>
+        </line_color>
+        <background_color>
+          <color red="255" green="212" blue="0">
+          </color>
+        </background_color>
+      </widget>
+      <widget type="polyline" version="2.0.0">
+        <name>Polyline</name>
+        <x>50</x>
+        <y>33</y>
+        <width>63</width>
+        <height>1</height>
+        <points>
+          <point x="0.0" y="0.0">
+          </point>
+          <point x="63.0" y="0.0">
+          </point>
+        </points>
+        <line_width>2</line_width>
+        <line_color>
+          <color name="Text" red="0" green="0" blue="0">
+          </color>
+        </line_color>
+      </widget>
+      <widget type="polyline" version="2.0.0">
+        <name>Polyline_1</name>
+        <x>82</x>
+        <width>1</width>
+        <height>63</height>
+        <points>
+          <point x="0.0" y="0.0">
+          </point>
+          <point x="0.0" y="63.0">
+          </point>
+        </points>
+        <line_width>2</line_width>
+        <line_color>
+          <color name="Text" red="0" green="0" blue="0">
+          </color>
+        </line_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label_4</name>
+        <text>X+</text>
+        <x>30</x>
+        <y>20</y>
+        <width>20</width>
+        <horizontal_alignment>1</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label_5</name>
+        <text>A</text>
+        <x>65</x>
+        <y>15</y>
+        <width>20</width>
+        <horizontal_alignment>1</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label_6</name>
+        <text>B</text>
+        <x>80</x>
+        <y>15</y>
+        <width>20</width>
+        <horizontal_alignment>1</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label_7</name>
+        <text>C</text>
+        <x>80</x>
+        <y>30</y>
+        <width>20</width>
+        <horizontal_alignment>1</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label_8</name>
+        <text>D</text>
+        <x>65</x>
+        <y>30</y>
+        <width>20</width>
+        <horizontal_alignment>1</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+      </widget>
+      <widget type="polygon" version="2.0.0">
+        <name>Polygon</name>
+        <x>35</x>
+        <y>45</y>
+        <width>35</width>
+        <height>35</height>
+        <points>
+          <point x="10.0" y="35.0">
+          </point>
+          <point x="25.0" y="15.0">
+          </point>
+          <point x="30.0" y="20.0">
+          </point>
+          <point x="35.0" y="0.0">
+          </point>
+          <point x="15.0" y="5.0">
+          </point>
+          <point x="20.0" y="10.0">
+          </point>
+          <point x="0.0" y="25.0">
+          </point>
+        </points>
+        <line_width>2</line_width>
+        <background_color>
+          <color name="Write_Background" red="128" green="255" blue="255">
+          </color>
+        </background_color>
+      </widget>
+      <widget type="label" version="2.0.0">
+        <name>Label_9</name>
+        <text>Beam</text>
+        <y>50</y>
+        <width>40</width>
+        <horizontal_alignment>1</horizontal_alignment>
+        <vertical_alignment>1</vertical_alignment>
+      </widget>
+    </widget>
+  </widget>
+  <widget type="group" version="3.0.0">
+    <name>Parameters</name>
+    <x>250</x>
+    <width>260</width>
+    <height>135</height>
+    <font>
+      <font family="Arial" style="REGULAR" size="15.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color red="29" green="41" blue="69">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="Read_Background" red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <widget type="label" version="2.0.0">
+      <name>Label_10</name>
+      <text>A</text>
+      <width>20</width>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_11</name>
+      <text>B</text>
+      <y>25</y>
+      <width>20</width>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_12</name>
+      <text>C</text>
+      <y>50</y>
+      <width>20</width>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_13</name>
+      <text>D</text>
+      <y>75</y>
+      <width>20</width>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="textentry" version="3.0.0">
+      <name>Text Entry</name>
+      <pv_name>$(bpm):DA</pv_name>
+      <x>20</x>
+      <width>80</width>
+    </widget>
+    <widget type="textentry" version="3.0.0">
+      <name>Text Entry_1</name>
+      <pv_name>$(bpm):DA</pv_name>
+      <x>20</x>
+      <y>25</y>
+      <width>80</width>
+    </widget>
+    <widget type="textentry" version="3.0.0">
+      <name>Text Entry_2</name>
+      <pv_name>$(bpm):DA</pv_name>
+      <x>20</x>
+      <y>50</y>
+      <width>80</width>
+    </widget>
+    <widget type="textentry" version="3.0.0">
+      <name>Text Entry_3</name>
+      <pv_name>$(bpm):DA</pv_name>
+      <x>20</x>
+      <y>75</y>
+      <width>80</width>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_20</name>
+      <text>KX</text>
+      <x>110</x>
+      <width>25</width>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="textentry" version="3.0.0">
+      <name>Text Entry_4</name>
+      <pv_name>$(bpm):KX</pv_name>
+      <x>135</x>
+      <width>80</width>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_21</name>
+      <text>KY</text>
+      <x>110</x>
+      <y>25</y>
+      <width>25</width>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="textentry" version="3.0.0">
+      <name>Text Entry_5</name>
+      <pv_name>$(bpm):KY</pv_name>
+      <x>135</x>
+      <y>25</y>
+      <width>80</width>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_22</name>
+      <text>Update rate:</text>
+      <x>110</x>
+      <y>50</y>
+      <width>105</width>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="combo" version="2.0.0">
+      <name>Combo Box</name>
+      <pv_name>$(bpm):POSSCAN.SCAN</pv_name>
+      <x>115</x>
+      <y>75</y>
+      <height>20</height>
+    </widget>
+  </widget>
+  <widget type="group" version="3.0.0">
+    <name>Calculations</name>
+    <y>130</y>
+    <width>400</width>
+    <height>135</height>
+    <font>
+      <font family="Arial" style="REGULAR" size="15.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color red="29" green="41" blue="69">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="Read_Background" red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <widget type="label" version="2.0.0">
+      <name>Label_23</name>
+      <text>I = (A-DA)+(B-DB)+(C-DC)+(D-DD) =</text>
+      <width>270</width>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_24</name>
+      <text>X = KX*((D-DD)-(B-DB))/((D-DD)+(B-DB)) =</text>
+      <y>25</y>
+      <width>270</width>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <rules>
+        <rule name="orientation-change" prop_id="text" out_exp="false">
+          <exp bool_exp="pv0 == 1">
+            <value>X = KX*((A-DA)-(B-DB)-(C-DC)+(D-DD))/I =</value>
+          </exp>
+          <pv_name>$(bpm):ORIENT</pv_name>
+        </rule>
+      </rules>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_25</name>
+      <text>Y = KY*((A-DA)-(C-DC))/((A-DA)+(C-DC)) = </text>
+      <y>50</y>
+      <width>270</width>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <rules>
+        <rule name="orientation-change" prop_id="text" out_exp="false">
+          <exp bool_exp="pv0 == 1">
+            <value>Y = KY*((A-DA)+(B-DB)-(C-DC)-(D-DD))/I = </value>
+          </exp>
+          <pv_name>$(bpm):ORIENT</pv_name>
+        </rule>
+      </rules>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_26</name>
+      <text>Q = ((A-DA)-(B-DB)+(C-DC)-(D-DD))/I =</text>
+      <y>75</y>
+      <width>270</width>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Readback PV_8</name>
+      <pv_name>$(bpm):INTEN</pv_name>
+      <x>280</x>
+      <width>80</width>
+      <font>
+        <font family="Arial" style="REGULAR" size="14.0">
+        </font>
+      </font>
+      <background_color>
+        <color red="184" green="195" blue="223">
+        </color>
+      </background_color>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <border_color>
+        <color red="196" green="196" blue="196">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Readback PV_9</name>
+      <pv_name>$(bpm):XPOS</pv_name>
+      <x>280</x>
+      <y>25</y>
+      <width>80</width>
+      <font>
+        <font family="Arial" style="REGULAR" size="14.0">
+        </font>
+      </font>
+      <background_color>
+        <color red="184" green="195" blue="223">
+        </color>
+      </background_color>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <border_color>
+        <color red="196" green="196" blue="196">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Readback PV_10</name>
+      <pv_name>$(bpm):YPOS</pv_name>
+      <x>280</x>
+      <y>50</y>
+      <width>80</width>
+      <font>
+        <font family="Arial" style="REGULAR" size="14.0">
+        </font>
+      </font>
+      <background_color>
+        <color red="184" green="195" blue="223">
+        </color>
+      </background_color>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <border_color>
+        <color red="196" green="196" blue="196">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Readback PV_11</name>
+      <pv_name>$(bpm):Q</pv_name>
+      <x>280</x>
+      <y>75</y>
+      <width>80</width>
+      <font>
+        <font family="Arial" style="REGULAR" size="14.0">
+        </font>
+      </font>
+      <background_color>
+        <color red="184" green="195" blue="223">
+        </color>
+      </background_color>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <border_color>
+        <color red="196" green="196" blue="196">
+        </color>
+      </border_color>
+    </widget>
+  </widget>
+</display>

From 49196a9edd42a906c13b5599099fe77dfcdbf06f Mon Sep 17 00:00:00 2001
From: Ollie Copping <oliver.copping@diamond.ac.uk>
Date: Wed, 5 Aug 2026 13:46:55 +0100
Subject: [PATCH 2/2] Increase size of embedded BPM screen and increase
 calculation box on BPM setup

---
 bob/bpm/bpm_embed.bob | 204 +++++++++++++++++++++---------------------
 bob/bpm/bpm_setup.bob |  20 ++---
 2 files changed, 110 insertions(+), 114 deletions(-)

diff --git a/bob/bpm/bpm_embed.bob b/bob/bpm/bpm_embed.bob
index d3ff407..a9bbaed 100644
--- a/bob/bpm/bpm_embed.bob
+++ b/bob/bpm/bpm_embed.bob
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--Saved on 2026-08-05 11:27:34 by ryi58813-->
+<!--Saved on 2026-08-05 13:44:20 by ryi58813-->
 <display version="2.0.0">
   <name>bpm_embed</name>
-  <width>220</width>
-  <height>120</height>
+  <width>280</width>
+  <height>160</height>
   <background_color>
     <color name="Read_Background" red="240" green="240" blue="240">
     </color>
@@ -14,8 +14,8 @@
   </grid_color>
   <widget type="group" version="3.0.0">
     <name>$(label)</name>
-    <width>220</width>
-    <height>120</height>
+    <width>280</width>
+    <height>160</height>
     <font>
       <font family="Arial" style="REGULAR" size="15.0">
       </font>
@@ -28,6 +28,93 @@
       <color name="Read_Background" red="240" green="240" blue="240">
       </color>
     </background_color>
+    <widget type="label" version="2.0.0">
+      <name>Label</name>
+      <text>I</text>
+      <y>10</y>
+      <width>20</width>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_1</name>
+      <text>X</text>
+      <y>40</y>
+      <width>20</width>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_2</name>
+      <text>Y</text>
+      <y>70</y>
+      <width>20</width>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Readback PV_2</name>
+      <pv_name>$(bpm):YPOS</pv_name>
+      <x>30</x>
+      <y>70</y>
+      <width>80</width>
+      <font>
+        <font family="Arial" style="REGULAR" size="14.0">
+        </font>
+      </font>
+      <background_color>
+        <color red="184" green="195" blue="223">
+        </color>
+      </background_color>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <border_color>
+        <color red="196" green="196" blue="196">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Readback PV_1</name>
+      <pv_name>$(bpm):XPOS</pv_name>
+      <x>30</x>
+      <y>40</y>
+      <width>80</width>
+      <font>
+        <font family="Arial" style="REGULAR" size="14.0">
+        </font>
+      </font>
+      <background_color>
+        <color red="184" green="195" blue="223">
+        </color>
+      </background_color>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <border_color>
+        <color red="196" green="196" blue="196">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Readback PV</name>
+      <pv_name>$(bpm):INTEN</pv_name>
+      <x>30</x>
+      <y>10</y>
+      <width>80</width>
+      <font>
+        <font family="Arial" style="REGULAR" size="14.0">
+        </font>
+      </font>
+      <background_color>
+        <color red="184" green="195" blue="223">
+        </color>
+      </background_color>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <border_color>
+        <color red="196" green="196" blue="196">
+        </color>
+      </border_color>
+    </widget>
     <widget type="action_button" version="3.0.0">
       <name>Open PVI</name>
       <actions>
@@ -42,8 +129,8 @@
       </actions>
       <text>More</text>
       <x>20</x>
-      <y>60</y>
-      <width>70</width>
+      <y>100</y>
+      <width>80</width>
       <height>20</height>
       <font>
         <font family="Arial" style="REGULAR" size="14.0">
@@ -59,32 +146,11 @@
       </background_color>
       <tooltip>$(actions)</tooltip>
     </widget>
-    <widget type="textupdate" version="2.0.0">
-      <name>Readback PV</name>
-      <pv_name>$(bpm):INTEN</pv_name>
-      <x>20</x>
-      <width>70</width>
-      <height>15</height>
-      <font>
-        <font family="Arial" style="REGULAR" size="14.0">
-        </font>
-      </font>
-      <background_color>
-        <color red="184" green="195" blue="223">
-        </color>
-      </background_color>
-      <horizontal_alignment>1</horizontal_alignment>
-      <vertical_alignment>1</vertical_alignment>
-      <border_color>
-        <color red="196" green="196" blue="196">
-        </color>
-      </border_color>
-    </widget>
     <widget type="xyplot" version="3.0.0">
       <name>X/Y Plot</name>
-      <x>100</x>
-      <width>80</width>
-      <height>80</height>
+      <x>110</x>
+      <width>130</width>
+      <height>120</height>
       <title_font>
         <font name="Comment" family="Liberation Sans" style="ITALIC" size="14.0">
         </font>
@@ -143,83 +209,13 @@
             <color red="0" green="0" blue="255">
             </color>
           </color>
-          <line_width>0</line_width>
+          <line_width>1</line_width>
           <line_style>0</line_style>
           <point_type>2</point_type>
-          <point_size>1</point_size>
-          <visible>false</visible>
+          <point_size>8</point_size>
+          <visible>true</visible>
         </trace>
       </traces>
     </widget>
-    <widget type="textupdate" version="2.0.0">
-      <name>Readback PV_1</name>
-      <pv_name>$(bpm):XPOS</pv_name>
-      <x>20</x>
-      <y>20</y>
-      <width>70</width>
-      <height>15</height>
-      <font>
-        <font family="Arial" style="REGULAR" size="14.0">
-        </font>
-      </font>
-      <background_color>
-        <color red="184" green="195" blue="223">
-        </color>
-      </background_color>
-      <horizontal_alignment>1</horizontal_alignment>
-      <vertical_alignment>1</vertical_alignment>
-      <border_color>
-        <color red="196" green="196" blue="196">
-        </color>
-      </border_color>
-    </widget>
-    <widget type="textupdate" version="2.0.0">
-      <name>Readback PV_2</name>
-      <pv_name>$(bpm):YPOS</pv_name>
-      <x>20</x>
-      <y>40</y>
-      <width>70</width>
-      <height>15</height>
-      <font>
-        <font family="Arial" style="REGULAR" size="14.0">
-        </font>
-      </font>
-      <background_color>
-        <color red="184" green="195" blue="223">
-        </color>
-      </background_color>
-      <horizontal_alignment>1</horizontal_alignment>
-      <vertical_alignment>1</vertical_alignment>
-      <border_color>
-        <color red="196" green="196" blue="196">
-        </color>
-      </border_color>
-    </widget>
-    <widget type="label" version="2.0.0">
-      <name>Label</name>
-      <text>I</text>
-      <width>15</width>
-      <height>15</height>
-      <horizontal_alignment>1</horizontal_alignment>
-      <vertical_alignment>1</vertical_alignment>
-    </widget>
-    <widget type="label" version="2.0.0">
-      <name>Label_1</name>
-      <text>X</text>
-      <y>20</y>
-      <width>15</width>
-      <height>15</height>
-      <horizontal_alignment>1</horizontal_alignment>
-      <vertical_alignment>1</vertical_alignment>
-    </widget>
-    <widget type="label" version="2.0.0">
-      <name>Label_2</name>
-      <text>Y#</text>
-      <y>40</y>
-      <width>15</width>
-      <height>15</height>
-      <horizontal_alignment>1</horizontal_alignment>
-      <vertical_alignment>1</vertical_alignment>
-    </widget>
   </widget>
 </display>
diff --git a/bob/bpm/bpm_setup.bob b/bob/bpm/bpm_setup.bob
index 117b348..d93e09f 100644
--- a/bob/bpm/bpm_setup.bob
+++ b/bob/bpm/bpm_setup.bob
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--Saved on 2026-08-05 13:31:26 by ryi58813-->
+<!--Saved on 2026-08-05 13:46:00 by ryi58813-->
 <display version="2.0.0">
   <name>bpm_setup</name>
   <width>510</width>
@@ -413,7 +413,7 @@
   <widget type="group" version="3.0.0">
     <name>Calculations</name>
     <y>130</y>
-    <width>400</width>
+    <width>420</width>
     <height>135</height>
     <font>
       <font family="Arial" style="REGULAR" size="15.0">
@@ -430,7 +430,7 @@
     <widget type="label" version="2.0.0">
       <name>Label_23</name>
       <text>I = (A-DA)+(B-DB)+(C-DC)+(D-DD) =</text>
-      <width>270</width>
+      <width>290</width>
       <horizontal_alignment>1</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
     </widget>
@@ -438,7 +438,7 @@
       <name>Label_24</name>
       <text>X = KX*((D-DD)-(B-DB))/((D-DD)+(B-DB)) =</text>
       <y>25</y>
-      <width>270</width>
+      <width>290</width>
       <horizontal_alignment>1</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
       <rules>
@@ -454,7 +454,7 @@
       <name>Label_25</name>
       <text>Y = KY*((A-DA)-(C-DC))/((A-DA)+(C-DC)) = </text>
       <y>50</y>
-      <width>270</width>
+      <width>290</width>
       <horizontal_alignment>1</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
       <rules>
@@ -470,14 +470,14 @@
       <name>Label_26</name>
       <text>Q = ((A-DA)-(B-DB)+(C-DC)-(D-DD))/I =</text>
       <y>75</y>
-      <width>270</width>
+      <width>290</width>
       <horizontal_alignment>1</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
     </widget>
     <widget type="textupdate" version="2.0.0">
       <name>Readback PV_8</name>
       <pv_name>$(bpm):INTEN</pv_name>
-      <x>280</x>
+      <x>300</x>
       <width>80</width>
       <font>
         <font family="Arial" style="REGULAR" size="14.0">
@@ -497,7 +497,7 @@
     <widget type="textupdate" version="2.0.0">
       <name>Readback PV_9</name>
       <pv_name>$(bpm):XPOS</pv_name>
-      <x>280</x>
+      <x>300</x>
       <y>25</y>
       <width>80</width>
       <font>
@@ -518,7 +518,7 @@
     <widget type="textupdate" version="2.0.0">
       <name>Readback PV_10</name>
       <pv_name>$(bpm):YPOS</pv_name>
-      <x>280</x>
+      <x>300</x>
       <y>50</y>
       <width>80</width>
       <font>
@@ -539,7 +539,7 @@
     <widget type="textupdate" version="2.0.0">
       <name>Readback PV_11</name>
       <pv_name>$(bpm):Q</pv_name>
-      <x>280</x>
+      <x>300</x>
       <y>75</y>
       <width>80</width>
       <font>