Skip to content
Snippets Groups Projects
Commit b1765161 authored by Joao Paulo Martins's avatar Joao Paulo Martins
Browse files

Merge branch 'laispessine/opis-acc-pbi-engineer-xtpico-and-manager-pv-names'

parents 6e589e1c 0e94f526
No related branches found
No related tags found
1 merge request!22Update prefixes of XTPico and Manager IOC PVs used for MEBT EMU FE screen
Hide whitespace changes
Inline Side-by-side
10-Top/emuioc/top.bob
+ 4
− 1
View file @ b1765161
......@@ -238,7 +238,10 @@
<action type="open_display">
<file>../../99-Shared/adifc14emu/frontend/mebtemu-fe-detail.bob</file>
<macros>
<P>MEBT-010:PBI-EMUFE-110:</P>
<P_DAQ_1>PBI-EMU02:Ctrl-AMC-110</P_DAQ_1>
<P_DAQ_2>PBI-EMU02:Ctrl-AMC-120</P_DAQ_2>
<P_MANAGER>MEBT-010:PBI-EMUFE-002:</P_MANAGER>
<P_XTPICO>MEBT-010:PBI-EMUFE-001:</P_XTPICO>
<R>Eeprom-</R>
</macros>
<target>tab</target>
......
99-Shared/adifc14emu/frontend/launcher.bob
+ 2
− 1
View file @ b1765161
......@@ -43,7 +43,7 @@
<action type="open_display">
<file>mebtemu-fe-detail.bob</file>
<macros>
<P>MEBT-010:PBI-EMUFE-110:</P>
<P>MEBT-010:PBI-EMUFE-001:</P>
<R>Eeprom-</R>
</macros>
<target>tab</target>
......@@ -55,5 +55,6 @@
<y>70</y>
<width>230</width>
<height>60</height>
<tooltip>$(actions)</tooltip>
</widget>
</display>
99-Shared/adifc14emu/frontend/manager/manager_test.bob
+ 6
− 6
View file @ b1765161
......@@ -118,12 +118,12 @@ $(pv_value)</tooltip>
<name>LED</name>
<x>780</x>
<y>390</y>
<width>0</width>
<height>0</height>
<width>1</width>
<height>1</height>
</widget>
<widget type="led" version="2.0.0">
<name>LED_1</name>
<pv_name>$(P)IO1-LevelPin12</pv_name>
<pv_name>$(P_XTPICO)IO1-LevelPin12</pv_name>
<x>308</x>
<y>103</y>
<width>32</width>
......@@ -173,7 +173,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="led" version="2.0.0">
<name>LED_2</name>
<pv_name>$(P)IO1-LevelPin14</pv_name>
<pv_name>$(P_XTPICO)IO1-LevelPin14</pv_name>
<x>308</x>
<y>142</y>
<width>32</width>
......@@ -223,7 +223,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="led" version="2.0.0">
<name>LED_3</name>
<pv_name>$(P)IO1-LevelPin10</pv_name>
<pv_name>$(P_XTPICO)IO1-LevelPin10</pv_name>
<x>668</x>
<y>103</y>
<width>32</width>
......@@ -273,7 +273,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="led" version="2.0.0">
<name>LED_4</name>
<pv_name>$(P)IO1-LevelPin11</pv_name>
<pv_name>$(P_XTPICO)IO1-LevelPin11</pv_name>
<x>668</x>
<y>142</y>
<width>32</width>
......
99-Shared/adifc14emu/frontend/manager/manager_user_gain.bob
+ 137
− 15
View file @ b1765161
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
<width>900</width>
<height>580</height>
<height>750</height>
<background_color>
<color red="240" green="240" blue="240">
</color>
......@@ -13,7 +13,7 @@
<x>20</x>
<y>18</y>
<width>862</width>
<height>548</height>
<height>712</height>
<line_width>0</line_width>
<line_color>
<color red="128" green="0" blue="255">
......@@ -245,7 +245,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_36</name>
<pv_name>$(P)IO1-LevelPin4</pv_name>
<pv_name>$(P_XTPICO)IO1-LevelPin4</pv_name>
<x>377</x>
<y>287</y>
<width>60</width>
......@@ -255,7 +255,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_37</name>
<pv_name>$(P)IO1-LevelPin3</pv_name>
<pv_name>$(P_XTPICO)IO1-LevelPin3</pv_name>
<x>447</x>
<y>287</y>
<width>60</width>
......@@ -265,7 +265,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_38</name>
<pv_name>$(P)IO1-LevelPin2</pv_name>
<pv_name>$(P_XTPICO)IO1-LevelPin2</pv_name>
<x>517</x>
<y>287</y>
<width>60</width>
......@@ -275,7 +275,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>Label_53</name>
<text>PBI-EMU01:Ctrl-AMC-110:CH1-PROC2-Scale</text>
<text>$(P_DAQ_1):CH1-PROC2-Scale</text>
<x>53</x>
<y>353</y>
<width>320</width>
......@@ -363,7 +363,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_39</name>
<pv_name>PBI-EMU01:Ctrl-AMC-110:CH1-PROC2-Scale</pv_name>
<pv_name>$(P_DAQ_1):CH1-PROC2-Scale</pv_name>
<x>373</x>
<y>353</y>
<width>204</width>
......@@ -373,9 +373,9 @@ $(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>Label_59</name>
<text>PBI-EMU01:Ctrl-AMC-110:CH24-PROC2-Scale</text>
<text>$(P_DAQ_1):CH24-PROC2-Scale</text>
<x>53</x>
<y>480</y>
<y>460</y>
<width>320</width>
<height>30</height>
<horizontal_alignment>1</horizontal_alignment>
......@@ -390,9 +390,9 @@ $(pv_value)</tooltip>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_40</name>
<pv_name>PBI-EMU01:Ctrl-AMC-110:CH24-PROC2-Scale</pv_name>
<pv_name>$(P_DAQ_1):CH24-PROC2-Scale</pv_name>
<x>373</x>
<y>480</y>
<y>460</y>
<width>204</width>
<height>30</height>
<horizontal_alignment>1</horizontal_alignment>
......@@ -407,7 +407,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>Label_60</name>
<text>PBI-EMU01:Ctrl-AMC-110:CH2-PROC2-Scale</text>
<text>$(P_DAQ_1):CH2-PROC2-Scale</text>
<x>54</x>
<y>394</y>
<width>320</width>
......@@ -424,7 +424,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_41</name>
<pv_name>PBI-EMU01:Ctrl-AMC-110:CH2-PROC2-Scale</pv_name>
<pv_name>$(P_DAQ_1):CH2-PROC2-Scale</pv_name>
<x>374</x>
<y>394</y>
<width>204</width>
......@@ -436,7 +436,7 @@ $(pv_value)</tooltip>
<name>Label_61</name>
<text>...</text>
<x>54</x>
<y>440</y>
<y>427</y>
<width>320</width>
<height>30</height>
<horizontal_alignment>1</horizontal_alignment>
......@@ -460,7 +460,7 @@ $(pv_value)</tooltip>
<name>Label_62</name>
<text>...</text>
<x>374</x>
<y>440</y>
<y>427</y>
<width>204</width>
<height>30</height>
<horizontal_alignment>1</horizontal_alignment>
......@@ -563,4 +563,126 @@ $(pv_value)</tooltip>
</rules>
<enabled>false</enabled>
</widget>
<widget type="label" version="2.0.0">
<name>Label_72</name>
<text>$(P_DAQ_2):CH1-PROC2-Scale</text>
<x>52</x>
<y>553</y>
<width>320</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_47</name>
<pv_name>$(P_DAQ_2):CH1-PROC2-Scale</pv_name>
<x>372</x>
<y>553</y>
<width>204</width>
<height>30</height>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
<widget type="label" version="2.0.0">
<name>Label_73</name>
<text>$(P_DAQ_2):CH24-PROC2-Scale</text>
<x>52</x>
<y>660</y>
<width>320</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_48</name>
<pv_name>$(P_DAQ_2):CH24-PROC2-Scale</pv_name>
<x>372</x>
<y>660</y>
<width>204</width>
<height>30</height>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
<widget type="label" version="2.0.0">
<name>Label_74</name>
<text>$(P_DAQ_2):CH2-PROC2-Scale</text>
<x>53</x>
<y>594</y>
<width>320</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_49</name>
<pv_name>$(P_DAQ_2):CH2-PROC2-Scale</pv_name>
<x>373</x>
<y>594</y>
<width>204</width>
<height>30</height>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
<widget type="label" version="2.0.0">
<name>Label_75</name>
<text>...</text>
<x>53</x>
<y>627</y>
<width>320</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_50</name>
<x>929</x>
<y>610</y>
<width>1</width>
<height>1</height>
</widget>
<widget type="label" version="2.0.0">
<name>Label_76</name>
<text>...</text>
<x>373</x>
<y>627</y>
<width>204</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>
99-Shared/adifc14emu/frontend/mebtemu-fe-detail.bob
+ 20
− 1
View file @ b1765161
......@@ -34,6 +34,7 @@
<widget type="embedded" version="2.0.0">
<name>Linking Container_4</name>
<macros>
<P>$(P_XTPICO)</P>
<R>VM1-</R>
</macros>
<file>./xtpico/LTC2991.bob</file>
......@@ -52,6 +53,7 @@
<widget type="embedded" version="2.0.0">
<name>Linking Container_5</name>
<macros>
<P>$(P_XTPICO)</P>
<R>IO1-</R>
</macros>
<file>./xtpico/TCA9555.bob</file>
......@@ -69,6 +71,9 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display</name>
<macros>
<P>$(P_XTPICO)</P>
</macros>
<file>xtpico/TMP100_7.bob</file>
<x>44</x>
<y>48</y>
......@@ -77,6 +82,9 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_1</name>
<macros>
<P>$(P_XTPICO)</P>
</macros>
<file>xtpico/M24M02.bob</file>
<x>598</x>
<y>774</y>
......@@ -86,6 +94,10 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_manager_test_1</name>
<macros>
<P>$(P_MANAGER)</P>
<P_XTPICO>$(P_XTPICO)</P_XTPICO>
</macros>
<file>manager/manager_user_gain.bob</file>
<x>1109</x>
<y>486</y>
......@@ -95,15 +107,22 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_manager_test_2</name>
<macros>
<P>$(P_MANAGER)</P>
</macros>
<file>manager/manager_startup_sequence.bob</file>
<x>1170</x>
<y>52</y>
<width>760</width>
<height>220</height>
<height>200</height>
<resize>2</resize>
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_manager_test</name>
<macros>
<P>$(P_MANAGER)</P>
<P_XTPICO>$(P_XTPICO)</P_XTPICO>
</macros>
<file>manager/manager_test.bob</file>
<x>1171</x>
<y>262</y>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment