diff --git a/10-Top/fcioc/instance.bob b/10-Top/fcioc/instance.bob
index 9a0318236a150f7886f0f97ce188dbc9fea1b6b7..3e0c286e0adfe93531a76d2bbc50da155deb645b 100644
--- a/10-Top/fcioc/instance.bob
+++ b/10-Top/fcioc/instance.bob
@@ -58,8 +58,8 @@
<file>../../99-Shared/adsis8300/system_top.bob</file>
<macros>
<Name>FC</Name>
- <P>$(CONTROL_GROUP):</P>
- <R>$(AMC_NAME):</R>
+ <P>$(CONTROL_GROUP)</P>
+ <R>$(AMC_NAME)</R>
</macros>
<target>tab</target>
</action>
diff --git a/10-Top/fcioc/top.bob b/10-Top/fcioc/top.bob
index da9607acd7883c188912e70854887dcfaa1ffd83..2100f6f8f62fec13f56ea100e21ceb143cdd1e5c 100644
--- a/10-Top/fcioc/top.bob
+++ b/10-Top/fcioc/top.bob
@@ -11,8 +11,8 @@
<widget type="embedded" version="2.0.0">
<name>Linking Container</name>
<macros>
- <AMC_NAME>Ctrl-AMC-110</AMC_NAME>
- <CONTROL_GROUP>PBI-FC01</CONTROL_GROUP>
+ <AMC_NAME>Ctrl-AMC-110:</AMC_NAME>
+ <CONTROL_GROUP>PBI-FC01:</CONTROL_GROUP>
<P1>LEBT-010:</P1>
<P2>MEBT-010:</P2>
<P3>DTL-020:</P3>
diff --git a/99-Shared/adsis8300/system.bob b/99-Shared/adsis8300/system.bob
index 56173823f9b788490efa53ff9ceb098e9aa63bfd..1b9c81b3ef21284a65c238cc870ee404e46f5d4b 100644
--- a/99-Shared/adsis8300/system.bob
+++ b/99-Shared/adsis8300/system.bob
@@ -2,7 +2,7 @@
<display version="2.0.0">
<name>$(P)$(R) System</name>
<width>1430</width>
- <height>1040</height>
+ <height>1060</height>
<actions>
</actions>
<widget type="rectangle" version="2.0.0">
@@ -29,7 +29,7 @@ $(pv_value)</tooltip>
<widget type="rectangle" version="2.0.0">
<name>Rectangle</name>
<width>650</width>
- <height>1040</height>
+ <height>1060</height>
<line_width>0</line_width>
<line_color>
<color red="128" green="0" blue="255">
@@ -51,7 +51,7 @@ $(pv_value)</tooltip>
<x>20</x>
<y>580</y>
<width>610</width>
- <height>250</height>
+ <height>270</height>
<line_width>0</line_width>
<background_color>
<color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
@@ -77,7 +77,7 @@ $(pv_value)</tooltip>
<widget type="rectangle" version="2.0.0">
<name>BGGrey03-background_11</name>
<x>20</x>
- <y>890</y>
+ <y>910</y>
<width>610</width>
<height>130</height>
<line_width>0</line_width>
@@ -724,7 +724,7 @@ $(pv_value)</tooltip>
<name>Text Update_104</name>
<pv_name>$(P)$(R)MessageR</pv_name>
<x>40</x>
- <y>910</y>
+ <y>930</y>
<width>570</width>
<height>90</height>
<background_color>
@@ -744,7 +744,7 @@ $(pv_value)</tooltip>
<name>Text Input_2</name>
<pv_name>$(P)$(R)NumSamples</pv_name>
<x>420</x>
- <y>700</y>
+ <y>720</y>
<width>190</width>
<height>30</height>
<actions>
@@ -759,7 +759,7 @@ $(pv_value)</tooltip>
<name>Label_219</name>
<text>Number of samples:</text>
<x>40</x>
- <y>700</y>
+ <y>720</y>
<width>150</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
@@ -776,7 +776,7 @@ $(pv_value)</tooltip>
<name>Text Input_3</name>
<pv_name>$(P)$(R)ArrayCounter</pv_name>
<x>420</x>
- <y>740</y>
+ <y>760</y>
<width>190</width>
<height>30</height>
<actions>
@@ -791,7 +791,7 @@ $(pv_value)</tooltip>
<name>Label_220</name>
<text>No. of acquisitions:</text>
<x>40</x>
- <y>740</y>
+ <y>760</y>
<width>150</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
@@ -861,7 +861,7 @@ $(pv_value)</tooltip>
<name>Text Update_105</name>
<pv_name>$(P)$(R)NumSamplesR</pv_name>
<x>210</x>
- <y>700</y>
+ <y>720</y>
<width>190</width>
<height>30</height>
<horizontal_alignment>1</horizontal_alignment>
@@ -878,7 +878,7 @@ $(pv_value)</tooltip>
<name>Text Update_106</name>
<pv_name>$(P)$(R)ArrayCounter_RBV</pv_name>
<x>210</x>
- <y>740</y>
+ <y>760</y>
<width>190</width>
<height>30</height>
<horizontal_alignment>1</horizontal_alignment>
@@ -904,7 +904,7 @@ $(pv_value)</tooltip>
</actions>
<text>Asyn</text>
<x>250</x>
- <y>650</y>
+ <y>680</y>
<width>70</width>
<background_color>
<color red="240" green="240" blue="240">
@@ -924,7 +924,7 @@ $(pv_value)</tooltip>
<name>Label_234</name>
<text>Asyn record:</text>
<x>40</x>
- <y>650</y>
+ <y>680</y>
<width>150</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
@@ -941,7 +941,7 @@ $(pv_value)</tooltip>
<name>Label_235</name>
<text>Acquisition rate:</text>
<x>40</x>
- <y>780</y>
+ <y>800</y>
<width>150</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
@@ -958,7 +958,7 @@ $(pv_value)</tooltip>
<name>Text Update_119</name>
<pv_name>$(P)$(R)ArrayRate_RBV</pv_name>
<x>210</x>
- <y>780</y>
+ <y>800</y>
<width>190</width>
<height>30</height>
<horizontal_alignment>1</horizontal_alignment>
@@ -989,7 +989,7 @@ $(pv_value)</tooltip>
<widget type="label" version="2.0.0">
<name>BGGrey02-title_18</name>
<text>Driver message</text>
- <y>840</y>
+ <y>860</y>
<width>650</width>
<height>50</height>
<font>
@@ -1248,4 +1248,57 @@ $(pv_value)</tooltip>
</color>
</border_color>
</widget>
+ <widget type="label" version="2.0.0">
+ <name>Label_272</name>
+ <text>Transfer waveforms:</text>
+ <x>30</x>
+ <y>640</y>
+ <width>160</width>
+ <height>30</height>
+ <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="action_button" version="3.0.0">
+ <name>Action Button_54</name>
+ <actions>
+ <action type="write_pv">
+ <pv_name>$(pv_name)</pv_name>
+ <value>1</value>
+ </action>
+ </actions>
+ <pv_name>$(P)$(R)TransferArrays</pv_name>
+ <text>Yes</text>
+ <x>250</x>
+ <y>640</y>
+ <width>70</width>
+ </widget>
+ <widget type="action_button" version="3.0.0">
+ <name>Action Button_55</name>
+ <actions>
+ <action type="write_pv">
+ <pv_name>$(pv_name)</pv_name>
+ <value>0</value>
+ </action>
+ </actions>
+ <pv_name>$(P)$(R)TransferArrays</pv_name>
+ <text>No</text>
+ <x>340</x>
+ <y>640</y>
+ <width>70</width>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>LED_9</name>
+ <pv_name>$(P)$(R)TransferArraysR</pv_name>
+ <x>210</x>
+ <y>650</y>
+ <actions>
+ </actions>
+ </widget>
</display>
diff --git a/99-Shared/adsis8300fc/channel.bob b/99-Shared/adsis8300fc/channel.bob
index a5dcd87afb1d19ca426bc6eeb51b43f0befd9b39..7aba2d438372a3e8f3a2ff22b9bfcbc157250ce3 100644
--- a/99-Shared/adsis8300fc/channel.bob
+++ b/99-Shared/adsis8300fc/channel.bob
@@ -376,7 +376,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_45</name>
- <pv_name>$(P)$(R)NumSamplesR</pv_name>
+ <pv_name>$(CONTROL_GROUP)$(AMC_NAME)NumSamplesR</pv_name>
<x>390</x>
<y>180</y>
<width>110</width>
@@ -418,7 +418,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_51</name>
- <pv_name>$(P)$(R)ArrayCounter_RBV</pv_name>
+ <pv_name>$(CONTROL_GROUP)$(AMC_NAME)ArrayCounter_RBV</pv_name>
<x>260</x>
<y>220</y>
<width>240</width>
@@ -667,7 +667,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_60</name>
- <pv_name>$(P)$(R)ArrayRate_RBV</pv_name>
+ <pv_name>$(CONTROL_GROUP)$(AMC_NAME)ArrayRate_RBV</pv_name>
<x>260</x>
<y>140</y>
<width>240</width>
@@ -2072,6 +2072,7 @@ $(pv_value)</tooltip>
<action type="open_display">
<file>../adcore/NDCircularBuff.opi</file>
<macros>
+ <P>$(P)$(R)</P>
<R>CB1-</R>
</macros>
<target>tab</target>
@@ -2152,6 +2153,7 @@ $(pv_value)</tooltip>
<action type="open_display">
<file>../admisc/NDTrace.opi</file>
<macros>
+ <P>$(P)$(R)</P>
<R>TRC1-</R>
</macros>
<target>tab</target>
@@ -2169,6 +2171,7 @@ $(pv_value)</tooltip>
<action type="open_display">
<file>../admisc/NDProcess.opi</file>
<macros>
+ <P>$(P)$(R)</P>
<R>PROC1-</R>
</macros>
<target>tab</target>
@@ -2211,6 +2214,7 @@ $(pv_value)</tooltip>
<action type="open_display">
<file>../adcore/NDFileHDF5.opi</file>
<macros>
+ <P>$(P)$(R)</P>
<R>HDF1-</R>
</macros>
<target>tab</target>
@@ -2851,6 +2855,7 @@ $(pv_value)</tooltip>
<action type="open_display">
<file>../adcore/NDPluginTimeSeries.opi</file>
<macros>
+ <P>$(P)$(R)</P>
<R>STAT3-TS-</R>
</macros>
<target>tab</target>
@@ -2921,7 +2926,7 @@ $(pv_value)</tooltip>
<value>1</value>
</action>
</actions>
- <pv_name>$(P)$(R)Acquire</pv_name>
+ <pv_name>$(CONTROL_GROUP)$(AMC_NAME)Acquire</pv_name>
<text>Start</text>
<x>260</x>
<y>620</y>
@@ -2935,7 +2940,7 @@ $(pv_value)</tooltip>
<value>0</value>
</action>
</actions>
- <pv_name>$(P)$(R)Acquire</pv_name>
+ <pv_name>$(CONTROL_GROUP)$(AMC_NAME)Acquire</pv_name>
<text>Stop</text>
<x>390</x>
<y>620</y>
@@ -2943,7 +2948,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_69</name>
- <pv_name>$(P)$(R)MessageR</pv_name>
+ <pv_name>$(CONTROL_GROUP)$(AMC_NAME)MessageR</pv_name>
<x>260</x>
<y>700</y>
<width>240</width>
@@ -3017,6 +3022,8 @@ $(pv_value)</tooltip>
<file>../adsis8300/system_top.bob</file>
<macros>
<Name>FC</Name>
+ <P>$(CONTROL_GROUP)</P>
+ <R>$(AMC_NAME)</R>
</macros>
<target>tab</target>
</action>
@@ -3054,7 +3061,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="spinner" version="2.0.0">
<name>Spinner_4</name>
- <pv_name>$(P)$(R)NumSamples</pv_name>
+ <pv_name>$(CONTROL_GROUP)$(AMC_NAME)NumSamples</pv_name>
<x>260</x>
<y>180</y>
<width>110</width>
@@ -3073,7 +3080,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="led" version="2.0.0">
<name>LED_2</name>
- <pv_name>$(P)$(R)Acquire</pv_name>
+ <pv_name>$(CONTROL_GROUP)$(AMC_NAME)Acquire</pv_name>
<x>215</x>
<y>585</y>
<off_color>
@@ -3085,7 +3092,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_41</name>
- <pv_name>$(P)$(R)Acquire_RBV</pv_name>
+ <pv_name>$(CONTROL_GROUP)$(AMC_NAME)Acquire_RBV</pv_name>
<x>260</x>
<y>580</y>
<width>240</width>