diff --git a/99-Shared/adsis8300bpm/aiChannel.bob b/99-Shared/adsis8300bpm/aiChannel.bob
index 746608d6968e720f23d8fe31c52be7528718b3c9..210162abf487d8f8f74eee67da3abe94a34cca3b 100644
--- a/99-Shared/adsis8300bpm/aiChannel.bob
+++ b/99-Shared/adsis8300bpm/aiChannel.bob
@@ -63,7 +63,7 @@ $(pv_value)</tooltip>
</color>
</background_color>
<title_font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</title_font>
<show_toolbar>true</show_toolbar>
@@ -91,11 +91,11 @@ $(pv_value)</tooltip>
<maximum>100.0</maximum>
<show_grid>true</show_grid>
<title_font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</title_font>
<scale_font>
- <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+ <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
</font>
</scale_font>
<visible>true</visible>
@@ -109,11 +109,11 @@ $(pv_value)</tooltip>
<maximum>100.0</maximum>
<show_grid>true</show_grid>
<title_font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</title_font>
<scale_font>
- <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+ <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
</font>
</scale_font>
<visible>true</visible>
@@ -383,7 +383,7 @@ time/point</text>
<width>336</width>
<height>31</height>
<font>
- <font name="Header 2" family="Liberation Sans" style="BOLD" size="18.0">
+ <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
</font>
</font>
<background_color>
@@ -441,7 +441,7 @@ time/point</text>
<width>43</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -464,7 +464,7 @@ time/point</text>
<width>43</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -479,7 +479,7 @@ time/point</text>
<y>70</y>
<width>70</width>
<font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</font>
<vertical_alignment>1</vertical_alignment>
@@ -509,7 +509,7 @@ time/point</text>
<width>49</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -559,7 +559,7 @@ time/point</text>
<width>43</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -582,7 +582,7 @@ time/point</text>
<width>43</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -596,7 +596,7 @@ time/point</text>
<x>16</x>
<y>345</y>
<font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</font>
<vertical_alignment>1</vertical_alignment>
@@ -830,7 +830,7 @@ time/point</text>
<y>15</y>
<width>188</width>
<font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</font>
<vertical_alignment>1</vertical_alignment>
@@ -849,7 +849,7 @@ time/point</text>
<y>495</y>
<width>70</width>
<font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</font>
<vertical_alignment>1</vertical_alignment>
@@ -973,7 +973,7 @@ time/point</text>
<width>43</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -996,7 +996,7 @@ time/point</text>
<width>43</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -1010,7 +1010,7 @@ time/point</text>
<x>16</x>
<y>551</y>
<font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</font>
<vertical_alignment>1</vertical_alignment>
@@ -1295,7 +1295,7 @@ time/point</text>
<width>49</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -1345,7 +1345,7 @@ time/point</text>
<width>43</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -1368,7 +1368,7 @@ time/point</text>
<width>43</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -1382,7 +1382,7 @@ time/point</text>
<x>13</x>
<y>677</y>
<font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</font>
<vertical_alignment>1</vertical_alignment>
@@ -1431,7 +1431,7 @@ time/point</text>
<width>49</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -1481,7 +1481,7 @@ time/point</text>
<width>43</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -1504,7 +1504,7 @@ time/point</text>
<width>43</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -1538,7 +1538,7 @@ time/point</text>
<y>728</y>
<width>142</width>
<font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</font>
<vertical_alignment>1</vertical_alignment>
@@ -1554,7 +1554,7 @@ time/point</text>
<name>Label_297</name>
<text>Memory addr.</text>
<x>10</x>
- <y>266</y>
+ <y>286</y>
<width>106</width>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -1574,7 +1574,7 @@ time/point</text>
<name>Text Update_79</name>
<pv_name>$(P)$(R)$(CH)MemoryAddressR</pv_name>
<x>258</x>
- <y>267</y>
+ <y>286</y>
<height>18</height>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -1603,7 +1603,7 @@ time/point</text>
<name>Text Input_6</name>
<pv_name>$(P)$(R)$(CH)MemoryAddress</pv_name>
<x>139</x>
- <y>266</y>
+ <y>286</y>
<width>112</width>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -1640,7 +1640,7 @@ time/point</text>
<width>49</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -1690,7 +1690,7 @@ time/point</text>
<width>43</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -1713,7 +1713,7 @@ time/point</text>
<width>43</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -1728,7 +1728,7 @@ time/point</text>
<y>677</y>
<width>142</width>
<font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</font>
<vertical_alignment>1</vertical_alignment>
@@ -1761,7 +1761,7 @@ time/point</text>
</widget>
<widget type="label" version="2.0.0">
<name>Label_302</name>
- <text>DMA time</text>
+ <text>PCIe start</text>
<y>235</y>
<width>116</width>
<font>
@@ -1780,7 +1780,7 @@ time/point</text>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_80</name>
- <pv_name>$(P)$(R)$(CH)DMATransferTimeR</pv_name>
+ <pv_name>$(P)$(R)$(CH)PcieStartTimeR</pv_name>
<x>139</x>
<y>236</y>
<height>18</height>
@@ -1806,4 +1806,51 @@ time/point</text>
</color>
</border_color>
</widget>
+ <widget type="label" version="2.0.0">
+ <name>Label_303</name>
+ <text>PCIe time</text>
+ <y>255</y>
+ <width>116</width>
+ <font>
+ <font family="Sans" style="REGULAR" size="10.891089108910892">
+ </font>
+ </font>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <wrap_words>false</wrap_words>
+ <actions>
+ </actions>
+ <border_color>
+ <color red="0" green="128" blue="255">
+ </color>
+ </border_color>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>Text Update_81</name>
+ <pv_name>$(P)$(R)$(CH)PcieTransferTimeR</pv_name>
+ <x>139</x>
+ <y>256</y>
+ <height>18</height>
+ <font>
+ <font family="Sans" style="REGULAR" size="10.891089108910892">
+ </font>
+ </font>
+ <foreground_color>
+ <color red="10" green="0" blue="184">
+ </color>
+ </foreground_color>
+ <background_color>
+ <color red="187" green="187" blue="187">
+ </color>
+ </background_color>
+ <show_units>false</show_units>
+ <vertical_alignment>1</vertical_alignment>
+ <wrap_words>false</wrap_words>
+ <actions>
+ </actions>
+ <border_color>
+ <color red="0" green="128" blue="255">
+ </color>
+ </border_color>
+ </widget>
</display>
diff --git a/99-Shared/adsis8300bpm/bpm.bob b/99-Shared/adsis8300bpm/bpm.bob
index 4834a57146a39894fa6aa8bceb27b94ca3b97bc0..19f67720d311a301a5df84222ecd0ec26f5990ac 100644
--- a/99-Shared/adsis8300bpm/bpm.bob
+++ b/99-Shared/adsis8300bpm/bpm.bob
@@ -1,23 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
<name>$(TITLE) : Main</name>
- <width>1200</width>
- <height>800</height>
+ <width>1187</width>
+ <height>856</height>
<background_color>
<color red="240" green="240" blue="240">
</color>
</background_color>
<actions>
</actions>
+ <grid_step_x>6</grid_step_x>
+ <grid_step_y>6</grid_step_y>
<widget type="label" version="2.0.0">
<name>Label_361</name>
<text>More panels</text>
- <x>410</x>
- <y>662</y>
+ <x>14</x>
+ <y>780</y>
<width>765</width>
<height>69</height>
<font>
- <font name="Header 1" family="Liberation Sans" style="BOLD" size="22.0">
+ <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
</font>
</font>
<background_color>
@@ -41,9 +43,9 @@
<x>410</x>
<y>52</y>
<width>765</width>
- <height>601</height>
+ <height>381</height>
<font>
- <font name="Header 1" family="Liberation Sans" style="BOLD" size="22.0">
+ <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
</font>
</font>
<background_color>
@@ -67,9 +69,9 @@
<x>14</x>
<y>52</y>
<width>387</width>
- <height>254</height>
+ <height>253</height>
<font>
- <font name="Header 1" family="Liberation Sans" style="BOLD" size="22.0">
+ <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
</font>
</font>
<background_color>
@@ -95,7 +97,7 @@
<width>1177</width>
<height>29</height>
<font>
- <font name="Header 1" family="Liberation Sans" style="BOLD" size="22.0">
+ <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
</font>
</font>
<background_color>
@@ -126,8 +128,8 @@
</action>
</actions>
<text>Ref. line 1</text>
- <x>426</x>
- <y>702</y>
+ <x>30</x>
+ <y>820</y>
<width>79</width>
<height>20</height>
<background_color>
@@ -146,8 +148,8 @@
</actions>
<pv_name>$(P)$(R)Acquire</pv_name>
<text>Stop</text>
- <x>288</x>
- <y>272</y>
+ <x>292</x>
+ <y>276</y>
<width>79</width>
<height>20</height>
<background_color>
@@ -225,7 +227,7 @@
<name>Text Update_51</name>
<pv_name>$(P)$(R)PulseCountR</pv_name>
<x>203</x>
- <y>181</y>
+ <y>144</y>
<width>139</width>
<background_color>
<color red="255" green="255" blue="255">
@@ -297,8 +299,8 @@
<name>Label_163</name>
<text>Pulse counter</text>
<x>29</x>
- <y>181</y>
- <width>119</width>
+ <y>144</y>
+ <width>152</width>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
<wrap_words>false</wrap_words>
@@ -328,8 +330,8 @@
<widget type="label" version="2.0.0">
<name>Label_271</name>
<text>Control</text>
- <x>25</x>
- <y>272</y>
+ <x>29</x>
+ <y>276</y>
<width>119</width>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -393,7 +395,7 @@
<name>LED</name>
<pv_name>$(P)$(R)PulseDoneR</pv_name>
<x>366</x>
- <y>183</y>
+ <y>146</y>
<width>16</width>
<height>16</height>
<off_color>
@@ -415,8 +417,8 @@
<name>Label_280</name>
<text>Pulse missed</text>
<x>29</x>
- <y>200</y>
- <width>119</width>
+ <y>164</y>
+ <width>152</width>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
<wrap_words>false</wrap_words>
@@ -431,7 +433,7 @@
<name>Text Update_71</name>
<pv_name>$(P)$(R)PulseMissedR</pv_name>
<x>203</x>
- <y>200</y>
+ <y>164</y>
<width>139</width>
<background_color>
<color red="255" green="255" blue="255">
@@ -556,12 +558,12 @@
<widget type="label" version="2.0.0">
<name>Label_298</name>
<text>SIS8300</text>
- <x>13</x>
- <y>320</y>
+ <x>14</x>
+ <y>325</y>
<width>387</width>
- <height>333</height>
+ <height>424</height>
<font>
- <font name="Header 1" family="Liberation Sans" style="BOLD" size="22.0">
+ <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
</font>
</font>
<background_color>
@@ -582,8 +584,8 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_40</name>
<pv_name>$(P)$(R)TickValueR</pv_name>
- <x>211</x>
- <y>528</y>
+ <x>212</x>
+ <y>533</y>
<width>108</width>
<background_color>
<color red="255" green="255" blue="255">
@@ -603,8 +605,8 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_1</name>
<pv_name>$(P)$(R)SamplingFrequencyR</pv_name>
- <x>211</x>
- <y>509</y>
+ <x>212</x>
+ <y>514</y>
<width>108</width>
<background_color>
<color red="255" green="255" blue="255">
@@ -623,8 +625,8 @@
<widget type="label" version="2.0.0">
<name>Label_1</name>
<text>Sampling frequency</text>
- <x>52</x>
- <y>509</y>
+ <x>53</x>
+ <y>514</y>
<width>144</width>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -639,8 +641,8 @@
<widget type="label" version="2.0.0">
<name>Label_2</name>
<text>Time tick</text>
- <x>52</x>
- <y>528</y>
+ <x>53</x>
+ <y>533</y>
<width>144</width>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -655,8 +657,8 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_69</name>
<pv_name>$(P)$(R)MessageR</pv_name>
- <x>28</x>
- <y>605</y>
+ <x>29</x>
+ <y>705</y>
<width>360</width>
<height>43</height>
<foreground_color>
@@ -675,8 +677,8 @@
<widget type="label" version="2.0.0">
<name>Label_273</name>
<text>Driver message</text>
- <x>52</x>
- <y>585</y>
+ <x>53</x>
+ <y>685</y>
<width>144</width>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -691,9 +693,9 @@
<widget type="label" version="2.0.0">
<name>Label_315</name>
<text>Trigger repeat</text>
- <x>36</x>
- <y>219</y>
- <width>112</width>
+ <x>29</x>
+ <y>238</y>
+ <width>119</width>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
<wrap_words>false</wrap_words>
@@ -707,8 +709,8 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_105</name>
<pv_name>$(P)$(R)TriggerRepeatR</pv_name>
- <x>306</x>
- <y>219</y>
+ <x>299</x>
+ <y>238</y>
<width>88</width>
<background_color>
<color red="255" green="255" blue="255">
@@ -728,10 +730,9 @@
<name>Spinner_7</name>
<pv_name>$(P)$(R)TriggerRepeat</pv_name>
<x>203</x>
- <y>219</y>
- <width>96</width>
+ <y>238</y>
+ <width>89</width>
<format>0</format>
- <precision>3</precision>
<background_color>
<color red="255" green="255" blue="255">
</color>
@@ -744,8 +745,8 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_106</name>
<pv_name>$(P)$(R)TickValueIQR</pv_name>
- <x>211</x>
- <y>547</y>
+ <x>212</x>
+ <y>552</y>
<width>108</width>
<background_color>
<color red="255" green="255" blue="255">
@@ -765,8 +766,8 @@
<widget type="label" version="2.0.0">
<name>Label_316</name>
<text>IQ time tick</text>
- <x>52</x>
- <y>547</y>
+ <x>53</x>
+ <y>552</y>
<width>144</width>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -781,8 +782,8 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_108</name>
<pv_name>$(P)$(R)BPMFWGitHashR</pv_name>
- <x>211</x>
- <y>471</y>
+ <x>212</x>
+ <y>476</y>
<width>108</width>
<background_color>
<color red="255" green="255" blue="255">
@@ -802,8 +803,8 @@
<widget type="label" version="2.0.0">
<name>Label_319</name>
<text>FW GIT hash</text>
- <x>52</x>
- <y>471</y>
+ <x>53</x>
+ <y>476</y>
<width>144</width>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -818,8 +819,8 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_109</name>
<pv_name>$(P)$(R)BPMFWVersionR</pv_name>
- <x>211</x>
- <y>490</y>
+ <x>212</x>
+ <y>495</y>
<width>108</width>
<background_color>
<color red="255" green="255" blue="255">
@@ -838,8 +839,8 @@
<widget type="label" version="2.0.0">
<name>Label_320</name>
<text>FW version</text>
- <x>52</x>
- <y>490</y>
+ <x>53</x>
+ <y>495</y>
<width>144</width>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1142,8 +1143,8 @@
<widget type="label" version="2.0.0">
<name>Label_207</name>
<text>Model</text>
- <x>52</x>
- <y>376</y>
+ <x>53</x>
+ <y>381</y>
<width>144</width>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1158,8 +1159,8 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_96</name>
<pv_name>$(P)$(R)Model_RBV</pv_name>
- <x>211</x>
- <y>376</y>
+ <x>212</x>
+ <y>381</y>
<width>108</width>
<background_color>
<color red="255" green="255" blue="255">
@@ -1179,8 +1180,8 @@
<widget type="label" version="2.0.0">
<name>Label_208</name>
<text>Firmware version</text>
- <x>52</x>
- <y>395</y>
+ <x>53</x>
+ <y>400</y>
<width>144</width>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1195,8 +1196,8 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_97</name>
<pv_name>$(P)$(R)FirmwareVersion_RBV</pv_name>
- <x>211</x>
- <y>395</y>
+ <x>212</x>
+ <y>400</y>
<width>108</width>
<background_color>
<color red="255" green="255" blue="255">
@@ -1216,8 +1217,8 @@
<widget type="label" version="2.0.0">
<name>Label_209</name>
<text>Serial number</text>
- <x>52</x>
- <y>414</y>
+ <x>53</x>
+ <y>419</y>
<width>144</width>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1232,8 +1233,8 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_98</name>
<pv_name>$(P)$(R)SerialNumber_RBV</pv_name>
- <x>211</x>
- <y>414</y>
+ <x>212</x>
+ <y>419</y>
<width>108</width>
<background_color>
<color red="255" green="255" blue="255">
@@ -1253,8 +1254,8 @@
<widget type="label" version="2.0.0">
<name>Label_210</name>
<text>Memory size</text>
- <x>52</x>
- <y>433</y>
+ <x>53</x>
+ <y>438</y>
<width>144</width>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1269,8 +1270,8 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_99</name>
<pv_name>$(P)$(R)MemorySizeR</pv_name>
- <x>211</x>
- <y>433</y>
+ <x>212</x>
+ <y>438</y>
<width>108</width>
<background_color>
<color red="255" green="255" blue="255">
@@ -1289,8 +1290,8 @@
<widget type="label" version="2.0.0">
<name>Label_211</name>
<text>Manufacturer</text>
- <x>52</x>
- <y>357</y>
+ <x>53</x>
+ <y>362</y>
<width>144</width>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1305,8 +1306,8 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_100</name>
<pv_name>$(P)$(R)Manufacturer_RBV</pv_name>
- <x>211</x>
- <y>357</y>
+ <x>212</x>
+ <y>362</y>
<width>108</width>
<background_color>
<color red="255" green="255" blue="255">
@@ -1326,8 +1327,8 @@
<widget type="label" version="2.0.0">
<name>Label_212</name>
<text>Device path</text>
- <x>52</x>
- <y>452</y>
+ <x>53</x>
+ <y>457</y>
<width>144</width>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1342,8 +1343,8 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_121</name>
<pv_name>$(P)$(R)DevicePathR</pv_name>
- <x>211</x>
- <y>452</y>
+ <x>212</x>
+ <y>457</y>
<width>108</width>
<background_color>
<color red="255" green="255" blue="255">
@@ -1487,7 +1488,6 @@
<y>124</y>
<width>97</width>
<format>0</format>
- <precision>3</precision>
<background_color>
<color red="255" green="255" blue="255">
</color>
@@ -1546,7 +1546,7 @@
<y>313</y>
<width>142</width>
<font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</font>
<vertical_alignment>1</vertical_alignment>
@@ -1573,7 +1573,7 @@
<width>43</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -1596,7 +1596,7 @@
<width>43</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -1688,7 +1688,7 @@
<width>43</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -1729,7 +1729,7 @@
<y>305</y>
<width>142</width>
<font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</font>
<vertical_alignment>1</vertical_alignment>
@@ -1748,7 +1748,7 @@
<y>143</y>
<width>142</width>
<font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</font>
<vertical_alignment>1</vertical_alignment>
@@ -1801,7 +1801,7 @@
<width>43</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -1824,7 +1824,7 @@
<width>43</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -1907,7 +1907,7 @@
<y>86</y>
<width>221</width>
<font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</font>
<vertical_alignment>1</vertical_alignment>
@@ -2041,9 +2041,9 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_131</name>
- <pv_name>$(P)$(R)DMATransferTimeR</pv_name>
+ <pv_name>$(P)$(R)PcieStartTimeR</pv_name>
<x>203</x>
- <y>162</y>
+ <y>616</y>
<width>139</width>
<background_color>
<color red="255" green="255" blue="255">
@@ -2061,9 +2061,9 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_354</name>
- <text>DMA time</text>
+ <text>PCIe start</text>
<x>29</x>
- <y>162</y>
+ <y>616</y>
<width>119</width>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -2187,7 +2187,7 @@
<y>223</y>
<width>221</width>
<font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</font>
<vertical_alignment>1</vertical_alignment>
@@ -2282,7 +2282,7 @@
<width>43</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -2328,11 +2328,11 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Linking Container</name>
- <file>../adsis8300/sis8300-evr.opi</file>
- <x>448</x>
- <y>433</y>
- <width>699</width>
- <height>171</height>
+ <file>../../opi/adsis8300/sis8300-evr.bob</file>
+ <x>416</x>
+ <y>446</y>
+ <width>720</width>
+ <height>310</height>
<resize>2</resize>
<actions>
</actions>
@@ -2353,8 +2353,8 @@
</action>
</actions>
<text>Ref. line 2</text>
- <x>514</x>
- <y>702</y>
+ <x>118</x>
+ <y>820</y>
<width>79</width>
<height>20</height>
<background_color>
@@ -2372,8 +2372,8 @@
</action>
</actions>
<text>Angle diff.</text>
- <x>604</x>
- <y>702</y>
+ <x>208</x>
+ <y>820</y>
<width>79</width>
<height>20</height>
<background_color>
@@ -2392,8 +2392,8 @@
</actions>
<pv_name>$(P)$(R)Acquire</pv_name>
<text>Start</text>
- <x>203</x>
- <y>272</y>
+ <x>207</x>
+ <y>276</y>
<width>79</width>
<height>20</height>
<background_color>
@@ -2415,8 +2415,8 @@
</action>
</actions>
<text>$(SYSTEM1)</text>
- <x>726</x>
- <y>702</y>
+ <x>330</x>
+ <y>820</y>
<width>214</width>
<height>20</height>
<background_color>
@@ -2439,8 +2439,8 @@
</action>
</actions>
<text>$(SYSTEM2)</text>
- <x>950</x>
- <y>702</y>
+ <x>554</x>
+ <y>820</y>
<width>214</width>
<height>20</height>
<background_color>
@@ -2449,4 +2449,184 @@
</background_color>
<tooltip>$(actions)</tooltip>
</widget>
+ <widget type="label" version="2.0.0">
+ <name>Label_362</name>
+ <text>PCIe end</text>
+ <x>29</x>
+ <y>636</y>
+ <width>119</width>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <wrap_words>false</wrap_words>
+ <actions>
+ </actions>
+ <border_color>
+ <color red="0" green="128" blue="255">
+ </color>
+ </border_color>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>Text Update_135</name>
+ <pv_name>$(P)$(R)PcieEndTimeR</pv_name>
+ <x>203</x>
+ <y>636</y>
+ <width>139</width>
+ <background_color>
+ <color red="255" green="255" blue="255">
+ </color>
+ </background_color>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <wrap_words>false</wrap_words>
+ <actions>
+ </actions>
+ <border_color>
+ <color red="0" green="128" blue="255">
+ </color>
+ </border_color>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Label_363</name>
+ <text>PCIe time</text>
+ <x>29</x>
+ <y>656</y>
+ <width>119</width>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <wrap_words>false</wrap_words>
+ <actions>
+ </actions>
+ <border_color>
+ <color red="0" green="128" blue="255">
+ </color>
+ </border_color>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>Text Update_136</name>
+ <pv_name>$(P)$(R)PcieTransferTimeR</pv_name>
+ <x>203</x>
+ <y>656</y>
+ <width>139</width>
+ <background_color>
+ <color red="255" green="255" blue="255">
+ </color>
+ </background_color>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <wrap_words>false</wrap_words>
+ <actions>
+ </actions>
+ <border_color>
+ <color red="0" green="128" blue="255">
+ </color>
+ </border_color>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Label_364</name>
+ <text>PCIe link speed</text>
+ <x>72</x>
+ <y>572</y>
+ <width>119</width>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <wrap_words>false</wrap_words>
+ <actions>
+ </actions>
+ <border_color>
+ <color red="0" green="128" blue="255">
+ </color>
+ </border_color>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>Text Update_137</name>
+ <pv_name>$(P)$(R)PcieLinkSpeedR</pv_name>
+ <x>197</x>
+ <y>572</y>
+ <width>139</width>
+ <background_color>
+ <color red="255" green="255" blue="255">
+ </color>
+ </background_color>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <wrap_words>false</wrap_words>
+ <actions>
+ </actions>
+ <border_color>
+ <color red="0" green="128" blue="255">
+ </color>
+ </border_color>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Label_365</name>
+ <text>PCIe link width</text>
+ <x>72</x>
+ <y>592</y>
+ <width>119</width>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <wrap_words>false</wrap_words>
+ <actions>
+ </actions>
+ <border_color>
+ <color red="0" green="128" blue="255">
+ </color>
+ </border_color>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>Text Update_138</name>
+ <pv_name>$(P)$(R)PcieLinkWidthR</pv_name>
+ <x>197</x>
+ <y>592</y>
+ <width>139</width>
+ <background_color>
+ <color red="255" green="255" blue="255">
+ </color>
+ </background_color>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <wrap_words>false</wrap_words>
+ <actions>
+ </actions>
+ <border_color>
+ <color red="0" green="128" blue="255">
+ </color>
+ </border_color>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Label_281</name>
+ <text>Pulse missed count</text>
+ <x>29</x>
+ <y>184</y>
+ <width>152</width>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <wrap_words>false</wrap_words>
+ <actions>
+ </actions>
+ <border_color>
+ <color red="0" green="128" blue="255">
+ </color>
+ </border_color>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>Text Update_74</name>
+ <pv_name>$(P)$(R)PulseMissedCountR</pv_name>
+ <x>203</x>
+ <y>184</y>
+ <width>139</width>
+ <background_color>
+ <color red="255" green="255" blue="255">
+ </color>
+ </background_color>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <wrap_words>false</wrap_words>
+ <actions>
+ </actions>
+ <border_color>
+ <color red="0" green="128" blue="255">
+ </color>
+ </border_color>
+ </widget>
</display>
diff --git a/99-Shared/adsis8300bpm/bpmChannel.bob b/99-Shared/adsis8300bpm/bpmChannel.bob
index 56a1dfc91c0dcde16a0585e9345ae2c369d3fd60..cd2ec05e20c8b97eae915172010e4e906ab35d8d 100644
--- a/99-Shared/adsis8300bpm/bpmChannel.bob
+++ b/99-Shared/adsis8300bpm/bpmChannel.bob
@@ -63,7 +63,7 @@ $(pv_value)</tooltip>
</color>
</background_color>
<title_font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</title_font>
<show_toolbar>true</show_toolbar>
@@ -91,11 +91,11 @@ $(pv_value)</tooltip>
<maximum>100.0</maximum>
<show_grid>true</show_grid>
<title_font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</title_font>
<scale_font>
- <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+ <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
</font>
</scale_font>
<visible>true</visible>
@@ -109,11 +109,11 @@ $(pv_value)</tooltip>
<maximum>100.0</maximum>
<show_grid>true</show_grid>
<title_font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</title_font>
<scale_font>
- <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+ <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
</font>
</scale_font>
<visible>true</visible>
@@ -237,8 +237,8 @@ time/point</text>
<widget type="led" version="2.0.0">
<name>LED_1</name>
<pv_name>$(P)$(R)$(CH)DoneR</pv_name>
- <x>147</x>
- <y>221</y>
+ <x>142</x>
+ <y>240</y>
<width>16</width>
<height>16</height>
<off_color>
@@ -312,8 +312,8 @@ time/point</text>
<widget type="label" version="2.0.0">
<name>Label_4</name>
<text>Done</text>
- <x>23</x>
- <y>221</y>
+ <x>18</x>
+ <y>240</y>
<width>96</width>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -332,8 +332,8 @@ time/point</text>
<widget type="led" version="2.0.0">
<name>LED_1</name>
<pv_name>$(P)$(R)$(CH)ActiveR</pv_name>
- <x>340</x>
- <y>221</y>
+ <x>335</x>
+ <y>240</y>
<width>16</width>
<height>16</height>
<off_color>
@@ -358,8 +358,8 @@ time/point</text>
<widget type="label" version="2.0.0">
<name>Label_5</name>
<text>Active</text>
- <x>215</x>
- <y>221</y>
+ <x>210</x>
+ <y>240</y>
<width>96</width>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -378,8 +378,8 @@ time/point</text>
<widget type="led" version="2.0.0">
<name>LED_2</name>
<pv_name>$(P)$(R)$(CH)ConvStatus</pv_name>
- <x>142</x>
- <y>301</y>
+ <x>137</x>
+ <y>320</y>
<width>16</width>
<height>16</height>
<off_color>
@@ -411,12 +411,12 @@ time/point</text>
</actions>
<pv_name>$(P)$(R)$(CH)ConvControl</pv_name>
<text>Enable</text>
- <x>159</x>
- <y>299</y>
+ <x>154</x>
+ <y>318</y>
<width>43</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -434,12 +434,12 @@ time/point</text>
</actions>
<pv_name>$(P)$(R)$(CH)ConvControl</pv_name>
<text>Disable</text>
- <x>218</x>
- <y>299</y>
+ <x>213</x>
+ <y>318</y>
<width>43</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -450,11 +450,11 @@ time/point</text>
<widget type="label" version="2.0.0">
<name>Label_6</name>
<text>Converting</text>
- <x>18</x>
- <y>270</y>
+ <x>13</x>
+ <y>289</y>
<width>80</width>
<font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</font>
<horizontal_alignment>1</horizontal_alignment>
@@ -470,8 +470,8 @@ time/point</text>
<widget type="label" version="2.0.0">
<name>Label_7</name>
<text>Scale</text>
- <x>48</x>
- <y>373</y>
+ <x>43</x>
+ <y>392</y>
<width>70</width>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -490,8 +490,8 @@ time/point</text>
<widget type="textentry" version="3.0.0">
<name>Text Input_1</name>
<pv_name>$(P)$(R)$(CH)ScalingFactor</pv_name>
- <x>140</x>
- <y>373</y>
+ <x>135</x>
+ <y>392</y>
<width>112</width>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -513,8 +513,8 @@ time/point</text>
<widget type="textupdate" version="2.0.0">
<name>Text Update_2</name>
<pv_name>$(P)$(R)$(CH)ScalingFactorR</pv_name>
- <x>257</x>
- <y>374</y>
+ <x>252</x>
+ <y>393</y>
<height>18</height>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -541,8 +541,8 @@ time/point</text>
<widget type="label" version="2.0.0">
<name>Label_8</name>
<text>Offset</text>
- <x>48</x>
- <y>394</y>
+ <x>43</x>
+ <y>413</y>
<width>70</width>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -561,8 +561,8 @@ time/point</text>
<widget type="textupdate" version="2.0.0">
<name>Text Update_3</name>
<pv_name>$(P)$(R)$(CH)ScalingOffsetR</pv_name>
- <x>257</x>
- <y>395</y>
+ <x>252</x>
+ <y>414</y>
<height>18</height>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -589,8 +589,8 @@ time/point</text>
<widget type="textentry" version="3.0.0">
<name>Text Input_2</name>
<pv_name>$(P)$(R)$(CH)ScalingOffset</pv_name>
- <x>140</x>
- <y>394</y>
+ <x>135</x>
+ <y>413</y>
<width>112</width>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -612,8 +612,8 @@ time/point</text>
<widget type="label" version="2.0.0">
<name>Label_9</name>
<text>Control</text>
- <x>48</x>
- <y>299</y>
+ <x>43</x>
+ <y>318</y>
<width>70</width>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -637,7 +637,7 @@ time/point</text>
<width>336</width>
<height>31</height>
<font>
- <font name="Header 2" family="Liberation Sans" style="BOLD" size="18.0">
+ <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
</font>
</font>
<background_color>
@@ -695,7 +695,7 @@ time/point</text>
<width>43</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -718,7 +718,7 @@ time/point</text>
<width>43</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -733,7 +733,7 @@ time/point</text>
<y>45</y>
<width>70</width>
<font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</font>
<vertical_alignment>1</vertical_alignment>
@@ -758,12 +758,12 @@ time/point</text>
</action>
</actions>
<text>More..</text>
- <x>308</x>
- <y>461</y>
+ <x>303</x>
+ <y>480</y>
<width>49</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -775,8 +775,8 @@ time/point</text>
<widget type="led" version="2.0.0">
<name>LED_4</name>
<pv_name>$(P)$(R)$(CH)TR1-EnableCallbacks_RBV</pv_name>
- <x>142</x>
- <y>463</y>
+ <x>137</x>
+ <y>482</y>
<width>16</width>
<height>16</height>
<off_color>
@@ -808,12 +808,12 @@ time/point</text>
</actions>
<pv_name>$(P)$(R)$(CH)TR1-EnableCallbacks</pv_name>
<text>Enable</text>
- <x>159</x>
- <y>461</y>
+ <x>154</x>
+ <y>480</y>
<width>43</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -831,12 +831,12 @@ time/point</text>
</actions>
<pv_name>$(P)$(R)$(CH)TR1-EnableCallbacks</pv_name>
<text>Disable</text>
- <x>218</x>
- <y>461</y>
+ <x>213</x>
+ <y>480</y>
<width>43</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -847,10 +847,10 @@ time/point</text>
<widget type="label" version="2.0.0">
<name>Label_11</name>
<text>Trace</text>
- <x>18</x>
- <y>442</y>
+ <x>13</x>
+ <y>461</y>
<font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</font>
<vertical_alignment>1</vertical_alignment>
@@ -865,8 +865,8 @@ time/point</text>
<widget type="label" version="2.0.0">
<name>Label_13</name>
<text>Array Size</text>
- <x>18</x>
- <y>536</y>
+ <x>13</x>
+ <y>555</y>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
</font>
@@ -884,8 +884,8 @@ time/point</text>
<widget type="textupdate" version="2.0.0">
<name>Text Update_6</name>
<pv_name>$(P)$(R)$(CH)TR1-ArraySize0_RBV</pv_name>
- <x>141</x>
- <y>537</y>
+ <x>136</x>
+ <y>556</y>
<width>65</width>
<height>18</height>
<font>
@@ -914,8 +914,8 @@ time/point</text>
<widget type="label" version="2.0.0">
<name>Label_14</name>
<text>Data type</text>
- <x>28</x>
- <y>561</y>
+ <x>23</x>
+ <y>580</y>
<width>90</width>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -934,8 +934,8 @@ time/point</text>
<widget type="textupdate" version="2.0.0">
<name>Text Update_8</name>
<pv_name>$(P)$(R)$(CH)TR1-DataType_RBV</pv_name>
- <x>141</x>
- <y>562</y>
+ <x>136</x>
+ <y>581</y>
<width>79</width>
<height>18</height>
<font>
@@ -964,8 +964,8 @@ time/point</text>
<widget type="textupdate" version="2.0.0">
<name>Text Update_9</name>
<pv_name>$(P)$(R)$(CH)TR1-ArrayCounter_RBV</pv_name>
- <x>141</x>
- <y>488</y>
+ <x>136</x>
+ <y>507</y>
<height>18</height>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -993,8 +993,8 @@ time/point</text>
<widget type="label" version="2.0.0">
<name>Label_15</name>
<text>Array counter</text>
- <x>7</x>
- <y>487</y>
+ <x>2</x>
+ <y>506</y>
<width>111</width>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -1013,8 +1013,8 @@ time/point</text>
<widget type="label" version="2.0.0">
<name>Label_16</name>
<text>Array rate</text>
- <x>18</x>
- <y>512</y>
+ <x>13</x>
+ <y>531</y>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
</font>
@@ -1032,8 +1032,8 @@ time/point</text>
<widget type="textupdate" version="2.0.0">
<name>Text Update_10</name>
<pv_name>$(P)$(R)$(CH)TR1-ArrayRate_RBV</pv_name>
- <x>141</x>
- <y>513</y>
+ <x>136</x>
+ <y>532</y>
<height>18</height>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -1061,8 +1061,8 @@ time/point</text>
<widget type="label" version="2.0.0">
<name>Label_17</name>
<text>Control</text>
- <x>18</x>
- <y>461</y>
+ <x>13</x>
+ <y>480</y>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
</font>
@@ -1084,7 +1084,7 @@ time/point</text>
<y>15</y>
<width>188</width>
<font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</font>
<vertical_alignment>1</vertical_alignment>
@@ -1099,8 +1099,8 @@ time/point</text>
<widget type="label" version="2.0.0">
<name>Label_30</name>
<text>Decimation</text>
- <x>26</x>
- <y>412</y>
+ <x>21</x>
+ <y>431</y>
<width>92</width>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -1119,8 +1119,8 @@ time/point</text>
<widget type="textupdate" version="2.0.0">
<name>Text Update_18</name>
<pv_name>$(P)$(R)$(CH)DecimFactorR</pv_name>
- <x>257</x>
- <y>413</y>
+ <x>252</x>
+ <y>432</y>
<height>18</height>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -1148,8 +1148,8 @@ time/point</text>
<widget type="led" version="2.0.0">
<name>LED_6</name>
<pv_name>$(P)$(R)$(CH)ScalingControlR</pv_name>
- <x>142</x>
- <y>356</y>
+ <x>137</x>
+ <y>375</y>
<width>16</width>
<height>16</height>
<off_color>
@@ -1174,8 +1174,8 @@ time/point</text>
<widget type="textentry" version="3.0.0">
<name>Text Input_6</name>
<pv_name>$(P)$(R)$(CH)DecimFactor</pv_name>
- <x>140</x>
- <y>412</y>
+ <x>135</x>
+ <y>431</y>
<width>112</width>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -1205,12 +1205,12 @@ time/point</text>
</actions>
<pv_name>$(P)$(R)$(CH)ScalingControl</pv_name>
<text>Enable</text>
- <x>159</x>
- <y>354</y>
+ <x>154</x>
+ <y>373</y>
<width>43</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -1228,12 +1228,12 @@ time/point</text>
</actions>
<pv_name>$(P)$(R)$(CH)ScalingControl</pv_name>
<text>Disable</text>
- <x>218</x>
- <y>354</y>
+ <x>213</x>
+ <y>373</y>
<width>43</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -1244,11 +1244,11 @@ time/point</text>
<widget type="label" version="2.0.0">
<name>Label_31</name>
<text>Scaling</text>
- <x>18</x>
- <y>325</y>
+ <x>13</x>
+ <y>344</y>
<width>80</width>
<font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</font>
<horizontal_alignment>1</horizontal_alignment>
@@ -1264,8 +1264,8 @@ time/point</text>
<widget type="label" version="2.0.0">
<name>Label_32</name>
<text>Control</text>
- <x>48</x>
- <y>354</y>
+ <x>43</x>
+ <y>373</y>
<width>70</width>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -1343,12 +1343,12 @@ time/point</text>
</action>
</actions>
<text>More..</text>
- <x>303</x>
- <y>614</y>
+ <x>298</x>
+ <y>633</y>
<width>49</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -1360,8 +1360,8 @@ time/point</text>
<widget type="led" version="2.0.0">
<name>LED_7</name>
<pv_name>$(P)$(R)$(CH)CB1-EnableCallbacks_RBV</pv_name>
- <x>137</x>
- <y>616</y>
+ <x>132</x>
+ <y>635</y>
<width>16</width>
<height>16</height>
<off_color>
@@ -1393,12 +1393,12 @@ time/point</text>
</actions>
<pv_name>$(P)$(R)$(CH)CB1-EnableCallbacks</pv_name>
<text>Enable</text>
- <x>154</x>
- <y>614</y>
+ <x>149</x>
+ <y>633</y>
<width>43</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -1416,12 +1416,12 @@ time/point</text>
</actions>
<pv_name>$(P)$(R)$(CH)CB1-EnableCallbacks</pv_name>
<text>Disable</text>
- <x>213</x>
- <y>614</y>
+ <x>208</x>
+ <y>633</y>
<width>43</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -1432,10 +1432,10 @@ time/point</text>
<widget type="label" version="2.0.0">
<name>Label_34</name>
<text>Circular buffer</text>
- <x>13</x>
- <y>595</y>
+ <x>8</x>
+ <y>614</y>
<font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</font>
<vertical_alignment>1</vertical_alignment>
@@ -1450,8 +1450,8 @@ time/point</text>
<widget type="label" version="2.0.0">
<name>Label_35</name>
<text>Control</text>
- <x>13</x>
- <y>614</y>
+ <x>8</x>
+ <y>633</y>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
</font>
@@ -1479,12 +1479,12 @@ time/point</text>
</action>
</actions>
<text>More..</text>
- <x>303</x>
- <y>665</y>
+ <x>298</x>
+ <y>684</y>
<width>49</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -1496,8 +1496,8 @@ time/point</text>
<widget type="led" version="2.0.0">
<name>LED_8</name>
<pv_name>$(P)$(R)$(CH)TR2-EnableCallbacks_RBV</pv_name>
- <x>137</x>
- <y>667</y>
+ <x>132</x>
+ <y>686</y>
<width>16</width>
<height>16</height>
<off_color>
@@ -1529,12 +1529,12 @@ time/point</text>
</actions>
<pv_name>$(P)$(R)$(CH)TR2-EnableCallbacks</pv_name>
<text>Enable</text>
- <x>154</x>
- <y>665</y>
+ <x>149</x>
+ <y>684</y>
<width>43</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -1552,12 +1552,12 @@ time/point</text>
</actions>
<pv_name>$(P)$(R)$(CH)TR2-EnableCallbacks</pv_name>
<text>Disable</text>
- <x>213</x>
- <y>665</y>
+ <x>208</x>
+ <y>684</y>
<width>43</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -1568,11 +1568,11 @@ time/point</text>
<widget type="label" version="2.0.0">
<name>Label_36</name>
<text>Circular buffer trace</text>
- <x>13</x>
- <y>646</y>
+ <x>8</x>
+ <y>665</y>
<width>142</width>
<font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</font>
<vertical_alignment>1</vertical_alignment>
@@ -1587,8 +1587,8 @@ time/point</text>
<widget type="label" version="2.0.0">
<name>Label_37</name>
<text>Control</text>
- <x>13</x>
- <y>665</y>
+ <x>8</x>
+ <y>684</y>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
</font>
@@ -1606,8 +1606,8 @@ time/point</text>
<widget type="label" version="2.0.0">
<name>Label_297</name>
<text>Memory addr.</text>
- <x>11</x>
- <y>240</y>
+ <x>6</x>
+ <y>259</y>
<width>106</width>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -1626,8 +1626,8 @@ time/point</text>
<widget type="textupdate" version="2.0.0">
<name>Text Update_79</name>
<pv_name>$(P)$(R)$(CH)MemoryAddressR</pv_name>
- <x>259</x>
- <y>241</y>
+ <x>254</x>
+ <y>260</y>
<height>18</height>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -1655,8 +1655,8 @@ time/point</text>
<widget type="textentry" version="3.0.0">
<name>Text Input_7</name>
<pv_name>$(P)$(R)$(CH)MemoryAddress</pv_name>
- <x>140</x>
- <y>240</y>
+ <x>135</x>
+ <y>259</y>
<width>112</width>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -1688,12 +1688,12 @@ time/point</text>
</action>
</actions>
<text>More..</text>
- <x>303</x>
- <y>715</y>
+ <x>298</x>
+ <y>734</y>
<width>49</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -1705,8 +1705,8 @@ time/point</text>
<widget type="led" version="2.0.0">
<name>LED_9</name>
<pv_name>$(P)$(R)$(CH)HDF1-EnableCallbacks_RBV</pv_name>
- <x>137</x>
- <y>717</y>
+ <x>132</x>
+ <y>736</y>
<width>16</width>
<height>16</height>
<off_color>
@@ -1738,12 +1738,12 @@ time/point</text>
</actions>
<pv_name>$(P)$(R)$(CH)HDF1-EnableCallbacks</pv_name>
<text>Enable</text>
- <x>154</x>
- <y>715</y>
+ <x>149</x>
+ <y>734</y>
<width>43</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -1761,12 +1761,12 @@ time/point</text>
</actions>
<pv_name>$(P)$(R)$(CH)HDF1-EnableCallbacks</pv_name>
<text>Disable</text>
- <x>213</x>
- <y>715</y>
+ <x>208</x>
+ <y>734</y>
<width>43</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -1777,11 +1777,11 @@ time/point</text>
<widget type="label" version="2.0.0">
<name>Label_298</name>
<text>HDF5 file save</text>
- <x>13</x>
- <y>696</y>
+ <x>8</x>
+ <y>715</y>
<width>142</width>
<font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</font>
<vertical_alignment>1</vertical_alignment>
@@ -1796,8 +1796,8 @@ time/point</text>
<widget type="label" version="2.0.0">
<name>Label_299</name>
<text>Control</text>
- <x>13</x>
- <y>715</y>
+ <x>8</x>
+ <y>734</y>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
</font>
@@ -1814,7 +1814,7 @@ time/point</text>
</widget>
<widget type="label" version="2.0.0">
<name>Label_302</name>
- <text>DMA time</text>
+ <text>PCIe start</text>
<x>2</x>
<y>194</y>
<width>116</width>
@@ -1834,7 +1834,7 @@ time/point</text>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_80</name>
- <pv_name>$(P)$(R)$(CH)DMATransferTimeR</pv_name>
+ <pv_name>$(P)$(R)$(CH)PcieStartTimeR</pv_name>
<x>141</x>
<y>195</y>
<height>18</height>
@@ -1860,4 +1860,52 @@ time/point</text>
</color>
</border_color>
</widget>
+ <widget type="label" version="2.0.0">
+ <name>Label_303</name>
+ <text>PCIe time</text>
+ <x>2</x>
+ <y>214</y>
+ <width>116</width>
+ <font>
+ <font family="Sans" style="REGULAR" size="10.891089108910892">
+ </font>
+ </font>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <wrap_words>false</wrap_words>
+ <actions>
+ </actions>
+ <border_color>
+ <color red="0" green="128" blue="255">
+ </color>
+ </border_color>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>Text Update_81</name>
+ <pv_name>$(P)$(R)$(CH)PcieTransferTimeR</pv_name>
+ <x>141</x>
+ <y>215</y>
+ <height>18</height>
+ <font>
+ <font family="Sans" style="REGULAR" size="10.891089108910892">
+ </font>
+ </font>
+ <foreground_color>
+ <color red="10" green="0" blue="184">
+ </color>
+ </foreground_color>
+ <background_color>
+ <color red="187" green="187" blue="187">
+ </color>
+ </background_color>
+ <show_units>false</show_units>
+ <vertical_alignment>1</vertical_alignment>
+ <wrap_words>false</wrap_words>
+ <actions>
+ </actions>
+ <border_color>
+ <color red="0" green="128" blue="255">
+ </color>
+ </border_color>
+ </widget>
</display>
diff --git a/99-Shared/adsis8300bpm/bpmChannelAverage.bob b/99-Shared/adsis8300bpm/bpmChannelAverage.bob
index 47b185e728ae32c9455f4d5780ac1091d63c7d8d..eb36c2864cd68405e0a95d888388c6f4c8198b4d 100644
--- a/99-Shared/adsis8300bpm/bpmChannelAverage.bob
+++ b/99-Shared/adsis8300bpm/bpmChannelAverage.bob
@@ -3,8 +3,8 @@
<name>BPM Ch $(CH)</name>
<x>470</x>
<y>197</y>
- <width>1550</width>
- <height>800</height>
+ <width>1247</width>
+ <height>812</height>
<background_color>
<color red="240" green="240" blue="240">
</color>
@@ -256,7 +256,7 @@ time/point</text>
<name>LED_1</name>
<pv_name>$(P)$(R)$(CH)DoneR</pv_name>
<x>147</x>
- <y>221</y>
+ <y>240</y>
<width>16</width>
<height>16</height>
<off_color>
@@ -330,7 +330,7 @@ time/point</text>
<name>Label_4</name>
<text>Done</text>
<x>23</x>
- <y>221</y>
+ <y>240</y>
<width>96</width>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -350,7 +350,7 @@ time/point</text>
<name>LED_1</name>
<pv_name>$(P)$(R)$(CH)ActiveR</pv_name>
<x>340</x>
- <y>221</y>
+ <y>240</y>
<width>16</width>
<height>16</height>
<off_color>
@@ -376,7 +376,7 @@ time/point</text>
<name>Label_5</name>
<text>Active</text>
<x>215</x>
- <y>221</y>
+ <y>240</y>
<width>96</width>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -396,7 +396,7 @@ time/point</text>
<name>LED_2</name>
<pv_name>$(P)$(R)$(CH)ConvStatus</pv_name>
<x>142</x>
- <y>296</y>
+ <y>315</y>
<width>16</width>
<height>16</height>
<off_color>
@@ -429,7 +429,7 @@ time/point</text>
<pv_name>$(P)$(R)$(CH)ConvControl</pv_name>
<text>Enable</text>
<x>159</x>
- <y>294</y>
+ <y>313</y>
<width>43</width>
<height>20</height>
<font>
@@ -452,7 +452,7 @@ time/point</text>
<pv_name>$(P)$(R)$(CH)ConvControl</pv_name>
<text>Disable</text>
<x>218</x>
- <y>294</y>
+ <y>313</y>
<width>43</width>
<height>20</height>
<font>
@@ -468,7 +468,7 @@ time/point</text>
<name>Label_6</name>
<text>Converting</text>
<x>18</x>
- <y>265</y>
+ <y>284</y>
<width>80</width>
<font>
<font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
@@ -488,7 +488,7 @@ time/point</text>
<name>Label_7</name>
<text>Scale</text>
<x>48</x>
- <y>368</y>
+ <y>387</y>
<width>70</width>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -508,7 +508,7 @@ time/point</text>
<name>Text Input_1</name>
<pv_name>$(P)$(R)$(CH)ScalingFactor</pv_name>
<x>140</x>
- <y>368</y>
+ <y>387</y>
<width>112</width>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -531,7 +531,7 @@ time/point</text>
<name>Text Update_2</name>
<pv_name>$(P)$(R)$(CH)ScalingFactorR</pv_name>
<x>257</x>
- <y>369</y>
+ <y>388</y>
<height>18</height>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -559,7 +559,7 @@ time/point</text>
<name>Label_8</name>
<text>Offset</text>
<x>48</x>
- <y>389</y>
+ <y>408</y>
<width>70</width>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -579,7 +579,7 @@ time/point</text>
<name>Text Update_3</name>
<pv_name>$(P)$(R)$(CH)ScalingOffsetR</pv_name>
<x>257</x>
- <y>390</y>
+ <y>409</y>
<height>18</height>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -607,7 +607,7 @@ time/point</text>
<name>Text Input_2</name>
<pv_name>$(P)$(R)$(CH)ScalingOffset</pv_name>
<x>140</x>
- <y>389</y>
+ <y>408</y>
<width>112</width>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -630,7 +630,7 @@ time/point</text>
<name>Label_9</name>
<text>Control</text>
<x>48</x>
- <y>294</y>
+ <y>313</y>
<width>70</width>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -776,7 +776,7 @@ time/point</text>
</actions>
<text>More..</text>
<x>306</x>
- <y>570</y>
+ <y>589</y>
<width>49</width>
<height>20</height>
<font>
@@ -793,7 +793,7 @@ time/point</text>
<name>LED_4</name>
<pv_name>$(P)$(R)$(CH)TR1-EnableCallbacks_RBV</pv_name>
<x>140</x>
- <y>572</y>
+ <y>591</y>
<width>16</width>
<height>16</height>
<off_color>
@@ -826,7 +826,7 @@ time/point</text>
<pv_name>$(P)$(R)$(CH)TR1-EnableCallbacks</pv_name>
<text>Enable</text>
<x>157</x>
- <y>570</y>
+ <y>589</y>
<width>43</width>
<height>20</height>
<font>
@@ -849,7 +849,7 @@ time/point</text>
<pv_name>$(P)$(R)$(CH)TR1-EnableCallbacks</pv_name>
<text>Disable</text>
<x>216</x>
- <y>570</y>
+ <y>589</y>
<width>43</width>
<height>20</height>
<font>
@@ -865,7 +865,7 @@ time/point</text>
<name>Label_11</name>
<text>Trace</text>
<x>16</x>
- <y>551</y>
+ <y>570</y>
<font>
<font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
@@ -883,7 +883,7 @@ time/point</text>
<name>Label_13</name>
<text>Array Size</text>
<x>16</x>
- <y>645</y>
+ <y>664</y>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
</font>
@@ -902,7 +902,7 @@ time/point</text>
<name>Text Update_6</name>
<pv_name>$(P)$(R)$(CH)TR1-ArraySize0_RBV</pv_name>
<x>139</x>
- <y>646</y>
+ <y>665</y>
<width>65</width>
<height>18</height>
<font>
@@ -932,7 +932,7 @@ time/point</text>
<name>Label_14</name>
<text>Data type</text>
<x>26</x>
- <y>670</y>
+ <y>689</y>
<width>90</width>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -952,7 +952,7 @@ time/point</text>
<name>Text Update_8</name>
<pv_name>$(P)$(R)$(CH)TR1-DataType_RBV</pv_name>
<x>139</x>
- <y>671</y>
+ <y>690</y>
<width>79</width>
<height>18</height>
<font>
@@ -982,7 +982,7 @@ time/point</text>
<name>Text Update_9</name>
<pv_name>$(P)$(R)$(CH)TR1-ArrayCounter_RBV</pv_name>
<x>139</x>
- <y>597</y>
+ <y>616</y>
<height>18</height>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -1011,7 +1011,7 @@ time/point</text>
<name>Label_15</name>
<text>Array counter</text>
<x>5</x>
- <y>596</y>
+ <y>615</y>
<width>111</width>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -1031,7 +1031,7 @@ time/point</text>
<name>Label_16</name>
<text>Array rate</text>
<x>16</x>
- <y>621</y>
+ <y>640</y>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
</font>
@@ -1050,7 +1050,7 @@ time/point</text>
<name>Text Update_10</name>
<pv_name>$(P)$(R)$(CH)TR1-ArrayRate_RBV</pv_name>
<x>139</x>
- <y>622</y>
+ <y>641</y>
<height>18</height>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -1079,7 +1079,7 @@ time/point</text>
<name>Label_17</name>
<text>Control</text>
<x>16</x>
- <y>570</y>
+ <y>589</y>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
</font>
@@ -1117,7 +1117,7 @@ time/point</text>
<name>Label_19</name>
<text>Averaging</text>
<x>18</x>
- <y>426</y>
+ <y>445</y>
<width>80</width>
<font>
<font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
@@ -1137,7 +1137,7 @@ time/point</text>
<name>Label_20</name>
<text>Start</text>
<x>48</x>
- <y>444</y>
+ <y>463</y>
<width>70</width>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -1157,7 +1157,7 @@ time/point</text>
<name>Text Update_11</name>
<pv_name>$(P)$(R)$(CH)AvgStartR</pv_name>
<x>257</x>
- <y>445</y>
+ <y>464</y>
<height>18</height>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -1186,7 +1186,7 @@ time/point</text>
<name>Text Input_3</name>
<pv_name>$(P)$(R)$(CH)AvgStart</pv_name>
<x>140</x>
- <y>444</y>
+ <y>463</y>
<width>112</width>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -1209,7 +1209,7 @@ time/point</text>
<name>Label_21</name>
<text>Count</text>
<x>48</x>
- <y>465</y>
+ <y>484</y>
<width>70</width>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -1229,7 +1229,7 @@ time/point</text>
<name>Text Update_12</name>
<pv_name>$(P)$(R)$(CH)AvgCountR</pv_name>
<x>257</x>
- <y>466</y>
+ <y>485</y>
<height>18</height>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -1258,7 +1258,7 @@ time/point</text>
<name>Text Input_4</name>
<pv_name>$(P)$(R)$(CH)AvgCount</pv_name>
<x>140</x>
- <y>465</y>
+ <y>484</y>
<width>112</width>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -1281,7 +1281,7 @@ time/point</text>
<name>Label_22</name>
<text>Value</text>
<x>48</x>
- <y>519</y>
+ <y>538</y>
<width>70</width>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -1301,7 +1301,7 @@ time/point</text>
<name>Text Update_13</name>
<pv_name>$(P)$(R)$(CH)AvgValue</pv_name>
<x>257</x>
- <y>520</y>
+ <y>539</y>
<height>18</height>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -1329,7 +1329,7 @@ time/point</text>
<name>Label_30</name>
<text>Decimation</text>
<x>26</x>
- <y>407</y>
+ <y>426</y>
<width>92</width>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -1349,7 +1349,7 @@ time/point</text>
<name>Text Update_18</name>
<pv_name>$(P)$(R)$(CH)DecimFactorR</pv_name>
<x>257</x>
- <y>408</y>
+ <y>427</y>
<height>18</height>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -1378,7 +1378,7 @@ time/point</text>
<name>LED_6</name>
<pv_name>$(P)$(R)$(CH)ScalingControlR</pv_name>
<x>142</x>
- <y>351</y>
+ <y>370</y>
<width>16</width>
<height>16</height>
<off_color>
@@ -1404,7 +1404,7 @@ time/point</text>
<name>Text Input_6</name>
<pv_name>$(P)$(R)$(CH)DecimFactor</pv_name>
<x>140</x>
- <y>407</y>
+ <y>426</y>
<width>112</width>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -1435,7 +1435,7 @@ time/point</text>
<pv_name>$(P)$(R)$(CH)ScalingControl</pv_name>
<text>Enable</text>
<x>159</x>
- <y>349</y>
+ <y>368</y>
<width>43</width>
<height>20</height>
<font>
@@ -1458,7 +1458,7 @@ time/point</text>
<pv_name>$(P)$(R)$(CH)ScalingControl</pv_name>
<text>Disable</text>
<x>218</x>
- <y>349</y>
+ <y>368</y>
<width>43</width>
<height>20</height>
<font>
@@ -1474,7 +1474,7 @@ time/point</text>
<name>Label_31</name>
<text>Scaling</text>
<x>18</x>
- <y>320</y>
+ <y>339</y>
<width>80</width>
<font>
<font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
@@ -1494,7 +1494,7 @@ time/point</text>
<name>Label_32</name>
<text>Control</text>
<x>48</x>
- <y>349</y>
+ <y>368</y>
<width>70</width>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -1572,7 +1572,7 @@ time/point</text>
</actions>
<text>More..</text>
<x>299</x>
- <y>714</y>
+ <y>733</y>
<width>49</width>
<height>20</height>
<font>
@@ -1589,7 +1589,7 @@ time/point</text>
<name>LED_7</name>
<pv_name>$(P)$(R)$(CH)CB1-EnableCallbacks_RBV</pv_name>
<x>133</x>
- <y>716</y>
+ <y>735</y>
<width>16</width>
<height>16</height>
<off_color>
@@ -1622,7 +1622,7 @@ time/point</text>
<pv_name>$(P)$(R)$(CH)CB1-EnableCallbacks</pv_name>
<text>Enable</text>
<x>150</x>
- <y>714</y>
+ <y>733</y>
<width>43</width>
<height>20</height>
<font>
@@ -1645,7 +1645,7 @@ time/point</text>
<pv_name>$(P)$(R)$(CH)CB1-EnableCallbacks</pv_name>
<text>Disable</text>
<x>209</x>
- <y>714</y>
+ <y>733</y>
<width>43</width>
<height>20</height>
<font>
@@ -1661,7 +1661,7 @@ time/point</text>
<name>Label_34</name>
<text>Circular buffer</text>
<x>9</x>
- <y>695</y>
+ <y>714</y>
<font>
<font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
@@ -1679,7 +1679,7 @@ time/point</text>
<name>Label_35</name>
<text>Control</text>
<x>9</x>
- <y>714</y>
+ <y>733</y>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
</font>
@@ -1708,7 +1708,7 @@ time/point</text>
</actions>
<text>More..</text>
<x>299</x>
- <y>765</y>
+ <y>784</y>
<width>49</width>
<height>20</height>
<font>
@@ -1725,7 +1725,7 @@ time/point</text>
<name>LED_8</name>
<pv_name>$(P)$(R)$(CH)TR2-EnableCallbacks_RBV</pv_name>
<x>133</x>
- <y>767</y>
+ <y>786</y>
<width>16</width>
<height>16</height>
<off_color>
@@ -1758,7 +1758,7 @@ time/point</text>
<pv_name>$(P)$(R)$(CH)TR2-EnableCallbacks</pv_name>
<text>Enable</text>
<x>150</x>
- <y>765</y>
+ <y>784</y>
<width>43</width>
<height>20</height>
<font>
@@ -1781,7 +1781,7 @@ time/point</text>
<pv_name>$(P)$(R)$(CH)TR2-EnableCallbacks</pv_name>
<text>Disable</text>
<x>209</x>
- <y>765</y>
+ <y>784</y>
<width>43</width>
<height>20</height>
<font>
@@ -1797,7 +1797,7 @@ time/point</text>
<name>Label_37</name>
<text>Control</text>
<x>9</x>
- <y>765</y>
+ <y>784</y>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
</font>
@@ -1815,7 +1815,7 @@ time/point</text>
<widget type="label" version="2.0.0">
<name>Label_38</name>
<text>Num. averaged</text>
- <y>482</y>
+ <y>501</y>
<width>118</width>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -1835,7 +1835,7 @@ time/point</text>
<name>Text Update_20</name>
<pv_name>$(P)$(CH)AvgNumSamplesR</pv_name>
<x>257</x>
- <y>483</y>
+ <y>502</y>
<height>18</height>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -1863,7 +1863,7 @@ time/point</text>
<name>LED_9</name>
<pv_name>$(P)$(R)$(CH)AvgBusyR</pv_name>
<x>148</x>
- <y>501</y>
+ <y>520</y>
<width>16</width>
<height>16</height>
<off_color>
@@ -1889,7 +1889,7 @@ time/point</text>
<name>Label_39</name>
<text>Busy</text>
<x>23</x>
- <y>501</y>
+ <y>520</y>
<width>96</width>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -1954,7 +1954,7 @@ time/point</text>
<name>Label_40</name>
<text>Circular buffer trace</text>
<x>12</x>
- <y>746</y>
+ <y>765</y>
<width>142</width>
<font>
<font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
@@ -1973,7 +1973,7 @@ time/point</text>
<name>Label_297</name>
<text>Memory addr.</text>
<x>9</x>
- <y>247</y>
+ <y>266</y>
<width>106</width>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -1993,7 +1993,7 @@ time/point</text>
<name>Text Update_79</name>
<pv_name>$(P)$(R)$(CH)MemoryAddressR</pv_name>
<x>257</x>
- <y>248</y>
+ <y>267</y>
<height>18</height>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -2022,7 +2022,7 @@ time/point</text>
<name>Text Input_7</name>
<pv_name>$(P)$(R)$(CH)MemoryAddress</pv_name>
<x>138</x>
- <y>247</y>
+ <y>266</y>
<width>112</width>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -2180,7 +2180,7 @@ time/point</text>
</widget>
<widget type="label" version="2.0.0">
<name>Label_302</name>
- <text>DMA time</text>
+ <text>PCIe start</text>
<y>194</y>
<width>116</width>
<font>
@@ -2199,7 +2199,7 @@ time/point</text>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_80</name>
- <pv_name>$(P)$(R)$(CH)DMATransferTimeR</pv_name>
+ <pv_name>$(P)$(R)$(CH)PcieStartTimeR</pv_name>
<x>139</x>
<y>195</y>
<height>18</height>
@@ -2333,4 +2333,51 @@ time/point</text>
</color>
</border_color>
</widget>
+ <widget type="label" version="2.0.0">
+ <name>Label_303</name>
+ <text>PCIe time</text>
+ <y>214</y>
+ <width>116</width>
+ <font>
+ <font family="Sans" style="REGULAR" size="10.891089108910892">
+ </font>
+ </font>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <wrap_words>false</wrap_words>
+ <actions>
+ </actions>
+ <border_color>
+ <color red="0" green="128" blue="255">
+ </color>
+ </border_color>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>Text Update_81</name>
+ <pv_name>$(P)$(R)$(CH)PcieTransferTimeR</pv_name>
+ <x>139</x>
+ <y>215</y>
+ <height>18</height>
+ <font>
+ <font family="Sans" style="REGULAR" size="10.891089108910892">
+ </font>
+ </font>
+ <foreground_color>
+ <color red="10" green="0" blue="184">
+ </color>
+ </foreground_color>
+ <background_color>
+ <color red="187" green="187" blue="187">
+ </color>
+ </background_color>
+ <show_units>false</show_units>
+ <vertical_alignment>1</vertical_alignment>
+ <wrap_words>false</wrap_words>
+ <actions>
+ </actions>
+ <border_color>
+ <color red="0" green="128" blue="255">
+ </color>
+ </border_color>
+ </widget>
</display>