diff --git a/99-Shared/adsis8300/sis8300.bob b/99-Shared/adsis8300/sis8300.bob index 5fdea3d9a394aaa546d11328d4c612bd712760f3..700226d2d252f23f230df9d568acee5c87bfb53c 100644 --- a/99-Shared/adsis8300/sis8300.bob +++ b/99-Shared/adsis8300/sis8300.bob @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <display version="2.0.0"> <name>AD SIS8300</name> - <width>2070</width> - <height>930</height> + <width>2160</width> + <height>1110</height> <background_color> <color red="240" green="240" blue="240"> </color> @@ -14,7 +14,7 @@ <class>TITLE-BAR</class> <x use_class="true">0</x> <y use_class="true">0</y> - <width>2070</width> + <width>2160</width> <height use_class="true">50</height> <line_width use_class="true">0</line_width> <background_color use_class="true"> @@ -48,8 +48,8 @@ <file>system.bob</file> <x>20</x> <y>70</y> - <width>1320</width> - <height>840</height> + <width>1430</width> + <height>1040</height> <resize>2</resize> <actions> </actions> @@ -61,7 +61,7 @@ <widget type="embedded" version="2.0.0"> <name>Linking Container_1</name> <file>channels.bob</file> - <x>1360</x> + <x>1470</x> <y>70</y> <width>690</width> <height>840</height> diff --git a/99-Shared/adsis8300/system.bob b/99-Shared/adsis8300/system.bob index 7ec696ddb27d08f07661988dc05abc5c680e5f17..56173823f9b788490efa53ff9ceb098e9aa63bfd 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>840</height> + <height>1040</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>840</height> + <height>1040</height> <line_width>0</line_width> <line_color> <color red="128" green="0" blue="255"> @@ -49,7 +49,7 @@ $(pv_value)</tooltip> <widget type="rectangle" version="2.0.0"> <name>BGGrey03-background_13</name> <x>20</x> - <y>380</y> + <y>580</y> <width>610</width> <height>250</height> <line_width>0</line_width> @@ -77,7 +77,7 @@ $(pv_value)</tooltip> <widget type="rectangle" version="2.0.0"> <name>BGGrey03-background_11</name> <x>20</x> - <y>690</y> + <y>890</y> <width>610</width> <height>130</height> <line_width>0</line_width> @@ -93,7 +93,7 @@ $(pv_value)</tooltip> <x>20</x> <y>50</y> <width>610</width> - <height>270</height> + <height>470</height> <line_width>0</line_width> <background_color> <color name="GROUP-BACKGROUND" red="200" green="205" blue="201"> @@ -465,7 +465,6 @@ $(pv_value)</tooltip> <width>300</width> <height>30</height> <format>0</format> - <precision>3</precision> <actions> </actions> <minimum>-1.0</minimum> @@ -725,7 +724,7 @@ $(pv_value)</tooltip> <name>Text Update_104</name> <pv_name>$(P)$(R)MessageR</pv_name> <x>40</x> - <y>710</y> + <y>910</y> <width>570</width> <height>90</height> <background_color> @@ -745,7 +744,7 @@ $(pv_value)</tooltip> <name>Text Input_2</name> <pv_name>$(P)$(R)NumSamples</pv_name> <x>420</x> - <y>500</y> + <y>700</y> <width>190</width> <height>30</height> <actions> @@ -760,7 +759,7 @@ $(pv_value)</tooltip> <name>Label_219</name> <text>Number of samples:</text> <x>40</x> - <y>500</y> + <y>700</y> <width>150</width> <height>30</height> <horizontal_alignment>2</horizontal_alignment> @@ -777,7 +776,7 @@ $(pv_value)</tooltip> <name>Text Input_3</name> <pv_name>$(P)$(R)ArrayCounter</pv_name> <x>420</x> - <y>540</y> + <y>740</y> <width>190</width> <height>30</height> <actions> @@ -792,7 +791,7 @@ $(pv_value)</tooltip> <name>Label_220</name> <text>No. of acquisitions:</text> <x>40</x> - <y>540</y> + <y>740</y> <width>150</width> <height>30</height> <horizontal_alignment>2</horizontal_alignment> @@ -809,7 +808,7 @@ $(pv_value)</tooltip> <name>Label_221</name> <text>Acquire:</text> <x>40</x> - <y>400</y> + <y>600</y> <width>150</width> <height>30</height> <horizontal_alignment>2</horizontal_alignment> @@ -833,7 +832,7 @@ $(pv_value)</tooltip> <pv_name>$(P)$(R)Acquire</pv_name> <text>Start</text> <x>250</x> - <y>400</y> + <y>600</y> <width>70</width> <background_color> <color red="240" green="240" blue="240"> @@ -851,7 +850,7 @@ $(pv_value)</tooltip> <pv_name>$(P)$(R)Acquire</pv_name> <text>Stop</text> <x>340</x> - <y>400</y> + <y>600</y> <width>70</width> <background_color> <color red="240" green="240" blue="240"> @@ -862,7 +861,7 @@ $(pv_value)</tooltip> <name>Text Update_105</name> <pv_name>$(P)$(R)NumSamplesR</pv_name> <x>210</x> - <y>500</y> + <y>700</y> <width>190</width> <height>30</height> <horizontal_alignment>1</horizontal_alignment> @@ -879,7 +878,7 @@ $(pv_value)</tooltip> <name>Text Update_106</name> <pv_name>$(P)$(R)ArrayCounter_RBV</pv_name> <x>210</x> - <y>540</y> + <y>740</y> <width>190</width> <height>30</height> <horizontal_alignment>1</horizontal_alignment> @@ -896,7 +895,7 @@ $(pv_value)</tooltip> <name>Action Button_6</name> <actions> <action type="open_display"> - <file>../asyn/asynRecord.opi</file> + <file>../asyn/asynRecord.bob</file> <macros> <R>$(R)AsynIO</R> </macros> @@ -905,7 +904,7 @@ $(pv_value)</tooltip> </actions> <text>Asyn</text> <x>250</x> - <y>450</y> + <y>650</y> <width>70</width> <background_color> <color red="240" green="240" blue="240"> @@ -917,7 +916,7 @@ $(pv_value)</tooltip> <name>LED</name> <pv_name>$(P)$(R)Acquire</pv_name> <x>210</x> - <y>405</y> + <y>605</y> <actions> </actions> </widget> @@ -925,7 +924,7 @@ $(pv_value)</tooltip> <name>Label_234</name> <text>Asyn record:</text> <x>40</x> - <y>450</y> + <y>650</y> <width>150</width> <height>30</height> <horizontal_alignment>2</horizontal_alignment> @@ -942,7 +941,7 @@ $(pv_value)</tooltip> <name>Label_235</name> <text>Acquisition rate:</text> <x>40</x> - <y>580</y> + <y>780</y> <width>150</width> <height>30</height> <horizontal_alignment>2</horizontal_alignment> @@ -959,7 +958,7 @@ $(pv_value)</tooltip> <name>Text Update_119</name> <pv_name>$(P)$(R)ArrayRate_RBV</pv_name> <x>210</x> - <y>580</y> + <y>780</y> <width>190</width> <height>30</height> <horizontal_alignment>1</horizontal_alignment> @@ -990,7 +989,7 @@ $(pv_value)</tooltip> <widget type="label" version="2.0.0"> <name>BGGrey02-title_18</name> <text>Driver message</text> - <y>640</y> + <y>840</y> <width>650</width> <height>50</height> <font> @@ -1062,7 +1061,7 @@ $(pv_value)</tooltip> <widget type="label" version="2.0.0"> <name>BGGrey02-title_22</name> <text>Acquisition Settings</text> - <y>330</y> + <y>530</y> <width>650</width> <height>50</height> <font> @@ -1077,4 +1076,176 @@ $(pv_value)</tooltip> <vertical_alignment>1</vertical_alignment> <wrap_words>false</wrap_words> </widget> + <widget type="label" version="2.0.0"> + <name>Label_215</name> + <text>PCIe Link speed:</text> + <x>40</x> + <y>310</y> + <width>150</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="textupdate" version="2.0.0"> + <name>Text Update_103</name> + <pv_name>$(P)$(R)PcieLinkSpeedR</pv_name> + <x>210</x> + <y>310</y> + <width>190</width> + <height>30</height> + <format>6</format> + <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_216</name> + <text>PCIe Link width:</text> + <x>40</x> + <y>350</y> + <width>150</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="textupdate" version="2.0.0"> + <name>Text Update_107</name> + <pv_name>$(P)$(R)PcieLinkWidthR</pv_name> + <x>210</x> + <y>350</y> + <width>190</width> + <height>30</height> + <format>6</format> + <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_217</name> + <text>PCIe start time:</text> + <x>40</x> + <y>390</y> + <width>150</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="textupdate" version="2.0.0"> + <name>Text Update_108</name> + <pv_name>$(P)$(R)PcieStartTimeR</pv_name> + <x>210</x> + <y>390</y> + <width>190</width> + <height>30</height> + <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="textupdate" version="2.0.0"> + <name>Text Update_109</name> + <pv_name>$(P)$(R)PcieEndTimeR</pv_name> + <x>210</x> + <y>430</y> + <width>190</width> + <height>30</height> + <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_218</name> + <text>PCIe end time:</text> + <x>40</x> + <y>430</y> + <width>150</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="label" version="2.0.0"> + <name>Label_222</name> + <text>PCIe transfer time:</text> + <x>40</x> + <y>470</y> + <width>150</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="textupdate" version="2.0.0"> + <name>Text Update_110</name> + <pv_name>$(P)$(R)PcieTransferTimeR</pv_name> + <x>210</x> + <y>470</y> + <width>190</width> + <height>30</height> + <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>