From 75f34b6b9d12571f8cff8887be0eec20a2d0e501 Mon Sep 17 00:00:00 2001
From: benjaminbolling <benjamin.bolling@esss.se>
Date: Mon, 22 Jun 2020 11:45:50 +0200
Subject: [PATCH] Changed PV prefixes to current PV addresses for testing
purposes.
---
10-Top/bcmioc/instance.bob | 54 +++---
99-Shared/adsis8300/system_top.bob | 4 +-
99-Shared/adsis8300bcm/acct.bob | 212 ++++++++++-----------
99-Shared/adsis8300bcm/bcm_instance.bob | 14 +-
99-Shared/adsis8300bcm/diff.bob | 108 +++++------
99-Shared/adsis8300bcm/diff_plot.bob | 122 ++++++------
99-Shared/adsis8300bcm/processed.bob | 218 +++++++++++-----------
99-Shared/adsis8300bcm/processed_item.bob | 2 +-
99-Shared/adsis8300bcm/raw.bob | 74 ++++----
9 files changed, 405 insertions(+), 403 deletions(-)
diff --git a/10-Top/bcmioc/instance.bob b/10-Top/bcmioc/instance.bob
index f40dab0..2be3b92 100644
--- a/10-Top/bcmioc/instance.bob
+++ b/10-Top/bcmioc/instance.bob
@@ -73,8 +73,9 @@
<file>../../99-Shared/adsis8300bcm/bcm_instance.opi</file>
<macros>
<CG>$(CONTROL_GROUP):$(AMC_NAME):</CG>
- <P>$(SYSTEM10):</P>
- <R></R>
+ <ID>10</ID>
+ <P>$(CONTROL_GROUP):</P>
+ <R>$(AMC_NAME):</R>
</macros>
<target>tab</target>
</action>
@@ -92,8 +93,9 @@
<file>../../99-Shared/adsis8300bcm/bcm_instance.opi</file>
<macros>
<CG>$(CONTROL_GROUP):$(AMC_NAME):</CG>
- <P>$(SYSTEM9):</P>
- <R></R>
+ <P>$(CONTROL_GROUP):</P>
+ <R>$(AMC_NAME):</R>
+ <ID>9</ID>
</macros>
<target>tab</target>
</action>
@@ -111,8 +113,9 @@
<file>../../99-Shared/adsis8300bcm/bcm_instance.opi</file>
<macros>
<CG>$(CONTROL_GROUP):$(AMC_NAME):</CG>
- <P>$(SYSTEM8):</P>
- <R></R>
+ <P>$(CONTROL_GROUP):</P>
+ <R>$(AMC_NAME):</R>
+ <ID>8</ID>
</macros>
<target>tab</target>
</action>
@@ -130,8 +133,9 @@
<file>../../99-Shared/adsis8300bcm/bcm_instance.opi</file>
<macros>
<CG>$(CONTROL_GROUP):$(AMC_NAME):</CG>
- <P>$(SYSTEM7):</P>
- <R></R>
+ <P>$(CONTROL_GROUP):</P>
+ <R>$(AMC_NAME):</R>
+ <ID>7</ID>
</macros>
<target>tab</target>
</action>
@@ -149,8 +153,9 @@
<file>../../99-Shared/adsis8300bcm/bcm_instance.opi</file>
<macros>
<CG>$(CONTROL_GROUP):$(AMC_NAME):</CG>
- <P>$(SYSTEM6):</P>
- <R></R>
+ <P>$(CONTROL_GROUP):</P>
+ <R>$(AMC_NAME):</R>
+ <ID>6</ID>
</macros>
<target>tab</target>
</action>
@@ -168,8 +173,9 @@
<file>../../99-Shared/adsis8300bcm/bcm_instance.opi</file>
<macros>
<CG>$(CONTROL_GROUP):$(AMC_NAME):</CG>
- <P>$(SYSTEM5):</P>
- <R></R>
+ <P>$(CONTROL_GROUP):</P>
+ <R>$(AMC_NAME):</R>
+ <ID>5</ID>
</macros>
<target>tab</target>
</action>
@@ -187,8 +193,9 @@
<file>../../99-Shared/adsis8300bcm/bcm_instance.opi</file>
<macros>
<CG>$(CONTROL_GROUP):$(AMC_NAME):</CG>
- <P>$(SYSTEM4):</P>
- <R></R>
+ <P>$(CONTROL_GROUP):</P>
+ <R>$(AMC_NAME):</R>
+ <ID>4</ID>
</macros>
<target>tab</target>
</action>
@@ -206,8 +213,9 @@
<file>../../99-Shared/adsis8300bcm/bcm_instance.opi</file>
<macros>
<CG>$(CONTROL_GROUP):$(AMC_NAME):</CG>
- <P>$(SYSTEM3):</P>
- <R></R>
+ <P>$(CONTROL_GROUP):</P>
+ <R>$(AMC_NAME):</R>
+ <ID>3</ID>
</macros>
<target>tab</target>
</action>
@@ -225,8 +233,9 @@
<file>../../99-Shared/adsis8300bcm/bcm_instance.opi</file>
<macros>
<CG>$(CONTROL_GROUP):$(AMC_NAME):</CG>
- <P>$(SYSTEM2):</P>
- <R></R>
+ <P>$(CONTROL_GROUP):</P>
+ <R>$(AMC_NAME):</R>
+ <ID>2</ID>
</macros>
<target>tab</target>
</action>
@@ -244,8 +253,9 @@
<file>../../99-Shared/adsis8300bcm/bcm_instance.opi</file>
<macros>
<CG>$(CONTROL_GROUP):$(AMC_NAME):</CG>
- <P>$(SYSTEM1):</P>
- <R></R>
+ <P>$(CONTROL_GROUP):</P>
+ <R>$(AMC_NAME):</R>
+ <ID>1</ID>
</macros>
<target>tab</target>
</action>
@@ -262,8 +272,8 @@
<action type="open_display">
<file>../../99-Shared/adsis8300bcm/bcm.bob</file>
<macros>
- <P>$(CONTROL_GROUP):$(AMC_NAME):</P>
- <R></R>
+ <P>$(CONTROL_GROUP):</P>
+ <R>$(AMC_NAME):</R>
</macros>
<target>tab</target>
</action>
diff --git a/99-Shared/adsis8300/system_top.bob b/99-Shared/adsis8300/system_top.bob
index 890f2ca..e395a32 100644
--- a/99-Shared/adsis8300/system_top.bob
+++ b/99-Shared/adsis8300/system_top.bob
@@ -940,10 +940,10 @@ $(pv_value)</tooltip>
<target>tab</target>
</action>
</actions>
- <text>Asyn</text>
+ <text>Open Asyn Settings</text>
<x>270</x>
<y>520</y>
- <width>70</width>
+ <width>160</width>
<background_color>
<color red="240" green="240" blue="240">
</color>
diff --git a/99-Shared/adsis8300bcm/acct.bob b/99-Shared/adsis8300bcm/acct.bob
index 8399c9c..ee37130 100644
--- a/99-Shared/adsis8300bcm/acct.bob
+++ b/99-Shared/adsis8300bcm/acct.bob
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
- <name>$(P) ACCT</name>
+ <name>$(P)$(R)ACCT$(ID)- ACCT</name>
<x>470</x>
<y>197</y>
<width>1730</width>
@@ -23,7 +23,7 @@
<widget type="label" version="2.0.0">
<name>title</name>
<class>TITLE</class>
- <text>$(P)</text>
+ <text>$(P)$(R)ACCT$(ID)-</text>
<x use_class="true">20</x>
<y use_class="true">0</y>
<width>1720</width>
@@ -305,7 +305,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_112</name>
- <pv_name>$(P)MaxPulseLengthR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-MaxPulseLengthR</pv_name>
<x>210</x>
<y>310</y>
<width>110</width>
@@ -340,7 +340,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_113</name>
- <pv_name>$(P)LowerWindowStartR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-LowerWindowStartR</pv_name>
<x>210</x>
<y>500</y>
<width>110</width>
@@ -358,7 +358,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_20</name>
- <pv_name>$(P)LowerWindowStart</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-LowerWindowStart</pv_name>
<x>351</x>
<y>500</y>
<width>120</width>
@@ -391,7 +391,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_114</name>
- <pv_name>$(P)LowerWindowEndR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-LowerWindowEndR</pv_name>
<x>210</x>
<y>540</y>
<width>110</width>
@@ -409,7 +409,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_21</name>
- <pv_name>$(P)LowerWindowEnd</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-LowerWindowEnd</pv_name>
<x>351</x>
<y>540</y>
<width>120</width>
@@ -442,7 +442,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_115</name>
- <pv_name>$(P)ErrantWindowStartR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-ErrantWindowStartR</pv_name>
<x>210</x>
<y>580</y>
<width>110</width>
@@ -460,7 +460,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_22</name>
- <pv_name>$(P)ErrantWindowStart</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-ErrantWindowStart</pv_name>
<x>351</x>
<y>580</y>
<width>120</width>
@@ -493,7 +493,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_116</name>
- <pv_name>$(P)ErrantWindowEndR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-ErrantWindowEndR</pv_name>
<x>210</x>
<y>620</y>
<width>110</width>
@@ -511,7 +511,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_23</name>
- <pv_name>$(P)ErrantWindowEnd</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-ErrantWindowEnd</pv_name>
<x>351</x>
<y>620</y>
<width>120</width>
@@ -544,7 +544,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_117</name>
- <pv_name>$(P)DcBlockingR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-DcBlockingR</pv_name>
<x>700</x>
<y>310</y>
<width>120</width>
@@ -562,7 +562,7 @@
</widget>
<widget type="combo" version="2.0.0">
<name>Menu Button_12</name>
- <pv_name>$(P)DcBlocking</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-DcBlocking</pv_name>
<x>841</x>
<y>310</y>
<width>120</width>
@@ -574,7 +574,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_28</name>
- <pv_name>$(P)MaxPulseLength</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-MaxPulseLength</pv_name>
<x>351</x>
<y>310</y>
<width>120</width>
@@ -626,7 +626,7 @@
</widget>
<widget type="combo" version="2.0.0">
<name>Menu Button_13</name>
- <pv_name>$(P)TriggerSource</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-TriggerSource</pv_name>
<x>351</x>
<y>80</y>
<width>120</width>
@@ -655,7 +655,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_100</name>
- <pv_name>$(P)BaseliningAfterR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-BaseliningAfterR</pv_name>
<x>700</x>
<y>270</y>
<width>120</width>
@@ -673,7 +673,7 @@
</widget>
<widget type="combo" version="2.0.0">
<name>Menu Button_3</name>
- <pv_name>$(P)BaseliningAfter</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-BaseliningAfter</pv_name>
<x>841</x>
<y>270</y>
<width>120</width>
@@ -702,7 +702,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_17</name>
- <pv_name>$(P)UpperThreshold</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-UpperThreshold</pv_name>
<x>840</x>
<y>490</y>
<width>120</width>
@@ -735,7 +735,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_18</name>
- <pv_name>$(P)LowerThreshold</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-LowerThreshold</pv_name>
<x>840</x>
<y>530</y>
<width>120</width>
@@ -751,7 +751,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_19</name>
- <pv_name>$(P)ErrantThreshold</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-ErrantThreshold</pv_name>
<x>840</x>
<y>570</y>
<width>120</width>
@@ -801,7 +801,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_83</name>
- <pv_name>$(P)TriggerSourceR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-TriggerSourceR</pv_name>
<x>210</x>
<y>80</y>
<width>110</width>
@@ -837,7 +837,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_85</name>
- <pv_name>$(P)PulseChargeR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-PulseChargeR</pv_name>
<x>210</x>
<y>120</y>
<width>110</width>
@@ -872,7 +872,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_86</name>
- <pv_name>$(P)FlatTopChargeR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-FlatTopChargeR</pv_name>
<x>210</x>
<y>160</y>
<width>110</width>
@@ -907,7 +907,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_87</name>
- <pv_name>$(P)PulseWidthR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-PulseWidthR</pv_name>
<x>210</x>
<y>200</y>
<width>110</width>
@@ -942,7 +942,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_89</name>
- <pv_name>$(P)AdcOffsetR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AdcOffsetR</pv_name>
<x>700</x>
<y>120</y>
<width>110</width>
@@ -961,7 +961,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_88</name>
- <pv_name>$(P)AdcScaleR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AdcScaleR</pv_name>
<x>700</x>
<y>80</y>
<width>110</width>
@@ -979,7 +979,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_11</name>
- <pv_name>$(P)AdcScale</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AdcScale</pv_name>
<x>841</x>
<y>80</y>
<width>120</width>
@@ -1012,7 +1012,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_12</name>
- <pv_name>$(P)AdcOffset</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AdcOffset</pv_name>
<x>841</x>
<y>120</y>
<width>120</width>
@@ -1028,7 +1028,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_91</name>
- <pv_name>$(P)FlatTopStartR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-FlatTopStartR</pv_name>
<x>210</x>
<y>380</y>
<width>110</width>
@@ -1063,7 +1063,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_13</name>
- <pv_name>$(P)FlatTopStart</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-FlatTopStart</pv_name>
<x>351</x>
<y>380</y>
<width>120</width>
@@ -1080,7 +1080,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_92</name>
- <pv_name>$(P)FlatTopEndR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-FlatTopEndR</pv_name>
<x>210</x>
<y>420</y>
<width>110</width>
@@ -1115,7 +1115,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_14</name>
- <pv_name>$(P)FlatTopEnd</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-FlatTopEnd</pv_name>
<x>351</x>
<y>420</y>
<width>120</width>
@@ -1149,7 +1149,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_93</name>
- <pv_name>$(P)FlatTopCurrentR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-FlatTopCurrentR</pv_name>
<x>210</x>
<y>240</y>
<width>110</width>
@@ -1184,7 +1184,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_94</name>
- <pv_name>$(P)FineDelayR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-FineDelayR</pv_name>
<x>700</x>
<y>160</y>
<width>110</width>
@@ -1201,7 +1201,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_15</name>
- <pv_name>$(P)FineDelay</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-FineDelay</pv_name>
<x>841</x>
<y>160</y>
<width>120</width>
@@ -1234,7 +1234,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_96</name>
- <pv_name>$(P)DroopRateR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-DroopRateR</pv_name>
<x>700</x>
<y>380</y>
<width>110</width>
@@ -1251,7 +1251,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_16</name>
- <pv_name>$(P)DroopRate</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-DroopRate</pv_name>
<x>841</x>
<y>380</y>
<width>120</width>
@@ -1284,7 +1284,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_97</name>
- <pv_name>$(P)DroopCompensatingR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-DroopCompensatingR</pv_name>
<x>700</x>
<y>420</y>
<width>120</width>
@@ -1302,7 +1302,7 @@
</widget>
<widget type="combo" version="2.0.0">
<name>Menu Button_2</name>
- <pv_name>$(P)DroopCompensating</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-DroopCompensating</pv_name>
<x>841</x>
<y>420</y>
<width>120</width>
@@ -1331,7 +1331,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_98</name>
- <pv_name>$(P)NoiseFilteringR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-NoiseFilteringR</pv_name>
<x>700</x>
<y>230</y>
<width>120</width>
@@ -1349,7 +1349,7 @@
</widget>
<widget type="combo" version="2.0.0">
<name>Menu Button_1</name>
- <pv_name>$(P)NoiseFiltering</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-NoiseFiltering</pv_name>
<x>841</x>
<y>230</y>
<width>120</width>
@@ -1397,7 +1397,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_103</name>
- <pv_name>$(P)ErrantThresholdR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-ErrantThresholdR</pv_name>
<x>700</x>
<y>570</y>
<width>110</width>
@@ -1415,7 +1415,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_102</name>
- <pv_name>$(P)LowerThresholdR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-LowerThresholdR</pv_name>
<x>700</x>
<y>530</y>
<width>110</width>
@@ -1433,7 +1433,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_101</name>
- <pv_name>$(P)UpperThresholdR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-UpperThresholdR</pv_name>
<x>700</x>
<y>490</y>
<width>110</width>
@@ -1486,7 +1486,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_15</name>
- <pv_name>$(P)AlarmAdcOverflowFirstR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmAdcOverflowFirstR</pv_name>
<x>525</x>
<y>315</y>
<off_color>
@@ -1502,7 +1502,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_16</name>
- <pv_name>$(P)AlarmAdcOverflowHoldR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmAdcOverflowHoldR</pv_name>
<x>575</x>
<y>315</y>
<off_color>
@@ -1518,7 +1518,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_17</name>
- <pv_name>$(P)AlarmAdcOverflowDirectR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmAdcOverflowDirectR</pv_name>
<x>625</x>
<y>315</y>
<off_color>
@@ -1551,7 +1551,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_110</name>
- <pv_name>$(P)AlarmAdcUnderflowControlR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmAdcUnderflowControlR</pv_name>
<x>240</x>
<y>350</y>
<width>120</width>
@@ -1568,7 +1568,7 @@
</widget>
<widget type="combo" version="2.0.0">
<name>Menu Button_10</name>
- <pv_name>$(P)AlarmAdcUnderflowControl</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmAdcUnderflowControl</pv_name>
<x>380</x>
<y>350</y>
<width>120</width>
@@ -1580,7 +1580,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_18</name>
- <pv_name>$(P)AlarmAdcUnderflowFirstR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmAdcUnderflowFirstR</pv_name>
<x>525</x>
<y>355</y>
<off_color>
@@ -1596,7 +1596,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_19</name>
- <pv_name>$(P)AlarmAdcUnderflowHoldR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmAdcUnderflowHoldR</pv_name>
<x>575</x>
<y>355</y>
<off_color>
@@ -1612,7 +1612,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_20</name>
- <pv_name>$(P)AlarmAdcUnderflowDirectR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmAdcUnderflowDirectR</pv_name>
<x>625</x>
<y>355</y>
<off_color>
@@ -1645,7 +1645,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_111</name>
- <pv_name>$(P)AlarmAdcStuckControlR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmAdcStuckControlR</pv_name>
<x>240</x>
<y>390</y>
<width>120</width>
@@ -1662,7 +1662,7 @@
</widget>
<widget type="combo" version="2.0.0">
<name>Menu Button_11</name>
- <pv_name>$(P)AlarmAdcStuckControl</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmAdcStuckControl</pv_name>
<x>380</x>
<y>390</y>
<width>120</width>
@@ -1674,7 +1674,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_21</name>
- <pv_name>$(P)AlarmAdcStuckFirstR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmAdcStuckFirstR</pv_name>
<x>525</x>
<y>395</y>
<off_color>
@@ -1690,7 +1690,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_22</name>
- <pv_name>$(P)AlarmAdcStuckHoldR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmAdcStuckHoldR</pv_name>
<x>575</x>
<y>395</y>
<off_color>
@@ -1706,7 +1706,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_23</name>
- <pv_name>$(P)AlarmAdcStuckDirectR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmAdcStuckDirectR</pv_name>
<x>625</x>
<y>395</y>
<off_color>
@@ -1739,7 +1739,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_118</name>
- <pv_name>$(P)AlarmAiuFaultControlR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmAiuFaultControlR</pv_name>
<x>240</x>
<y>430</y>
<width>120</width>
@@ -1756,7 +1756,7 @@
</widget>
<widget type="combo" version="2.0.0">
<name>Menu Button_14</name>
- <pv_name>$(P)AlarmAiuFaultControl</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmAiuFaultControl</pv_name>
<x>380</x>
<y>430</y>
<width>120</width>
@@ -1768,7 +1768,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_24</name>
- <pv_name>$(P)AlarmAiuFaultFirstR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmAiuFaultFirstR</pv_name>
<x>525</x>
<y>435</y>
<off_color>
@@ -1784,7 +1784,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_25</name>
- <pv_name>$(P)AlarmAiuFaultHoldR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmAiuFaultHoldR</pv_name>
<x>575</x>
<y>435</y>
<off_color>
@@ -1800,7 +1800,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_26</name>
- <pv_name>$(P)AlarmAiuFaultDirectR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmAiuFaultDirectR</pv_name>
<x>625</x>
<y>435</y>
<off_color>
@@ -1833,7 +1833,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_119</name>
- <pv_name>$(P)AlarmChargeTooHighControlR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmChargeTooHighControlR</pv_name>
<x>240</x>
<y>470</y>
<width>120</width>
@@ -1850,7 +1850,7 @@
</widget>
<widget type="combo" version="2.0.0">
<name>Menu Button_15</name>
- <pv_name>$(P)AlarmChargeTooHighControl</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmChargeTooHighControl</pv_name>
<x>380</x>
<y>470</y>
<width>120</width>
@@ -1862,7 +1862,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_27</name>
- <pv_name>$(P)AlarmChargeTooHighFirstR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmChargeTooHighFirstR</pv_name>
<x>525</x>
<y>475</y>
<off_color>
@@ -1878,7 +1878,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_28</name>
- <pv_name>$(P)AlarmChargeTooHighHoldR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmChargeTooHighHoldR</pv_name>
<x>575</x>
<y>475</y>
<off_color>
@@ -1894,7 +1894,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_29</name>
- <pv_name>$(P)AlarmChargeTooHighDirectR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmChargeTooHighDirectR</pv_name>
<x>625</x>
<y>475</y>
<off_color>
@@ -1927,7 +1927,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_30</name>
- <pv_name>$(P)AlarmLUTUpperThresholdFirstR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmLUTUpperThresholdFirstR</pv_name>
<x>525</x>
<y>515</y>
<off_color>
@@ -1943,7 +1943,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_31</name>
- <pv_name>$(P)AlarmLUTUpperThresholdHoldR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmLUTUpperThresholdHoldR</pv_name>
<x>575</x>
<y>515</y>
<off_color>
@@ -1959,7 +1959,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_32</name>
- <pv_name>$(P)AlarmLUTUpperThresholdDirectR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmLUTUpperThresholdDirectR</pv_name>
<x>625</x>
<y>515</y>
<off_color>
@@ -1992,7 +1992,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_33</name>
- <pv_name>$(P)AlarmLUTLowerThresholdFirstR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmLUTLowerThresholdFirstR</pv_name>
<x>525</x>
<y>555</y>
<off_color>
@@ -2008,7 +2008,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_34</name>
- <pv_name>$(P)AlarmLUTLowerThresholdHoldR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmLUTLowerThresholdHoldR</pv_name>
<x>575</x>
<y>555</y>
<off_color>
@@ -2024,7 +2024,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_35</name>
- <pv_name>$(P)AlarmLUTLowerThresholdDirectR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmLUTLowerThresholdDirectR</pv_name>
<x>625</x>
<y>555</y>
<off_color>
@@ -2057,7 +2057,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_36</name>
- <pv_name>$(P)AlarmLUTPulseLengthFirstR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmLUTPulseLengthFirstR</pv_name>
<x>525</x>
<y>595</y>
<off_color>
@@ -2073,7 +2073,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_37</name>
- <pv_name>$(P)AlarmLUTPulseLengthHoldR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmLUTPulseLengthHoldR</pv_name>
<x>575</x>
<y>595</y>
<off_color>
@@ -2089,7 +2089,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_38</name>
- <pv_name>$(P)AlarmLUTPulseLengthDirectR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmLUTPulseLengthDirectR</pv_name>
<x>625</x>
<y>595</y>
<off_color>
@@ -2122,7 +2122,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_39</name>
- <pv_name>$(P)AlarmLUTDestinationModeFirstR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmLUTDestinationModeFirstR</pv_name>
<x>525</x>
<y>635</y>
<off_color>
@@ -2138,7 +2138,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_40</name>
- <pv_name>$(P)AlarmLUTDestinationModeHoldR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmLUTDestinationModeHoldR</pv_name>
<x>575</x>
<y>635</y>
<off_color>
@@ -2154,7 +2154,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_41</name>
- <pv_name>$(P)AlarmLUTDestinationModeDirectR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmLUTDestinationModeDirectR</pv_name>
<x>625</x>
<y>635</y>
<off_color>
@@ -2204,7 +2204,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_104</name>
- <pv_name>$(P)AlarmUpperControlR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmUpperControlR</pv_name>
<x>240</x>
<y>110</y>
<width>120</width>
@@ -2221,7 +2221,7 @@
</widget>
<widget type="combo" version="2.0.0">
<name>Menu Button_4</name>
- <pv_name>$(P)AlarmUpperControl</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmUpperControl</pv_name>
<x>380</x>
<y>110</y>
<width>120</width>
@@ -2250,7 +2250,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_105</name>
- <pv_name>$(P)AlarmLowerControlR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmLowerControlR</pv_name>
<x>240</x>
<y>150</y>
<width>120</width>
@@ -2267,7 +2267,7 @@
</widget>
<widget type="combo" version="2.0.0">
<name>Menu Button_5</name>
- <pv_name>$(P)AlarmLowerControl</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmLowerControl</pv_name>
<x>380</x>
<y>150</y>
<width>120</width>
@@ -2296,7 +2296,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_106</name>
- <pv_name>$(P)AlarmErrantControlR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmErrantControlR</pv_name>
<x>240</x>
<y>190</y>
<width>120</width>
@@ -2313,7 +2313,7 @@
</widget>
<widget type="combo" version="2.0.0">
<name>Menu Button_6</name>
- <pv_name>$(P)AlarmErrantControl</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmErrantControl</pv_name>
<x>380</x>
<y>190</y>
<width>120</width>
@@ -2342,7 +2342,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_107</name>
- <pv_name>$(P)AlarmTriggerControlR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmTriggerControlR</pv_name>
<x>240</x>
<y>230</y>
<width>120</width>
@@ -2359,7 +2359,7 @@
</widget>
<widget type="combo" version="2.0.0">
<name>Menu Button_7</name>
- <pv_name>$(P)AlarmTriggerControl</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmTriggerControl</pv_name>
<x>380</x>
<y>230</y>
<width>120</width>
@@ -2388,7 +2388,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_108</name>
- <pv_name>$(P)AlarmLimitControlR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmLimitControlR</pv_name>
<x>240</x>
<y>270</y>
<width>120</width>
@@ -2405,7 +2405,7 @@
</widget>
<widget type="combo" version="2.0.0">
<name>Menu Button_8</name>
- <pv_name>$(P)AlarmLimitControl</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmLimitControl</pv_name>
<x>380</x>
<y>270</y>
<width>120</width>
@@ -2417,7 +2417,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED</name>
- <pv_name>$(P)AlarmUpperFirstR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmUpperFirstR</pv_name>
<x>525</x>
<y>115</y>
<off_color>
@@ -2450,7 +2450,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_1</name>
- <pv_name>$(P)AlarmLowerFirstR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmLowerFirstR</pv_name>
<x>525</x>
<y>155</y>
<off_color>
@@ -2466,7 +2466,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_2</name>
- <pv_name>$(P)AlarmErrantFirstR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmErrantFirstR</pv_name>
<x>525</x>
<y>195</y>
<off_color>
@@ -2482,7 +2482,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_3</name>
- <pv_name>$(P)AlarmTriggerFirstR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmTriggerFirstR</pv_name>
<x>525</x>
<y>235</y>
<off_color>
@@ -2498,7 +2498,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_4</name>
- <pv_name>$(P)AlarmLimitFirstR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmLimitFirstR</pv_name>
<x>525</x>
<y>275</y>
<off_color>
@@ -2514,7 +2514,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_5</name>
- <pv_name>$(P)AlarmUpperHoldR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmUpperHoldR</pv_name>
<x>575</x>
<y>115</y>
<off_color>
@@ -2547,7 +2547,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_6</name>
- <pv_name>$(P)AlarmLowerHoldR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmLowerHoldR</pv_name>
<x>575</x>
<y>155</y>
<off_color>
@@ -2563,7 +2563,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_7</name>
- <pv_name>$(P)AlarmErrantHoldR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmErrantHoldR</pv_name>
<x>575</x>
<y>195</y>
<off_color>
@@ -2579,7 +2579,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_8</name>
- <pv_name>$(P)AlarmTriggerHoldR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmTriggerHoldR</pv_name>
<x>575</x>
<y>235</y>
<off_color>
@@ -2595,7 +2595,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_9</name>
- <pv_name>$(P)AlarmLimitHoldR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmLimitHoldR</pv_name>
<x>575</x>
<y>275</y>
<off_color>
@@ -2611,7 +2611,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_10</name>
- <pv_name>$(P)AlarmUpperDirectR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmUpperDirectR</pv_name>
<x>625</x>
<y>115</y>
<off_color>
@@ -2644,7 +2644,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_11</name>
- <pv_name>$(P)AlarmLowerDirectR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmLowerDirectR</pv_name>
<x>625</x>
<y>155</y>
<off_color>
@@ -2660,7 +2660,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_12</name>
- <pv_name>$(P)AlarmErrantDirectR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmErrantDirectR</pv_name>
<x>625</x>
<y>195</y>
<off_color>
@@ -2676,7 +2676,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_13</name>
- <pv_name>$(P)AlarmTriggerDirectR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmTriggerDirectR</pv_name>
<x>625</x>
<y>235</y>
<off_color>
@@ -2692,7 +2692,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_14</name>
- <pv_name>$(P)AlarmLimitDirectR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmLimitDirectR</pv_name>
<x>625</x>
<y>275</y>
<off_color>
@@ -2725,7 +2725,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_109</name>
- <pv_name>$(P)AlarmAdcOverflowControlR</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmAdcOverflowControlR</pv_name>
<x>240</x>
<y>310</y>
<width>120</width>
@@ -2742,7 +2742,7 @@
</widget>
<widget type="combo" version="2.0.0">
<name>Menu Button_9</name>
- <pv_name>$(P)AlarmAdcOverflowControl</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-AlarmAdcOverflowControl</pv_name>
<x>380</x>
<y>310</y>
<width>120</width>
diff --git a/99-Shared/adsis8300bcm/bcm_instance.bob b/99-Shared/adsis8300bcm/bcm_instance.bob
index f0c8fd8..59270d5 100644
--- a/99-Shared/adsis8300bcm/bcm_instance.bob
+++ b/99-Shared/adsis8300bcm/bcm_instance.bob
@@ -95,10 +95,6 @@
<actions>
<action type="open_display">
<file>channels.bob</file>
- <macros>
- <P>$(CG)</P>
- <R></R>
- </macros>
<target>window</target>
</action>
</actions>
@@ -139,10 +135,6 @@ $(pv_value)</tooltip>
<actions>
<action type="open_display">
<file>bcm.opi</file>
- <macros>
- <P>$(CG)</P>
- <R></R>
- </macros>
<target>window</target>
</action>
</actions>
@@ -180,7 +172,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_2</name>
- <pv_name>$(P)PRC-Name</pv_name>
+ <pv_name>$(P)$(R)PROC$(ID)-Name</pv_name>
<x>60</x>
<y>180</y>
<width>220</width>
@@ -240,7 +232,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_1</name>
- <pv_name>$(P)Name</pv_name>
+ <pv_name>$(P)$(R)ACCT$(ID)-Name</pv_name>
<x>60</x>
<y>220</y>
<width>220</width>
@@ -283,7 +275,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_75</name>
- <pv_name>$(P)RAW-Name</pv_name>
+ <pv_name>$(P)$(R)RAW$(ID)-Name</pv_name>
<x>60</x>
<y>140</y>
<width>220</width>
diff --git a/99-Shared/adsis8300bcm/diff.bob b/99-Shared/adsis8300bcm/diff.bob
index 73ea874..4c74f4f 100644
--- a/99-Shared/adsis8300bcm/diff.bob
+++ b/99-Shared/adsis8300bcm/diff.bob
@@ -549,7 +549,7 @@
<widget type="label" version="2.0.0">
<name>title</name>
<class>TITLE</class>
- <text>$(P)DF$(IDX)</text>
+ <text>$(P)$(R)DIFF$(IDX)</text>
<x use_class="true">20</x>
<y use_class="true">0</y>
<width>1660</width>
@@ -590,7 +590,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_89</name>
- <pv_name>$(P)DF$(IDX)-SourceBR</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-SourceBR</pv_name>
<x>260</x>
<y>180</y>
<width>120</width>
@@ -608,7 +608,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_88</name>
- <pv_name>$(P)DF$(IDX)-SourceAR</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-SourceAR</pv_name>
<x>260</x>
<y>140</y>
<width>120</width>
@@ -646,7 +646,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_91</name>
- <pv_name>$(P)DF$(IDX)-DelayR</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-DelayR</pv_name>
<x>260</x>
<y>220</y>
<width>110</width>
@@ -684,7 +684,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_13</name>
- <pv_name>$(P)DF$(IDX)-Delay</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-Delay</pv_name>
<x>400</x>
<y>220</y>
<width>120</width>
@@ -722,7 +722,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_97</name>
- <pv_name>$(P)DF$(IDX)-WsBetweenR</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-WsBetweenR</pv_name>
<x>260</x>
<y>620</y>
<width>120</width>
@@ -739,7 +739,7 @@
</widget>
<widget type="combo" version="2.0.0">
<name>Menu Button_2</name>
- <pv_name>$(P)DF$(IDX)-WsBetween</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-WsBetween</pv_name>
<x>400</x>
<y>620</y>
<width>120</width>
@@ -772,7 +772,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_98</name>
- <pv_name>$(P)DF$(IDX)-EmuBetweenR</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-EmuBetweenR</pv_name>
<x>260</x>
<y>660</y>
<width>120</width>
@@ -789,7 +789,7 @@
</widget>
<widget type="combo" version="2.0.0">
<name>Menu Button_1</name>
- <pv_name>$(P)DF$(IDX)-EmuBetween</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-EmuBetween</pv_name>
<x>400</x>
<y>660</y>
<width>120</width>
@@ -822,7 +822,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_100</name>
- <pv_name>$(P)DF$(IDX)-RfqBetweenR</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-RfqBetweenR</pv_name>
<x>260</x>
<y>700</y>
<width>120</width>
@@ -839,7 +839,7 @@
</widget>
<widget type="combo" version="2.0.0">
<name>Menu Button_3</name>
- <pv_name>$(P)DF$(IDX)-RfqBetween</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-RfqBetween</pv_name>
<x>400</x>
<y>700</y>
<width>120</width>
@@ -872,7 +872,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_101</name>
- <pv_name>$(P)DF$(IDX)-FastThresholdR</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-FastThresholdR</pv_name>
<x>260</x>
<y>380</y>
<width>110</width>
@@ -890,7 +890,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_17</name>
- <pv_name>$(P)DF$(IDX)-FastThreshold</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-FastThreshold</pv_name>
<x>400</x>
<y>380</y>
<width>120</width>
@@ -927,7 +927,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_102</name>
- <pv_name>$(P)DF$(IDX)-RisingWindowStartR</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-RisingWindowStartR</pv_name>
<x>1380</x>
<y>160</y>
<width>110</width>
@@ -945,7 +945,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_18</name>
- <pv_name>$(P)DF$(IDX)-RisingWindowStart</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-RisingWindowStart</pv_name>
<x>1520</x>
<y>160</y>
<width>120</width>
@@ -982,7 +982,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_104</name>
- <pv_name>$(P)DF$(IDX)-AlarmFastControlR</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-AlarmFastControlR</pv_name>
<x>1215</x>
<y>550</y>
<width>120</width>
@@ -999,7 +999,7 @@
</widget>
<widget type="combo" version="2.0.0">
<name>Menu Button_4</name>
- <pv_name>$(P)DF$(IDX)-AlarmFastControl</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-AlarmFastControl</pv_name>
<x>1355</x>
<y>550</y>
<width>120</width>
@@ -1032,7 +1032,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_105</name>
- <pv_name>$(P)DF$(IDX)-AlarmMediumControlR</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-AlarmMediumControlR</pv_name>
<x>1215</x>
<y>610</y>
<width>120</width>
@@ -1049,7 +1049,7 @@
</widget>
<widget type="combo" version="2.0.0">
<name>Menu Button_5</name>
- <pv_name>$(P)DF$(IDX)-AlarmMediumControl</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-AlarmMediumControl</pv_name>
<x>1355</x>
<y>610</y>
<width>120</width>
@@ -1082,7 +1082,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_106</name>
- <pv_name>$(P)DF$(IDX)-AlarmSlowControlR</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-AlarmSlowControlR</pv_name>
<x>1215</x>
<y>670</y>
<width>120</width>
@@ -1099,7 +1099,7 @@
</widget>
<widget type="combo" version="2.0.0">
<name>Menu Button_6</name>
- <pv_name>$(P)DF$(IDX)-AlarmSlowControl</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-AlarmSlowControl</pv_name>
<x>1355</x>
<y>670</y>
<width>120</width>
@@ -1111,7 +1111,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED</name>
- <pv_name>$(P)DF$(IDX)-AlarmFastFirstR</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-AlarmFastFirstR</pv_name>
<x>1500</x>
<y>555</y>
<off_color>
@@ -1127,7 +1127,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_1</name>
- <pv_name>$(P)DF$(IDX)-AlarmMediumFirstR</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-AlarmMediumFirstR</pv_name>
<x>1500</x>
<y>615</y>
<off_color>
@@ -1143,7 +1143,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_2</name>
- <pv_name>$(P)DF$(IDX)-AlarmSlowFirstR</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-AlarmSlowFirstR</pv_name>
<x>1500</x>
<y>675</y>
<off_color>
@@ -1159,7 +1159,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_5</name>
- <pv_name>$(P)DF$(IDX)-AlarmFastHoldR</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-AlarmFastHoldR</pv_name>
<x>1555</x>
<y>555</y>
<off_color>
@@ -1175,7 +1175,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_6</name>
- <pv_name>$(P)DF$(IDX)-AlarmMediumHoldR</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-AlarmMediumHoldR</pv_name>
<x>1555</x>
<y>615</y>
<off_color>
@@ -1191,7 +1191,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_7</name>
- <pv_name>$(P)DF$(IDX)-AlarmSlowHoldR</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-AlarmSlowHoldR</pv_name>
<x>1555</x>
<y>675</y>
<off_color>
@@ -1207,7 +1207,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_10</name>
- <pv_name>$(P)DF$(IDX)-AlarmFastDirectR</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-AlarmFastDirectR</pv_name>
<x>1610</x>
<y>555</y>
<off_color>
@@ -1223,7 +1223,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_11</name>
- <pv_name>$(P)DF$(IDX)-AlarmMediumDirectR</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-AlarmMediumDirectR</pv_name>
<x>1610</x>
<y>615</y>
<off_color>
@@ -1239,7 +1239,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_12</name>
- <pv_name>$(P)DF$(IDX)-AlarmSlowDirectR</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-AlarmSlowDirectR</pv_name>
<x>1610</x>
<y>675</y>
<off_color>
@@ -1276,7 +1276,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_112</name>
- <pv_name>$(P)DF$(IDX)-FastMinimumR</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-FastMinimumR</pv_name>
<x>820</x>
<y>500</y>
<width>110</width>
@@ -1294,7 +1294,7 @@
</widget>
<widget type="combo" version="2.0.0">
<name>Menu Button_13</name>
- <pv_name>$(P)DF$(IDX)-SourceA</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-SourceA</pv_name>
<x>400</x>
<y>140</y>
<width>120</width>
@@ -1306,7 +1306,7 @@
</widget>
<widget type="combo" version="2.0.0">
<name>Menu Button_14</name>
- <pv_name>$(P)DF$(IDX)-SourceB</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-SourceB</pv_name>
<x>400</x>
<y>180</y>
<width>120</width>
@@ -1339,7 +1339,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_118</name>
- <pv_name>$(P)DF$(IDX)-MediumThresholdR</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-MediumThresholdR</pv_name>
<x>260</x>
<y>420</y>
<width>110</width>
@@ -1357,7 +1357,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_24</name>
- <pv_name>$(P)DF$(IDX)-MediumThreshold</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-MediumThreshold</pv_name>
<x>400</x>
<y>420</y>
<width>120</width>
@@ -1394,7 +1394,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_119</name>
- <pv_name>$(P)DF$(IDX)-SlowThresholdR</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-SlowThresholdR</pv_name>
<x>260</x>
<y>460</y>
<width>110</width>
@@ -1412,7 +1412,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_25</name>
- <pv_name>$(P)DF$(IDX)-SlowThreshold</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-SlowThreshold</pv_name>
<x>400</x>
<y>460</y>
<width>120</width>
@@ -1449,7 +1449,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_120</name>
- <pv_name>$(P)DF$(IDX)-RisingWindowEndR</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-RisingWindowEndR</pv_name>
<x>1380</x>
<y>217</y>
<width>110</width>
@@ -1467,7 +1467,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_26</name>
- <pv_name>$(P)DF$(IDX)-RisingWindowEnd</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-RisingWindowEnd</pv_name>
<x>1520</x>
<y>217</y>
<width>120</width>
@@ -1504,7 +1504,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_121</name>
- <pv_name>$(P)DF$(IDX)-FallingWindowStartR</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-FallingWindowStartR</pv_name>
<x>1380</x>
<y>270</y>
<width>110</width>
@@ -1522,7 +1522,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_27</name>
- <pv_name>$(P)DF$(IDX)-FallingWindowStart</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-FallingWindowStart</pv_name>
<x>1520</x>
<y>270</y>
<width>120</width>
@@ -1559,7 +1559,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_122</name>
- <pv_name>$(P)DF$(IDX)-FallingWindowEndR</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-FallingWindowEndR</pv_name>
<x>1380</x>
<y>320</y>
<width>110</width>
@@ -1577,7 +1577,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_28</name>
- <pv_name>$(P)DF$(IDX)-FallingWindowEnd</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-FallingWindowEnd</pv_name>
<x>1520</x>
<y>320</y>
<width>120</width>
@@ -1614,7 +1614,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_123</name>
- <pv_name>$(P)DF$(IDX)-FastMaximumR</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-FastMaximumR</pv_name>
<x>820</x>
<y>540</y>
<width>110</width>
@@ -1653,7 +1653,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_124</name>
- <pv_name>$(P)DF$(IDX)-MediumMinimumR</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-MediumMinimumR</pv_name>
<x>820</x>
<y>580</y>
<width>110</width>
@@ -1692,7 +1692,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_125</name>
- <pv_name>$(P)DF$(IDX)-MediumMaximumR</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-MediumMaximumR</pv_name>
<x>820</x>
<y>620</y>
<width>110</width>
@@ -1731,7 +1731,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_126</name>
- <pv_name>$(P)DF$(IDX)-SlowMinimumR</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-SlowMinimumR</pv_name>
<x>820</x>
<y>660</y>
<width>110</width>
@@ -1770,7 +1770,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_127</name>
- <pv_name>$(P)DF$(IDX)-SlowMaximumR</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-SlowMaximumR</pv_name>
<x>820</x>
<y>700</y>
<width>110</width>
@@ -1809,7 +1809,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_128</name>
- <pv_name>$(P)DF$(IDX)-FastWindowWidthR</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-FastWindowWidthR</pv_name>
<x>820</x>
<y>160</y>
<width>110</width>
@@ -1827,7 +1827,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_29</name>
- <pv_name>$(P)DF$(IDX)-FastWindowWidth</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-FastWindowWidth</pv_name>
<x>960</x>
<y>160</y>
<width>120</width>
@@ -1864,7 +1864,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_129</name>
- <pv_name>$(P)DF$(IDX)-MediumWindowWidthR</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-MediumWindowWidthR</pv_name>
<x>820</x>
<y>270</y>
<width>110</width>
@@ -1882,7 +1882,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_30</name>
- <pv_name>$(P)DF$(IDX)-MediumWindowWidth</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-MediumWindowWidth</pv_name>
<x>960</x>
<y>270</y>
<width>120</width>
@@ -1919,7 +1919,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_130</name>
- <pv_name>$(P)DF$(IDX)-FastWindowWidthInverseR</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-FastWindowWidthInverseR</pv_name>
<x>820</x>
<y>217</y>
<width>110</width>
@@ -1958,7 +1958,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_131</name>
- <pv_name>$(P)DF$(IDX)-MediumWindowWidthInverseR</pv_name>
+ <pv_name>$(P)$(R)DIFF$(IDX)-MediumWindowWidthInverseR</pv_name>
<x>820</x>
<y>320</y>
<width>110</width>
diff --git a/99-Shared/adsis8300bcm/diff_plot.bob b/99-Shared/adsis8300bcm/diff_plot.bob
index 351e083..8a9853d 100644
--- a/99-Shared/adsis8300bcm/diff_plot.bob
+++ b/99-Shared/adsis8300bcm/diff_plot.bob
@@ -433,7 +433,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>BGGrey03-title_16</name>
- <text>$(P)PRB3</text>
+ <text>$(P)$(R)PROBE3</text>
<x>560</x>
<y>120</y>
<width>500</width>
@@ -465,7 +465,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>BGGrey03-title_12</name>
- <text>$(P)PRB2</text>
+ <text>$(P)$(R)PROBE2</text>
<x>40</x>
<y>120</y>
<width>500</width>
@@ -522,31 +522,31 @@
<exp bool_exp="true">
<expression>pv0</expression>
</exp>
- <pv_name>$(P)PRB2-TR0-ArraySize1_RBV</pv_name>
+ <pv_name>$(P)$(R)PROBE2-TR0-ArraySize1_RBV</pv_name>
</rule>
<rule name="data_x0_max" prop_id="x_axis.maximum" out_exp="true">
<exp bool_exp="true">
<expression>pv0</expression>
</exp>
- <pv_name>$(P)PRB2-TR0-ArraySize0_RBV</pv_name>
+ <pv_name>$(P)$(R)PROBE2-TR0-ArraySize0_RBV</pv_name>
</rule>
<rule name="traces[0].name" prop_id="traces[0].name" out_exp="true">
<exp bool_exp="pvStr0!=""">
<expression>pvStr0</expression>
</exp>
- <pv_name>$(P)PRB2-TR0-Name</pv_name>
+ <pv_name>$(P)$(R)PROBE2-TR0-Name</pv_name>
</rule>
<rule name="traces[1].name" prop_id="traces[1].name" out_exp="true">
<exp bool_exp="pvStr0!=""">
<expression>pvStr0</expression>
</exp>
- <pv_name>$(P)PRB3-TR0-Name</pv_name>
+ <pv_name>$(P)$(R)PROBE3-TR0-Name</pv_name>
</rule>
<rule name="traces[2].name" prop_id="traces[2].name" out_exp="true">
<exp bool_exp="pvStr0!=""">
<expression>pvStr0</expression>
</exp>
- <pv_name>$(P)PRB1-TR9-Name</pv_name>
+ <pv_name>$(P)$(R)PROBE1-TR9-Name</pv_name>
</rule>
</rules>
<x_axis>
@@ -605,8 +605,8 @@
<traces>
<trace>
<name>$(traces[0].y_pv)</name>
- <x_pv>$(P)PRB2-TR0-ArrayTimeUs</x_pv>
- <y_pv>$(P)PRB2-TR0-ArrayData</y_pv>
+ <x_pv>$(P)$(R)PROBE2-TR0-ArrayTimeUs</x_pv>
+ <y_pv>$(P)$(R)PROBE2-TR0-ArrayData</y_pv>
<err_pv></err_pv>
<axis>0</axis>
<trace_type>1</trace_type>
@@ -622,8 +622,8 @@
</trace>
<trace>
<name>$(traces[1].y_pv)</name>
- <x_pv>$(P)PRB3-TR0-ArrayTimeUs</x_pv>
- <y_pv>$(P)PRB3-TR0-ArrayData</y_pv>
+ <x_pv>$(P)$(R)PROBE3-TR0-ArrayTimeUs</x_pv>
+ <y_pv>$(P)$(R)PROBE3-TR0-ArrayData</y_pv>
<err_pv></err_pv>
<axis>0</axis>
<trace_type>1</trace_type>
@@ -639,8 +639,8 @@
</trace>
<trace>
<name>$(traces[2].y_pv)</name>
- <x_pv>$(P)PRB1-TR9-ArrayTimeUs</x_pv>
- <y_pv>$(P)PRB1-TR9-ArrayData</y_pv>
+ <x_pv>$(P)$(R)PROBE1-TR9-ArrayTimeUs</x_pv>
+ <y_pv>$(P)$(R)PROBE1-TR9-ArrayData</y_pv>
<err_pv></err_pv>
<axis>1</axis>
<trace_type>1</trace_type>
@@ -675,7 +675,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_117</name>
- <pv_name>$(P)PRB2-SourceR</pv_name>
+ <pv_name>$(P)$(R)PROBE2-SourceR</pv_name>
<x>230</x>
<y>720</y>
<width>110</width>
@@ -693,7 +693,7 @@
</widget>
<widget type="combo" version="2.0.0">
<name>Menu Button_12</name>
- <pv_name>$(P)PRB2-Source</pv_name>
+ <pv_name>$(P)$(R)PROBE2-Source</pv_name>
<x>360</x>
<y>720</y>
<width>150</width>
@@ -722,7 +722,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_119</name>
- <pv_name>$(P)PRB2-NumSamplesR</pv_name>
+ <pv_name>$(P)$(R)PROBE2-NumSamplesR</pv_name>
<x>230</x>
<y>360</y>
<height>30</height>
@@ -757,7 +757,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_120</name>
- <pv_name>$(P)PRB2-FactorR</pv_name>
+ <pv_name>$(P)$(R)PROBE2-FactorR</pv_name>
<x>230</x>
<y>560</y>
<height>30</height>
@@ -774,7 +774,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_12</name>
- <pv_name>$(P)PRB2-Factor</pv_name>
+ <pv_name>$(P)$(R)PROBE2-Factor</pv_name>
<x>360</x>
<y>560</y>
<width>150</width>
@@ -807,7 +807,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_121</name>
- <pv_name>$(P)PRB2-OffsetR</pv_name>
+ <pv_name>$(P)$(R)PROBE2-OffsetR</pv_name>
<x>230</x>
<y>600</y>
<height>30</height>
@@ -824,7 +824,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_13</name>
- <pv_name>$(P)PRB2-Offset</pv_name>
+ <pv_name>$(P)$(R)PROBE2-Offset</pv_name>
<x>360</x>
<y>600</y>
<width>150</width>
@@ -874,7 +874,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_122</name>
- <pv_name>$(P)PRB2-MemoryAddressR</pv_name>
+ <pv_name>$(P)$(R)PROBE2-MemoryAddressR</pv_name>
<x>230</x>
<y>400</y>
<height>30</height>
@@ -892,7 +892,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_14</name>
- <pv_name>$(P)PRB2-MemoryAddress</pv_name>
+ <pv_name>$(P)$(R)PROBE2-MemoryAddress</pv_name>
<x>360</x>
<y>400</y>
<width>150</width>
@@ -925,7 +925,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_123</name>
- <pv_name>$(P)PRB2-FractionBitsR</pv_name>
+ <pv_name>$(P)$(R)PROBE2-FractionBitsR</pv_name>
<x>230</x>
<y>440</y>
<height>30</height>
@@ -943,7 +943,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_15</name>
- <pv_name>$(P)PRB2-FractionBits</pv_name>
+ <pv_name>$(P)$(R)PROBE2-FractionBits</pv_name>
<x>360</x>
<y>440</y>
<width>150</width>
@@ -976,7 +976,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_124</name>
- <pv_name>$(P)PRB2-DecimationR</pv_name>
+ <pv_name>$(P)$(R)PROBE2-DecimationR</pv_name>
<x>230</x>
<y>640</y>
<height>30</height>
@@ -994,7 +994,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_16</name>
- <pv_name>$(P)PRB2-Decimation</pv_name>
+ <pv_name>$(P)$(R)PROBE2-Decimation</pv_name>
<x>360</x>
<y>640</y>
<width>150</width>
@@ -1027,7 +1027,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_125</name>
- <pv_name>$(P)PRB2-ScalingR</pv_name>
+ <pv_name>$(P)$(R)PROBE2-ScalingR</pv_name>
<x>230</x>
<y>480</y>
<width>110</width>
@@ -1045,7 +1045,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_126</name>
- <pv_name>$(P)PRB2-ConvertingR</pv_name>
+ <pv_name>$(P)$(R)PROBE2-ConvertingR</pv_name>
<x>230</x>
<y>520</y>
<width>110</width>
@@ -1069,7 +1069,7 @@
<value>1</value>
</action>
</actions>
- <pv_name>$(P)PRB2-Recording</pv_name>
+ <pv_name>$(P)$(R)PROBE2-Recording</pv_name>
<text>Enable</text>
<x>290</x>
<y>270</y>
@@ -1081,7 +1081,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_1</name>
- <pv_name>$(P)PRB2-RecordingR</pv_name>
+ <pv_name>$(P)$(R)PROBE2-RecordingR</pv_name>
<x>120</x>
<y>270</y>
<width>150</width>
@@ -1100,7 +1100,7 @@
<value>0</value>
</action>
</actions>
- <pv_name>$(P)PRB2-Recording</pv_name>
+ <pv_name>$(P)$(R)PROBE2-Recording</pv_name>
<text>Disable</text>
<x>370</x>
<y>270</y>
@@ -1112,7 +1112,7 @@
</widget>
<widget type="combo" version="2.0.0">
<name>Menu Button_13</name>
- <pv_name>$(P)PRB2-Scaling</pv_name>
+ <pv_name>$(P)$(R)PROBE2-Scaling</pv_name>
<x>360</x>
<y>480</y>
<width>150</width>
@@ -1124,7 +1124,7 @@
</widget>
<widget type="combo" version="2.0.0">
<name>Menu Button_14</name>
- <pv_name>$(P)PRB2-Converting</pv_name>
+ <pv_name>$(P)$(R)PROBE2-Converting</pv_name>
<x>360</x>
<y>520</y>
<width>150</width>
@@ -1153,7 +1153,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_127</name>
- <pv_name>$(P)PRB2-TickValueR</pv_name>
+ <pv_name>$(P)$(R)PROBE2-TickValueR</pv_name>
<x>230</x>
<y>680</y>
<height>30</height>
@@ -1187,7 +1187,7 @@
</widget>
<widget type="combo" version="2.0.0">
<name>Menu Button_15</name>
- <pv_name>$(P)PRB2-Channel</pv_name>
+ <pv_name>$(P)$(R)PROBE2-Channel</pv_name>
<x>360</x>
<y>760</y>
<width>150</width>
@@ -1199,7 +1199,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_128</name>
- <pv_name>$(P)PRB2-ChannelR</pv_name>
+ <pv_name>$(P)$(R)PROBE2-ChannelR</pv_name>
<x>230</x>
<y>760</y>
<width>110</width>
@@ -1219,7 +1219,7 @@
<name>Linking Container_10</name>
<file>trace_item.opi</file>
<macros>
- <R>PRB2-TR0-</R>
+ <R>$(R)PROBE2-TR0-</R>
</macros>
<x>70</x>
<y>180</y>
@@ -1251,7 +1251,7 @@
<name>Linking Container_1</name>
<file>trace_item.opi</file>
<macros>
- <R>PRB3-TR0-</R>
+ <R>$(R)PROBE3-TR0-</R>
</macros>
<x>590</x>
<y>180</y>
@@ -1267,7 +1267,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_140</name>
- <pv_name>$(P)PRB3-ChannelR</pv_name>
+ <pv_name>$(P)$(R)PROBE3-ChannelR</pv_name>
<x>750</x>
<y>760</y>
<width>110</width>
@@ -1285,7 +1285,7 @@
</widget>
<widget type="combo" version="2.0.0">
<name>Menu Button_19</name>
- <pv_name>$(P)PRB3-Channel</pv_name>
+ <pv_name>$(P)$(R)PROBE3-Channel</pv_name>
<x>880</x>
<y>760</y>
<width>150</width>
@@ -1314,7 +1314,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_139</name>
- <pv_name>$(P)PRB3-TickValueR</pv_name>
+ <pv_name>$(P)$(R)PROBE3-TickValueR</pv_name>
<x>750</x>
<y>680</y>
<height>30</height>
@@ -1348,7 +1348,7 @@
</widget>
<widget type="combo" version="2.0.0">
<name>Menu Button_18</name>
- <pv_name>$(P)PRB3-Converting</pv_name>
+ <pv_name>$(P)$(R)PROBE3-Converting</pv_name>
<x>880</x>
<y>520</y>
<width>150</width>
@@ -1360,7 +1360,7 @@
</widget>
<widget type="combo" version="2.0.0">
<name>Menu Button_17</name>
- <pv_name>$(P)PRB3-Scaling</pv_name>
+ <pv_name>$(P)$(R)PROBE3-Scaling</pv_name>
<x>880</x>
<y>480</y>
<width>150</width>
@@ -1378,7 +1378,7 @@
<value>0</value>
</action>
</actions>
- <pv_name>$(P)PRB3-Recording</pv_name>
+ <pv_name>$(P)$(R)PROBE3-Recording</pv_name>
<text>Disable</text>
<x>890</x>
<y>270</y>
@@ -1390,7 +1390,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_1</name>
- <pv_name>$(P)PRB3-RecordingR</pv_name>
+ <pv_name>$(P)$(R)PROBE3-RecordingR</pv_name>
<x>640</x>
<y>270</y>
<width>150</width>
@@ -1409,7 +1409,7 @@
<value>1</value>
</action>
</actions>
- <pv_name>$(P)PRB3-Recording</pv_name>
+ <pv_name>$(P)$(R)PROBE3-Recording</pv_name>
<text>Enable</text>
<x>810</x>
<y>270</y>
@@ -1421,7 +1421,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_138</name>
- <pv_name>$(P)PRB3-ConvertingR</pv_name>
+ <pv_name>$(P)$(R)PROBE3-ConvertingR</pv_name>
<x>750</x>
<y>520</y>
<width>110</width>
@@ -1439,7 +1439,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_137</name>
- <pv_name>$(P)PRB3-ScalingR</pv_name>
+ <pv_name>$(P)$(R)PROBE3-ScalingR</pv_name>
<x>750</x>
<y>480</y>
<width>110</width>
@@ -1474,7 +1474,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_22</name>
- <pv_name>$(P)PRB3-Decimation</pv_name>
+ <pv_name>$(P)$(R)PROBE3-Decimation</pv_name>
<x>880</x>
<y>640</y>
<width>150</width>
@@ -1490,7 +1490,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_136</name>
- <pv_name>$(P)PRB3-DecimationR</pv_name>
+ <pv_name>$(P)$(R)PROBE3-DecimationR</pv_name>
<x>750</x>
<y>640</y>
<height>30</height>
@@ -1525,7 +1525,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_21</name>
- <pv_name>$(P)PRB3-FractionBits</pv_name>
+ <pv_name>$(P)$(R)PROBE3-FractionBits</pv_name>
<x>880</x>
<y>440</y>
<width>150</width>
@@ -1541,7 +1541,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_135</name>
- <pv_name>$(P)PRB3-FractionBitsR</pv_name>
+ <pv_name>$(P)$(R)PROBE3-FractionBitsR</pv_name>
<x>750</x>
<y>440</y>
<height>30</height>
@@ -1576,7 +1576,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_20</name>
- <pv_name>$(P)PRB3-MemoryAddress</pv_name>
+ <pv_name>$(P)$(R)PROBE3-MemoryAddress</pv_name>
<x>880</x>
<y>400</y>
<width>150</width>
@@ -1592,7 +1592,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_134</name>
- <pv_name>$(P)PRB3-MemoryAddressR</pv_name>
+ <pv_name>$(P)$(R)PROBE3-MemoryAddressR</pv_name>
<x>750</x>
<y>400</y>
<height>30</height>
@@ -1644,7 +1644,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_19</name>
- <pv_name>$(P)PRB3-Offset</pv_name>
+ <pv_name>$(P)$(R)PROBE3-Offset</pv_name>
<x>880</x>
<y>600</y>
<width>150</width>
@@ -1660,7 +1660,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_133</name>
- <pv_name>$(P)PRB3-OffsetR</pv_name>
+ <pv_name>$(P)$(R)PROBE3-OffsetR</pv_name>
<x>750</x>
<y>600</y>
<height>30</height>
@@ -1694,7 +1694,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_18</name>
- <pv_name>$(P)PRB3-Factor</pv_name>
+ <pv_name>$(P)$(R)PROBE3-Factor</pv_name>
<x>880</x>
<y>560</y>
<width>150</width>
@@ -1710,7 +1710,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_132</name>
- <pv_name>$(P)PRB3-FactorR</pv_name>
+ <pv_name>$(P)$(R)PROBE3-FactorR</pv_name>
<x>750</x>
<y>560</y>
<height>30</height>
@@ -1744,7 +1744,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_131</name>
- <pv_name>$(P)PRB3-NumSamplesR</pv_name>
+ <pv_name>$(P)$(R)PROBE3-NumSamplesR</pv_name>
<x>750</x>
<y>360</y>
<height>30</height>
@@ -1779,7 +1779,7 @@
</widget>
<widget type="combo" version="2.0.0">
<name>Menu Button_16</name>
- <pv_name>$(P)PRB3-Source</pv_name>
+ <pv_name>$(P)$(R)PROBE3-Source</pv_name>
<x>880</x>
<y>720</y>
<width>150</width>
@@ -1791,7 +1791,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_129</name>
- <pv_name>$(P)PRB3-SourceR</pv_name>
+ <pv_name>$(P)$(R)PROBE3-SourceR</pv_name>
<x>750</x>
<y>720</y>
<width>110</width>
diff --git a/99-Shared/adsis8300bcm/processed.bob b/99-Shared/adsis8300bcm/processed.bob
index 6f15d8c..528acd9 100644
--- a/99-Shared/adsis8300bcm/processed.bob
+++ b/99-Shared/adsis8300bcm/processed.bob
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
- <name>$(P) PRC</name>
+ <name>$(P)$(R)PROC$(ID)</name>
<x>470</x>
<y>197</y>
<width>1900</width>
@@ -275,7 +275,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>BGGrey02-title_20</name>
- <text>$(CG)PRB1-Name</text>
+ <text>$(CG)PROBE1-Name</text>
<x>660</x>
<y>790</y>
<width>1220</width>
@@ -342,7 +342,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>BGGrey02-title_19</name>
- <text>$(P)PRC-Name</text>
+ <text>$(P)$(R)PROC$(ID)-Name</text>
<x>20</x>
<y>790</y>
<width>620</width>
@@ -361,7 +361,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_1</name>
- <pv_name>$(P)PRC-Factor</pv_name>
+ <pv_name>$(P)$(R)PROC$(ID)-Factor</pv_name>
<x>420</x>
<y>1114</y>
<width>180</width>
@@ -377,7 +377,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_2</name>
- <pv_name>$(P)PRC-Offset</pv_name>
+ <pv_name>$(P)$(R)PROC$(ID)-Offset</pv_name>
<x>420</x>
<y>1154</y>
<width>180</width>
@@ -393,7 +393,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_8</name>
- <pv_name>$(P)PRC-MemoryAddress</pv_name>
+ <pv_name>$(P)$(R)PROC$(ID)-MemoryAddress</pv_name>
<x>420</x>
<y>954</y>
<width>180</width>
@@ -409,7 +409,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_9</name>
- <pv_name>$(P)PRC-FractionBits</pv_name>
+ <pv_name>$(P)$(R)PROC$(ID)-FractionBits</pv_name>
<x>420</x>
<y>994</y>
<width>180</width>
@@ -425,7 +425,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_10</name>
- <pv_name>$(P)PRC-Decimation</pv_name>
+ <pv_name>$(P)$(R)PROC$(ID)-Decimation</pv_name>
<x>420</x>
<y>1194</y>
<width>180</width>
@@ -447,7 +447,7 @@
<value>1</value>
</action>
</actions>
- <pv_name>$(P)PRC-Recording</pv_name>
+ <pv_name>$(P)$(R)PROC$(ID)-Recording</pv_name>
<text>Enable</text>
<x>420</x>
<y>860</y>
@@ -461,7 +461,7 @@
<value>0</value>
</action>
</actions>
- <pv_name>$(P)PRC-Recording</pv_name>
+ <pv_name>$(P)$(R)PROC$(ID)-Recording</pv_name>
<text>Disable</text>
<x>520</x>
<y>860</y>
@@ -469,7 +469,7 @@
</widget>
<widget type="combo" version="2.0.0">
<name>Menu Button_2</name>
- <pv_name>$(P)PRC-Scaling</pv_name>
+ <pv_name>$(P)$(R)PROC$(ID)-Scaling</pv_name>
<x>420</x>
<y>1034</y>
<width>180</width>
@@ -481,7 +481,7 @@
</widget>
<widget type="combo" version="2.0.0">
<name>Menu Button_3</name>
- <pv_name>$(P)PRC-Converting</pv_name>
+ <pv_name>$(P)$(R)PROC$(ID)-Converting</pv_name>
<x>420</x>
<y>1074</y>
<width>180</width>
@@ -496,7 +496,7 @@
<file>trace_item.opi</file>
<macros>
<P>$(CG)</P>
- <R>PRB1-TR1-</R>
+ <R>PROBE1-TR1-</R>
</macros>
<x>1280</x>
<y>910</y>
@@ -515,7 +515,7 @@
<file>trace_item.opi</file>
<macros>
<P>$(CG)</P>
- <R>PRB1-TR2-</R>
+ <R>PROBE1-TR2-</R>
</macros>
<x>1280</x>
<y>960</y>
@@ -534,7 +534,7 @@
<file>trace_item.opi</file>
<macros>
<P>$(CG)</P>
- <R>PRB1-TR3-</R>
+ <R>PROBE1-TR3-</R>
</macros>
<x>1280</x>
<y>1010</y>
@@ -553,7 +553,7 @@
<file>trace_item.opi</file>
<macros>
<P>$(CG)</P>
- <R>PRB1-TR4-</R>
+ <R>PROBE1-TR4-</R>
</macros>
<x>1280</x>
<y>1060</y>
@@ -572,7 +572,7 @@
<file>trace_item.opi</file>
<macros>
<P>$(CG)</P>
- <R>PRB1-TR5-</R>
+ <R>PROBE1-TR5-</R>
</macros>
<x>1280</x>
<y>1110</y>
@@ -591,7 +591,7 @@
<file>trace_item.opi</file>
<macros>
<P>$(CG)</P>
- <R>PRB1-TR6-</R>
+ <R>PROBE1-TR6-</R>
</macros>
<x>1280</x>
<y>1160</y>
@@ -610,7 +610,7 @@
<file>trace_item.opi</file>
<macros>
<P>$(CG)</P>
- <R>PRB1-TR7-</R>
+ <R>PROBE1-TR7-</R>
</macros>
<x>1280</x>
<y>1210</y>
@@ -629,7 +629,7 @@
<file>trace_item.opi</file>
<macros>
<P>$(CG)</P>
- <R>PRB1-TR8-</R>
+ <R>PROBE1-TR8-</R>
</macros>
<x>1280</x>
<y>1260</y>
@@ -648,7 +648,7 @@
<file>trace_item.opi</file>
<macros>
<P>$(CG)</P>
- <R>PRB1-TR9-</R>
+ <R>PROBE1-TR9-</R>
</macros>
<x>1280</x>
<y>1310</y>
@@ -667,7 +667,7 @@
<file>trace_item.opi</file>
<macros>
<P>$(CG)</P>
- <R>PRB1-TR0-</R>
+ <R>PROBE1-TR0-</R>
</macros>
<x>1280</x>
<y>860</y>
@@ -685,7 +685,7 @@
<name>Linking Container_10</name>
<file>trace_item.opi</file>
<macros>
- <R>PRC-TR1-</R>
+ <R>$(R)PROC$(ID)-TR1-</R>
</macros>
<x>60</x>
<y>1315</y>
@@ -718,7 +718,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_117</name>
- <pv_name>$(CG)PRB1-SourceR</pv_name>
+ <pv_name>$(CG)PROBE1-SourceR</pv_name>
<x>840</x>
<y>1270</y>
<width>150</width>
@@ -736,7 +736,7 @@
</widget>
<widget type="combo" version="2.0.0">
<name>Menu Button_12</name>
- <pv_name>$(CG)PRB1-Source</pv_name>
+ <pv_name>$(CG)PROBE1-Source</pv_name>
<x>1040</x>
<y>1270</y>
<width>180</width>
@@ -765,7 +765,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_119</name>
- <pv_name>$(CG)PRB1-NumSamplesR</pv_name>
+ <pv_name>$(CG)PROBE1-NumSamplesR</pv_name>
<x>840</x>
<y>910</y>
<width>140</width>
@@ -801,7 +801,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_120</name>
- <pv_name>$(CG)PRB1-FactorR</pv_name>
+ <pv_name>$(CG)PROBE1-FactorR</pv_name>
<x>840</x>
<y>1110</y>
<width>140</width>
@@ -819,7 +819,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_12</name>
- <pv_name>$(CG)PRB1-Factor</pv_name>
+ <pv_name>$(CG)PROBE1-Factor</pv_name>
<x>1040</x>
<y>1110</y>
<width>180</width>
@@ -852,7 +852,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_121</name>
- <pv_name>$(CG)PRB1-OffsetR</pv_name>
+ <pv_name>$(CG)PROBE1-OffsetR</pv_name>
<x>840</x>
<y>1150</y>
<width>140</width>
@@ -870,7 +870,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_13</name>
- <pv_name>$(CG)PRB1-Offset</pv_name>
+ <pv_name>$(CG)PROBE1-Offset</pv_name>
<x>1040</x>
<y>1150</y>
<width>180</width>
@@ -920,7 +920,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_122</name>
- <pv_name>$(CG)PRB1-MemoryAddressR</pv_name>
+ <pv_name>$(CG)PROBE1-MemoryAddressR</pv_name>
<x>840</x>
<y>950</y>
<width>140</width>
@@ -939,7 +939,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_14</name>
- <pv_name>$(CG)PRB1-MemoryAddress</pv_name>
+ <pv_name>$(CG)PROBE1-MemoryAddress</pv_name>
<x>1040</x>
<y>950</y>
<width>180</width>
@@ -972,7 +972,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_123</name>
- <pv_name>$(CG)PRB1-FractionBitsR</pv_name>
+ <pv_name>$(CG)PROBE1-FractionBitsR</pv_name>
<x>840</x>
<y>990</y>
<width>140</width>
@@ -991,7 +991,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_15</name>
- <pv_name>$(CG)PRB1-FractionBits</pv_name>
+ <pv_name>$(CG)PROBE1-FractionBits</pv_name>
<x>1040</x>
<y>990</y>
<width>180</width>
@@ -1024,7 +1024,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_124</name>
- <pv_name>$(CG)PRB1-DecimationR</pv_name>
+ <pv_name>$(CG)PROBE1-DecimationR</pv_name>
<x>840</x>
<y>1190</y>
<width>140</width>
@@ -1043,7 +1043,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_16</name>
- <pv_name>$(CG)PRB1-Decimation</pv_name>
+ <pv_name>$(CG)PROBE1-Decimation</pv_name>
<x>1040</x>
<y>1190</y>
<width>180</width>
@@ -1076,7 +1076,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_125</name>
- <pv_name>$(CG)PRB1-ScalingR</pv_name>
+ <pv_name>$(CG)PROBE1-ScalingR</pv_name>
<x>840</x>
<y>1030</y>
<width>150</width>
@@ -1094,7 +1094,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_126</name>
- <pv_name>$(CG)PRB1-ConvertingR</pv_name>
+ <pv_name>$(CG)PROBE1-ConvertingR</pv_name>
<x>840</x>
<y>1070</y>
<width>150</width>
@@ -1118,7 +1118,7 @@
<value>1</value>
</action>
</actions>
- <pv_name>$(CG)PRB1-Recording</pv_name>
+ <pv_name>$(CG)PROBE1-Recording</pv_name>
<text>Enable</text>
<x>1040</x>
<y>860</y>
@@ -1126,7 +1126,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_1</name>
- <pv_name>$(CG)PRB1-RecordingR</pv_name>
+ <pv_name>$(CG)PROBE1-RecordingR</pv_name>
<x>840</x>
<y>860</y>
<width>150</width>
@@ -1145,7 +1145,7 @@
<value>0</value>
</action>
</actions>
- <pv_name>$(CG)PRB1-Recording</pv_name>
+ <pv_name>$(CG)PROBE1-Recording</pv_name>
<text>Disable</text>
<x>1140</x>
<y>860</y>
@@ -1153,7 +1153,7 @@
</widget>
<widget type="combo" version="2.0.0">
<name>Menu Button_13</name>
- <pv_name>$(CG)PRB1-Scaling</pv_name>
+ <pv_name>$(CG)PROBE1-Scaling</pv_name>
<x>1040</x>
<y>1030</y>
<width>180</width>
@@ -1165,7 +1165,7 @@
</widget>
<widget type="combo" version="2.0.0">
<name>Menu Button_14</name>
- <pv_name>$(CG)PRB1-Converting</pv_name>
+ <pv_name>$(CG)PROBE1-Converting</pv_name>
<x>1040</x>
<y>1070</y>
<width>180</width>
@@ -1194,7 +1194,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_127</name>
- <pv_name>$(CG)PRB1-TickValueR</pv_name>
+ <pv_name>$(CG)PROBE1-TickValueR</pv_name>
<x>840</x>
<y>1230</y>
<width>140</width>
@@ -1229,7 +1229,7 @@
</widget>
<widget type="combo" version="2.0.0">
<name>Menu Button_15</name>
- <pv_name>$(CG)PRB1-Channel</pv_name>
+ <pv_name>$(CG)PROBE1-Channel</pv_name>
<x>1040</x>
<y>1310</y>
<width>180</width>
@@ -1241,7 +1241,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_128</name>
- <pv_name>$(CG)PRB1-ChannelR</pv_name>
+ <pv_name>$(CG)PROBE1-ChannelR</pv_name>
<x>840</x>
<y>1310</y>
<width>150</width>
@@ -1259,7 +1259,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_106</name>
- <pv_name>$(P)PRC-TickValueR</pv_name>
+ <pv_name>$(P)$(R)PROC$(ID)-TickValueR</pv_name>
<x>200</x>
<y>1230</y>
<width>190</width>
@@ -1277,7 +1277,7 @@
</widget>
<widget type="led" version="2.0.0">
<name>LED_5</name>
- <pv_name>$(P)PRC-RecordingR</pv_name>
+ <pv_name>$(P)$(R)PROC$(ID)-RecordingR</pv_name>
<x>200</x>
<y>860</y>
<width>200</width>
@@ -1298,7 +1298,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_97</name>
- <pv_name>$(P)PRC-ConvertingR</pv_name>
+ <pv_name>$(P)$(R)PROC$(ID)-ConvertingR</pv_name>
<x>200</x>
<y>1070</y>
<width>200</width>
@@ -1316,7 +1316,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_96</name>
- <pv_name>$(P)PRC-ScalingR</pv_name>
+ <pv_name>$(P)$(R)PROC$(ID)-ScalingR</pv_name>
<x>200</x>
<y>1030</y>
<width>200</width>
@@ -1334,7 +1334,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_82</name>
- <pv_name>$(P)PRC-DecimationR</pv_name>
+ <pv_name>$(P)$(R)PROC$(ID)-DecimationR</pv_name>
<x>200</x>
<y>1190</y>
<width>190</width>
@@ -1353,7 +1353,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_81</name>
- <pv_name>$(P)PRC-FractionBitsR</pv_name>
+ <pv_name>$(P)$(R)PROC$(ID)-FractionBitsR</pv_name>
<x>200</x>
<y>990</y>
<width>190</width>
@@ -1372,7 +1372,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_80</name>
- <pv_name>$(P)PRC-MemoryAddressR</pv_name>
+ <pv_name>$(P)$(R)PROC$(ID)-MemoryAddressR</pv_name>
<x>200</x>
<y>950</y>
<width>190</width>
@@ -1391,7 +1391,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_3</name>
- <pv_name>$(P)PRC-OffsetR</pv_name>
+ <pv_name>$(P)$(R)PROC$(ID)-OffsetR</pv_name>
<x>200</x>
<y>1150</y>
<width>190</width>
@@ -1409,7 +1409,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_2</name>
- <pv_name>$(P)PRC-FactorR</pv_name>
+ <pv_name>$(P)$(R)PROC$(ID)-FactorR</pv_name>
<x>200</x>
<y>1110</y>
<width>190</width>
@@ -1427,7 +1427,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_1</name>
- <pv_name>$(P)PRC-NumSamplesR</pv_name>
+ <pv_name>$(P)$(R)PROC$(ID)-NumSamplesR</pv_name>
<x>200</x>
<y>910</y>
<width>190</width>
@@ -1630,7 +1630,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_95</name>
- <pv_name>$(P)PRC-TR1-Name</pv_name>
+ <pv_name>$(P)$(R)PROC$(ID)-TR1-Name</pv_name>
<x>1680</x>
<y>250</y>
<width>160</width>
@@ -1648,7 +1648,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_10</name>
- <pv_name>$(P)PRC-TR1-ArrayRate_RBV</pv_name>
+ <pv_name>$(P)$(R)PROC$(ID)-TR1-ArrayRate_RBV</pv_name>
<x>1680</x>
<y>390</y>
<width>160</width>
@@ -1700,7 +1700,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_9</name>
- <pv_name>$(P)PRC-TR1-ArrayCounter_RBV</pv_name>
+ <pv_name>$(P)$(R)PROC$(ID)-TR1-ArrayCounter_RBV</pv_name>
<x>1680</x>
<y>320</y>
<width>160</width>
@@ -1718,7 +1718,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_8</name>
- <pv_name>$(P)PRC-TR1-DataType_RBV</pv_name>
+ <pv_name>$(P)$(R)PROC$(ID)-TR1-DataType_RBV</pv_name>
<x>1680</x>
<y>530</y>
<width>160</width>
@@ -1753,7 +1753,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_6</name>
- <pv_name>$(P)PRC-TR1-ArraySize0_RBV</pv_name>
+ <pv_name>$(P)$(R)PROC$(ID)-TR1-ArraySize0_RBV</pv_name>
<x>1680</x>
<y>460</y>
<width>160</width>
@@ -1788,7 +1788,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update</name>
- <pv_name>$(P)PRC-TR1-TimePerPoint</pv_name>
+ <pv_name>$(P)$(R)PROC$(ID)-TR1-TimePerPoint</pv_name>
<x>1680</x>
<y>600</y>
<width>160</width>
@@ -1842,151 +1842,151 @@
<exp bool_exp="true">
<expression>pv0</expression>
</exp>
- <pv_name>$(P)PRC-TR1-ArraySize1_RBV</pv_name>
+ <pv_name>$(P)$(R)PROC$(ID)-TR1-ArraySize1_RBV</pv_name>
</rule>
<rule name="data_x0_max" prop_id="x_axis.maximum" out_exp="true">
<exp bool_exp="true">
<expression>pv0</expression>
</exp>
- <pv_name>$(P)PRC-TR1-ArraySize0_RBV</pv_name>
+ <pv_name>$(P)$(R)PROC$(ID)-TR1-ArraySize0_RBV</pv_name>
</rule>
<rule name="y_title" prop_id="y_axes[0].title" out_exp="true">
<exp bool_exp="pv0 != 0">
<expression>"mA"</expression>
</exp>
- <pv_name>$(P)PRC-ConvertingR</pv_name>
+ <pv_name>$(P)$(R)PROC$(ID)-ConvertingR</pv_name>
</rule>
<rule name="trace0_visible" prop_id="traces[0].visible" out_exp="false">
<exp bool_exp="pv0==0">
<value>false</value>
</exp>
- <pv_name>$(P)PRC-TR1-EnableCallbacks_RBV</pv_name>
+ <pv_name>$(P)$(R)PROC$(ID)-TR1-EnableCallbacks_RBV</pv_name>
</rule>
<rule name="trace1_visible" prop_id="traces[1].visible" out_exp="false">
<exp bool_exp="pv0==0">
<value>false</value>
</exp>
- <pv_name>$(CG)PRB1-TR0-EnableCallbacks_RBV</pv_name>
+ <pv_name>$(CG)PROBE1-TR0-EnableCallbacks_RBV</pv_name>
</rule>
<rule name="trace2_visible" prop_id="traces[2].visible" out_exp="false">
<exp bool_exp="pv0==0">
<value>false</value>
</exp>
- <pv_name>$(CG)PRB1-TR1-EnableCallbacks_RBV</pv_name>
+ <pv_name>$(CG)PROBE1-TR1-EnableCallbacks_RBV</pv_name>
</rule>
<rule name="trace3_visible" prop_id="traces[3].visible" out_exp="false">
<exp bool_exp="pv0==0">
<value>false</value>
</exp>
- <pv_name>$(CG)PRB1-TR2-EnableCallbacks_RBV</pv_name>
+ <pv_name>$(CG)PROBE1-TR2-EnableCallbacks_RBV</pv_name>
</rule>
<rule name="trace4_visible" prop_id="traces[4].visible" out_exp="false">
<exp bool_exp="pv0==0">
<value>false</value>
</exp>
- <pv_name>$(CG)PRB1-TR3-EnableCallbacks_RBV</pv_name>
+ <pv_name>$(CG)PROBE1-TR3-EnableCallbacks_RBV</pv_name>
</rule>
<rule name="trace5_visible" prop_id="traces[5].visible" out_exp="false">
<exp bool_exp="pv0==0">
<value>false</value>
</exp>
- <pv_name>$(CG)PRB1-TR4-EnableCallbacks_RBV</pv_name>
+ <pv_name>$(CG)PROBE1-TR4-EnableCallbacks_RBV</pv_name>
</rule>
<rule name="trace6_visible" prop_id="traces[6].visible" out_exp="false">
<exp bool_exp="pv0==0">
<value>false</value>
</exp>
- <pv_name>$(CG)PRB1-TR5-EnableCallbacks_RBV</pv_name>
+ <pv_name>$(CG)PROBE1-TR5-EnableCallbacks_RBV</pv_name>
</rule>
<rule name="trace7_visible" prop_id="traces[7].visible" out_exp="false">
<exp bool_exp="pv0==0">
<value>false</value>
</exp>
- <pv_name>$(CG)PRB1-TR6-EnableCallbacks_RBV</pv_name>
+ <pv_name>$(CG)PROBE1-TR6-EnableCallbacks_RBV</pv_name>
</rule>
<rule name="trace8_visible" prop_id="traces[8].visible" out_exp="false">
<exp bool_exp="pv0==0">
<value>false</value>
</exp>
- <pv_name>$(CG)PRB1-TR7-EnableCallbacks_RBV</pv_name>
+ <pv_name>$(CG)PROBE1-TR7-EnableCallbacks_RBV</pv_name>
</rule>
<rule name="trace9_visible" prop_id="traces[9].visible" out_exp="false">
<exp bool_exp="pv0==0">
<value>false</value>
</exp>
- <pv_name>$(CG)PRB1-TR8-EnableCallbacks_RBV</pv_name>
+ <pv_name>$(CG)PROBE1-TR8-EnableCallbacks_RBV</pv_name>
</rule>
<rule name="trace10_visible" prop_id="traces[10].visible" out_exp="false">
<exp bool_exp="pv0==0">
<value>true</value>
</exp>
- <pv_name>$(CG)PRB1-TR9-EnableCallbacks_RBV</pv_name>
+ <pv_name>$(CG)PROBE1-TR9-EnableCallbacks_RBV</pv_name>
</rule>
<rule name="traces[0].name" prop_id="traces[0].name" out_exp="true">
<exp bool_exp="pvStr0!=""">
<expression>pvStr0</expression>
</exp>
- <pv_name>$(P)PRC-TR1-Name</pv_name>
+ <pv_name>$(P)$(R)PROC$(ID)-TR1-Name</pv_name>
</rule>
<rule name="traces[1].name" prop_id="traces[1].name" out_exp="true">
<exp bool_exp="pvStr0!=""">
<expression>pvStr0</expression>
</exp>
- <pv_name>$(CG)PRB1-TR0-Name</pv_name>
+ <pv_name>$(CG)PROBE1-TR0-Name</pv_name>
</rule>
<rule name="traces[2].name" prop_id="traces[2].name" out_exp="true">
<exp bool_exp="pvStr0!=""">
<expression>pvStr0</expression>
</exp>
- <pv_name>$(CG)PRB1-TR1-Name</pv_name>
+ <pv_name>$(CG)PROBE1-TR1-Name</pv_name>
</rule>
<rule name="traces[3].name" prop_id="traces[3].name" out_exp="true">
<exp bool_exp="pvStr0!=""">
<expression>pvStr0</expression>
</exp>
- <pv_name>$(CG)PRB1-TR2-Name</pv_name>
+ <pv_name>$(CG)PROBE1-TR2-Name</pv_name>
</rule>
<rule name="traces[4].name" prop_id="traces[4].name" out_exp="true">
<exp bool_exp="pvStr0!=""">
<expression>pvStr0</expression>
</exp>
- <pv_name>$(CG)PRB1-TR3-Name</pv_name>
+ <pv_name>$(CG)PROBE1-TR3-Name</pv_name>
</rule>
<rule name="traces[5].name" prop_id="traces[5].name" out_exp="true">
<exp bool_exp="pvStr0!=""">
<expression>pvStr0</expression>
</exp>
- <pv_name>$(CG)PRB1-TR4-Name</pv_name>
+ <pv_name>$(CG)PROBE1-TR4-Name</pv_name>
</rule>
<rule name="traces[6].name" prop_id="traces[6].name" out_exp="true">
<exp bool_exp="pvStr0!=""">
<expression>pvStr0</expression>
</exp>
- <pv_name>$(CG)PRB1-TR5-Name</pv_name>
+ <pv_name>$(CG)PROBE1-TR5-Name</pv_name>
</rule>
<rule name="traces[7].name" prop_id="traces[7].name" out_exp="true">
<exp bool_exp="pvStr0!=""">
<expression>pvStr0</expression>
</exp>
- <pv_name>$(CG)PRB1-TR6-Name</pv_name>
+ <pv_name>$(CG)PROBE1-TR6-Name</pv_name>
</rule>
<rule name="traces[8].name" prop_id="traces[8].name" out_exp="true">
<exp bool_exp="pvStr0!=""">
<expression>pvStr0</expression>
</exp>
- <pv_name>$(CG)PRB1-TR7-Name</pv_name>
+ <pv_name>$(CG)PROBE1-TR7-Name</pv_name>
</rule>
<rule name="traces[9].name" prop_id="traces[9].name" out_exp="true">
<exp bool_exp="pvStr0!=""">
<expression>pvStr0</expression>
</exp>
- <pv_name>$(CG)PRB1-TR8-Name</pv_name>
+ <pv_name>$(CG)PROBE1-TR8-Name</pv_name>
</rule>
<rule name="traces[10].name" prop_id="traces[10].name" out_exp="true">
<exp bool_exp="pvStr0!=""">
<expression>pvStr0</expression>
</exp>
- <pv_name>$(CG)PRB1-TR9-Name</pv_name>
+ <pv_name>$(CG)PROBE1-TR9-Name</pv_name>
</rule>
</rules>
<x_axis>
@@ -2045,8 +2045,8 @@
<traces>
<trace>
<name>$(traces[0].y_pv)</name>
- <x_pv>$(P)PRC-TR1-ArrayTimeUs</x_pv>
- <y_pv>$(P)PRC-TR1-ArrayData</y_pv>
+ <x_pv>$(P)$(R)PROC$(ID)-TR1-ArrayTimeUs</x_pv>
+ <y_pv>$(P)$(R)PROC$(ID)-TR1-ArrayData</y_pv>
<err_pv></err_pv>
<axis>0</axis>
<trace_type>1</trace_type>
@@ -2062,8 +2062,8 @@
</trace>
<trace>
<name>$(traces[1].y_pv)</name>
- <x_pv>$(CG)PRB1-TR0-ArrayTimeUs</x_pv>
- <y_pv>$(CG)PRB1-TR0-ArrayData</y_pv>
+ <x_pv>$(CG)PROBE1-TR0-ArrayTimeUs</x_pv>
+ <y_pv>$(CG)PROBE1-TR0-ArrayData</y_pv>
<err_pv></err_pv>
<axis>1</axis>
<trace_type>1</trace_type>
@@ -2079,8 +2079,8 @@
</trace>
<trace>
<name>$(traces[2].y_pv)</name>
- <x_pv>$(CG)PRB1-TR1-ArrayTimeUs</x_pv>
- <y_pv>$(CG)PRB1-TR1-ArrayData</y_pv>
+ <x_pv>$(CG)PROBE1-TR1-ArrayTimeUs</x_pv>
+ <y_pv>$(CG)PROBE1-TR1-ArrayData</y_pv>
<err_pv></err_pv>
<axis>1</axis>
<trace_type>1</trace_type>
@@ -2096,8 +2096,8 @@
</trace>
<trace>
<name>$(traces[3].y_pv)</name>
- <x_pv>$(CG)PRB1-TR2-ArrayTimeUs</x_pv>
- <y_pv>$(CG)PRB1-TR2-ArrayData</y_pv>
+ <x_pv>$(CG)PROBE1-TR2-ArrayTimeUs</x_pv>
+ <y_pv>$(CG)PROBE1-TR2-ArrayData</y_pv>
<err_pv></err_pv>
<axis>1</axis>
<trace_type>1</trace_type>
@@ -2113,8 +2113,8 @@
</trace>
<trace>
<name>$(traces[4].y_pv)</name>
- <x_pv>$(CG)PRB1-TR3-ArrayTimeUs</x_pv>
- <y_pv>$(CG)PRB1-TR3-ArrayData</y_pv>
+ <x_pv>$(CG)PROBE1-TR3-ArrayTimeUs</x_pv>
+ <y_pv>$(CG)PROBE1-TR3-ArrayData</y_pv>
<err_pv></err_pv>
<axis>1</axis>
<trace_type>1</trace_type>
@@ -2130,8 +2130,8 @@
</trace>
<trace>
<name>$(traces[5].y_pv)</name>
- <x_pv>$(CG)PRB1-TR4-ArrayTimeUs</x_pv>
- <y_pv>$(CG)PRB1-TR4-ArrayData</y_pv>
+ <x_pv>$(CG)PROBE1-TR4-ArrayTimeUs</x_pv>
+ <y_pv>$(CG)PROBE1-TR4-ArrayData</y_pv>
<err_pv></err_pv>
<axis>1</axis>
<trace_type>1</trace_type>
@@ -2147,8 +2147,8 @@
</trace>
<trace>
<name>$(traces[6].y_pv)</name>
- <x_pv>$(CG)PRB1-TR5-ArrayTimeUs</x_pv>
- <y_pv>$(CG)PRB1-TR5-ArrayData</y_pv>
+ <x_pv>$(CG)PROBE1-TR5-ArrayTimeUs</x_pv>
+ <y_pv>$(CG)PROBE1-TR5-ArrayData</y_pv>
<err_pv></err_pv>
<axis>1</axis>
<trace_type>1</trace_type>
@@ -2164,8 +2164,8 @@
</trace>
<trace>
<name>$(traces[7].y_pv)</name>
- <x_pv>$(CG)PRB1-TR6-ArrayTimeUs</x_pv>
- <y_pv>$(CG)PRB1-TR6-ArrayData</y_pv>
+ <x_pv>$(CG)PROBE1-TR6-ArrayTimeUs</x_pv>
+ <y_pv>$(CG)PROBE1-TR6-ArrayData</y_pv>
<err_pv></err_pv>
<axis>1</axis>
<trace_type>1</trace_type>
@@ -2181,8 +2181,8 @@
</trace>
<trace>
<name>$(traces[8].y_pv)</name>
- <x_pv>$(CG)PRB1-TR7-ArrayTimeUs</x_pv>
- <y_pv>$(CG)PRB1-TR7-ArrayData</y_pv>
+ <x_pv>$(CG)PROBE1-TR7-ArrayTimeUs</x_pv>
+ <y_pv>$(CG)PROBE1-TR7-ArrayData</y_pv>
<err_pv></err_pv>
<axis>1</axis>
<trace_type>1</trace_type>
@@ -2198,8 +2198,8 @@
</trace>
<trace>
<name>$(traces[9].y_pv)</name>
- <x_pv>$(CG)PRB1-TR8-ArrayTimeUs</x_pv>
- <y_pv>$(CG)PRB1-TR8-ArrayData</y_pv>
+ <x_pv>$(CG)PROBE1-TR8-ArrayTimeUs</x_pv>
+ <y_pv>$(CG)PROBE1-TR8-ArrayData</y_pv>
<err_pv></err_pv>
<axis>1</axis>
<trace_type>1</trace_type>
@@ -2215,8 +2215,8 @@
</trace>
<trace>
<name>$(traces[10].y_pv)</name>
- <x_pv>$(CG)PRB1-TR9-ArrayTimeUs</x_pv>
- <y_pv>$(CG)PRB1-TR9-ArrayData</y_pv>
+ <x_pv>$(CG)PROBE1-TR9-ArrayTimeUs</x_pv>
+ <y_pv>$(CG)PROBE1-TR9-ArrayData</y_pv>
<err_pv></err_pv>
<axis>1</axis>
<trace_type>1</trace_type>
diff --git a/99-Shared/adsis8300bcm/processed_item.bob b/99-Shared/adsis8300bcm/processed_item.bob
index b45ed7c..f7c09eb 100644
--- a/99-Shared/adsis8300bcm/processed_item.bob
+++ b/99-Shared/adsis8300bcm/processed_item.bob
@@ -11,7 +11,7 @@
</actions>
<widget type="textupdate" version="2.0.0">
<name>Text Update_75</name>
- <pv_name>$(P)PRC-Name</pv_name>
+ <pv_name>$(P)$(R)PROC$(ID)-Name</pv_name>
<width>250</width>
<height>30</height>
<font>
diff --git a/99-Shared/adsis8300bcm/raw.bob b/99-Shared/adsis8300bcm/raw.bob
index a7255c0..e765700 100644
--- a/99-Shared/adsis8300bcm/raw.bob
+++ b/99-Shared/adsis8300bcm/raw.bob
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
- <name>$(P) RAW</name>
+ <name>$(P) $(R)RAW$(ID)</name>
<x>470</x>
<y>197</y>
<width>1660</width>
@@ -160,7 +160,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>BGGrey02-title_19</name>
- <text>$(P)RAW-Name</text>
+ <text>$(P)$(R)RAW$(ID)-Name</text>
<x>20</x>
<y>70</y>
<width>620</width>
@@ -196,7 +196,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_1</name>
- <pv_name>$(P)RAW-NumSamplesR</pv_name>
+ <pv_name>$(P)$(R)RAW$(ID)-NumSamplesR</pv_name>
<x>220</x>
<y>230</y>
<width>180</width>
@@ -231,7 +231,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_2</name>
- <pv_name>$(P)RAW-FactorR</pv_name>
+ <pv_name>$(P)$(R)RAW$(ID)-FactorR</pv_name>
<x>220</x>
<y>480</y>
<width>180</width>
@@ -248,7 +248,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_1</name>
- <pv_name>$(P)RAW-Factor</pv_name>
+ <pv_name>$(P)$(R)RAW$(ID)-Factor</pv_name>
<x>420</x>
<y>480</y>
<width>180</width>
@@ -281,7 +281,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_3</name>
- <pv_name>$(P)RAW-OffsetR</pv_name>
+ <pv_name>$(P)$(R)RAW$(ID)-OffsetR</pv_name>
<x>220</x>
<y>530</y>
<width>180</width>
@@ -298,7 +298,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_2</name>
- <pv_name>$(P)RAW-Offset</pv_name>
+ <pv_name>$(P)$(R)RAW$(ID)-Offset</pv_name>
<x>420</x>
<y>530</y>
<width>180</width>
@@ -348,7 +348,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_80</name>
- <pv_name>$(P)RAW-MemoryAddressR</pv_name>
+ <pv_name>$(P)$(R)RAW$(ID)-MemoryAddressR</pv_name>
<x>220</x>
<y>280</y>
<width>180</width>
@@ -366,7 +366,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_8</name>
- <pv_name>$(P)RAW-MemoryAddress</pv_name>
+ <pv_name>$(P)$(R)RAW$(ID)-MemoryAddress</pv_name>
<x>420</x>
<y>280</y>
<width>180</width>
@@ -399,7 +399,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_81</name>
- <pv_name>$(P)RAW-FractionBitsR</pv_name>
+ <pv_name>$(P)$(R)RAW$(ID)-FractionBitsR</pv_name>
<x>220</x>
<y>330</y>
<width>180</width>
@@ -417,7 +417,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_9</name>
- <pv_name>$(P)RAW-FractionBits</pv_name>
+ <pv_name>$(P)$(R)RAW$(ID)-FractionBits</pv_name>
<x>420</x>
<y>330</y>
<width>180</width>
@@ -450,7 +450,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_82</name>
- <pv_name>$(P)RAW-DecimationR</pv_name>
+ <pv_name>$(P)$(R)RAW$(ID)-DecimationR</pv_name>
<x>220</x>
<y>580</y>
<width>180</width>
@@ -468,7 +468,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_10</name>
- <pv_name>$(P)RAW-Decimation</pv_name>
+ <pv_name>$(P)$(R)RAW$(ID)-Decimation</pv_name>
<x>420</x>
<y>580</y>
<width>180</width>
@@ -501,7 +501,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_96</name>
- <pv_name>$(P)RAW-ScalingR</pv_name>
+ <pv_name>$(P)$(R)RAW$(ID)-ScalingR</pv_name>
<x>220</x>
<y>380</y>
<width>180</width>
@@ -518,7 +518,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_97</name>
- <pv_name>$(P)RAW-ConvertingR</pv_name>
+ <pv_name>$(P)$(R)RAW$(ID)-ConvertingR</pv_name>
<x>220</x>
<y>430</y>
<width>180</width>
@@ -541,15 +541,15 @@
<value>1</value>
</action>
</actions>
- <pv_name>$(P)RAW-Recording</pv_name>
- <text>Enable:</text>
+ <pv_name>$(P)$(R)RAW$(ID)-Recording</pv_name>
+ <text>Enable</text>
<x>420</x>
<y>140</y>
<width>80</width>
</widget>
<widget type="led" version="2.0.0">
<name>LED_5</name>
- <pv_name>$(P)RAW-RecordingR</pv_name>
+ <pv_name>$(P)$(R)RAW$(ID)-RecordingR</pv_name>
<x>300</x>
<y>145</y>
<off_color>
@@ -571,8 +571,8 @@
<value>0</value>
</action>
</actions>
- <pv_name>$(P)RAW-Recording</pv_name>
- <text>Disable:</text>
+ <pv_name>$(P)$(R)RAW$(ID)-Recording</pv_name>
+ <text>Disable</text>
<x>520</x>
<y>140</y>
<width>80</width>
@@ -596,7 +596,7 @@
</widget>
<widget type="combo" version="2.0.0">
<name>Menu Button_2</name>
- <pv_name>$(P)RAW-Scaling</pv_name>
+ <pv_name>$(P)$(R)RAW$(ID)-Scaling</pv_name>
<x>420</x>
<y>380</y>
<width>180</width>
@@ -608,7 +608,7 @@
</widget>
<widget type="combo" version="2.0.0">
<name>Menu Button_3</name>
- <pv_name>$(P)RAW-Converting</pv_name>
+ <pv_name>$(P)$(R)RAW$(ID)-Converting</pv_name>
<x>420</x>
<y>430</y>
<width>180</width>
@@ -637,7 +637,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update</name>
- <pv_name>$(P)RAW-TR1-TimePerPoint</pv_name>
+ <pv_name>$(P)$(R)RAW$(ID)-TR1-TimePerPoint</pv_name>
<x>1450</x>
<y>750</y>
<width>150</width>
@@ -671,7 +671,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_6</name>
- <pv_name>$(P)RAW-TR1-ArraySize0_RBV</pv_name>
+ <pv_name>$(P)$(R)RAW$(ID)-TR1-ArraySize0_RBV</pv_name>
<x>1130</x>
<y>750</y>
<width>150</width>
@@ -706,7 +706,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_8</name>
- <pv_name>$(P)RAW-TR1-DataType_RBV</pv_name>
+ <pv_name>$(P)$(R)RAW$(ID)-TR1-DataType_RBV</pv_name>
<x>1450</x>
<y>710</y>
<width>150</width>
@@ -724,7 +724,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_9</name>
- <pv_name>$(P)RAW-TR1-ArrayCounter_RBV</pv_name>
+ <pv_name>$(P)$(R)RAW$(ID)-TR1-ArrayCounter_RBV</pv_name>
<x>840</x>
<y>750</y>
<width>150</width>
@@ -776,7 +776,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_10</name>
- <pv_name>$(P)RAW-TR1-ArrayRate_RBV</pv_name>
+ <pv_name>$(P)$(R)RAW$(ID)-TR1-ArrayRate_RBV</pv_name>
<x>1130</x>
<y>710</y>
<width>150</width>
@@ -794,7 +794,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_95</name>
- <pv_name>$(P)RAW-TR1-Name</pv_name>
+ <pv_name>$(P)$(R)RAW$(ID)-TR1-Name</pv_name>
<x>840</x>
<y>710</y>
<width>150</width>
@@ -846,7 +846,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_106</name>
- <pv_name>$(P)RAW-TickValueR</pv_name>
+ <pv_name>$(P)$(R)RAW$(ID)-TickValueR</pv_name>
<x>220</x>
<y>630</y>
<width>180</width>
@@ -865,11 +865,11 @@
<name>Linking Container_10</name>
<file>trace_item.opi</file>
<macros>
- <R>RAW-TR1-</R>
+ <R>$(R)RAW$(ID)-TR1-</R>
</macros>
<x>60</x>
<y>750</y>
- <width>540</width>
+ <width>440</width>
<height>30</height>
<resize>2</resize>
<actions>
@@ -901,19 +901,19 @@
<exp bool_exp="true">
<expression>pv0</expression>
</exp>
- <pv_name>$(P)RAW-TR1-ArraySize1_RBV</pv_name>
+ <pv_name>$(P)$(R)RAW$(ID)-TR1-ArraySize1_RBV</pv_name>
</rule>
<rule name="data_x0_max" prop_id="x_axis.maximum" out_exp="true">
<exp bool_exp="true">
<expression>pv0</expression>
</exp>
- <pv_name>$(P)RAW-TR1-ArraySize0_RBV</pv_name>
+ <pv_name>$(P)$(R)RAW$(ID)-TR1-ArraySize0_RBV</pv_name>
</rule>
<rule name="y_title" prop_id="y_axes[0].title" out_exp="true">
<exp bool_exp="pv0 != 0">
<expression>"mA"</expression>
</exp>
- <pv_name>$(P)RAW-ConvertingR</pv_name>
+ <pv_name>$(P)$(R)RAW$(ID)-ConvertingR</pv_name>
</rule>
<rule name="traces[0].name" prop_id="traces[0].name" out_exp="true">
<exp bool_exp="true">
@@ -922,7 +922,7 @@
<exp bool_exp="false">
<expression>pvStr0</expression>
</exp>
- <pv_name>$(P)RAW-TR1-Name</pv_name>
+ <pv_name>$(P)$(R)RAW$(ID)-TR1-Name</pv_name>
</rule>
</rules>
<x_axis>
@@ -964,8 +964,8 @@
<traces>
<trace>
<name>$(traces[0].y_pv)</name>
- <x_pv>$(P)RAW-TR1-ArrayTimeUs</x_pv>
- <y_pv>$(P)RAW-TR1-ArrayData</y_pv>
+ <x_pv>$(P)$(R)RAW$(ID)-TR1-ArrayTimeUs</x_pv>
+ <y_pv>$(P)$(R)RAW$(ID)-TR1-ArrayData</y_pv>
<err_pv></err_pv>
<axis>0</axis>
<trace_type>1</trace_type>
--
GitLab