From 66f839977ce2d892fd3b3f589a01dcd537ce9da6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kriszti=C3=A1n=20L=C3=B6ki?= <krisztian.loki@ess.eu>
Date: Wed, 21 Oct 2020 10:49:30 +0200
Subject: [PATCH] Customized as requested by Hilko

---
 .../DEVICES/vacuum/vpi/Faceplate/vac-vpi.bob  | 234 +++++++++++++-----
 1 file changed, 169 insertions(+), 65 deletions(-)

diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vpi/Faceplate/vac-vpi.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vpi/Faceplate/vac-vpi.bob
index 548913d7..8e76837b 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/vpi/Faceplate/vac-vpi.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vpi/Faceplate/vac-vpi.bob
@@ -5,7 +5,7 @@
     <vacPREFIX>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</vacPREFIX>
   </macros>
   <width>420</width>
-  <height>640</height>
+  <height>661</height>
   <rules>
     <rule name="Fake rule to have iUITypeR always connected" prop_id="name" out_exp="false">
       <pv_name trigger="false">${CONTROLLER}:iUITypeR</pv_name>
@@ -173,8 +173,8 @@
     <enabled>false</enabled>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label FreqR</name>
-    <text>Frequency:</text>
+    <name>Label PrsR</name>
+    <text>Pressure:</text>
     <x>10</x>
     <y>80</y>
     <width>80</width>
@@ -201,8 +201,8 @@
     </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>FreqR</name>
-    <pv_name>$(CONTROLLER):FreqR</pv_name>
+    <name>PrsR</name>
+    <pv_name>$(vacPREFIX):PrsR</pv_name>
     <x>100</x>
     <y>80</y>
     <width>310</width>
@@ -219,6 +219,7 @@
       <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </background_color>
+    <format>2</format>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -230,7 +231,7 @@
     </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label SpeedR</name>
+    <name>Label MotorCurR</name>
     <text>Current:</text>
     <x>10</x>
     <y>99</y>
@@ -258,8 +259,8 @@
     </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>SpeedR</name>
-    <pv_name>$(CONTROLLER):MotorCurR</pv_name>
+    <name>MotorCurR</name>
+    <pv_name>$(vacPREFIX):MotorCurR</pv_name>
     <x>100</x>
     <y>99</y>
     <width>310</width>
@@ -290,7 +291,7 @@
     <name>ErrorR</name>
     <pv_name>$(vacPREFIX):ErrorR</pv_name>
     <x>10</x>
-    <y>140</y>
+    <y>160</y>
     <off_color>
       <color name="LED-RED-OFF" red="110" green="101" blue="90">
       </color>
@@ -310,7 +311,7 @@
     <name>ErrorMsg</name>
     <text></text>
     <x>40</x>
-    <y>140</y>
+    <y>160</y>
     <width>370</width>
     <height>21</height>
     <font>
@@ -347,7 +348,7 @@
     <name>WarningR</name>
     <pv_name>$(vacPREFIX):WarningR</pv_name>
     <x>10</x>
-    <y>170</y>
+    <y>190</y>
     <off_color>
       <color name="LED-YELLOW-OFF" red="110" green="108" blue="90">
       </color>
@@ -367,7 +368,7 @@
     <name>WarningMsg</name>
     <text></text>
     <x>40</x>
-    <y>170</y>
+    <y>190</y>
     <width>370</width>
     <height>21</height>
     <font>
@@ -411,7 +412,7 @@
     <pv_name>$(vacPREFIX):RstErrorsCmd</pv_name>
     <text>Reset Warnings and Errors</text>
     <x>10</x>
-    <y>200</y>
+    <y>220</y>
     <width>400</width>
     <height>24</height>
     <font>
@@ -431,7 +432,7 @@
   <widget type="polyline" version="2.0.0">
     <name>Polyline</name>
     <x>10</x>
-    <y>230</y>
+    <y>250</y>
     <width>401</width>
     <height>1</height>
     <points>
@@ -448,10 +449,10 @@
     </actions>
   </widget>
   <widget type="led" version="2.0.0">
-    <name>StoppedR</name>
-    <pv_name>$(vacPREFIX):StoppedR</pv_name>
-    <x>10</x>
-    <y>240</y>
+    <name>StatR == 0</name>
+    <pv_name>=`$(vacPREFIX):StatR` == 0</pv_name>
+    <x>210</x>
+    <y>260</y>
     <off_color>
       <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
       </color>
@@ -468,10 +469,10 @@
     </actions>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label StoppedR</name>
-    <text>Stopped</text>
-    <x>30</x>
-    <y>240</y>
+    <name>Label Standby</name>
+    <text>Standby</text>
+    <x>230</x>
+    <y>260</y>
     <width>150</width>
     <font>
       <font name="Normal" family="OpenSans" style="REGULAR" size="11.881188118811881">
@@ -586,10 +587,10 @@
     </border_color>
   </widget>
   <widget type="led" version="2.0.0">
-    <name>AcceleratingR</name>
-    <pv_name>$(vacPREFIX):AcceleratingR</pv_name>
-    <x>10</x>
-    <y>300</y>
+    <name>StatR == 1</name>
+    <pv_name>=`$(vacPREFIX):StatR` == 1</pv_name>
+    <x>210</x>
+    <y>280</y>
     <off_color>
       <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
       </color>
@@ -606,10 +607,10 @@
     </actions>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label AcceleratingR</name>
-    <text>Accelerating</text>
-    <x>30</x>
-    <y>300</y>
+    <name>Label Starting</name>
+    <text>Starting</text>
+    <x>230</x>
+    <y>280</y>
     <width>150</width>
     <font>
       <font name="Normal" family="OpenSans" style="REGULAR" size="11.881188118811881">
@@ -632,9 +633,9 @@
     </border_color>
   </widget>
   <widget type="led" version="2.0.0">
-    <name>HWErrorR</name>
-    <pv_name>$(vacPREFIX):HWErrorR</pv_name>
-    <x>10</x>
+    <name>StatR == 4</name>
+    <pv_name>=`$(vacPREFIX):StatR` == 4</pv_name>
+    <x>210</x>
     <y>320</y>
     <off_color>
       <color name="LED-RED-OFF" red="110" green="101" blue="90">
@@ -652,9 +653,9 @@
     </actions>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label HWErrorR</name>
-    <text>Controller Error</text>
-    <x>30</x>
+    <name>Label Error</name>
+    <text>Error</text>
+    <x>230</x>
     <y>320</y>
     <width>150</width>
     <font>
@@ -680,8 +681,8 @@
   <widget type="led" version="2.0.0">
     <name>StartDQ-RB</name>
     <pv_name>$(vacPREFIX):StartDQ-RB</pv_name>
-    <x>210</x>
-    <y>240</y>
+    <x>10</x>
+    <y>300</y>
     <off_color>
       <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
       </color>
@@ -700,8 +701,8 @@
   <widget type="label" version="2.0.0">
     <name>Label StartDQ-RB</name>
     <text>Started</text>
-    <x>230</x>
-    <y>240</y>
+    <x>30</x>
+    <y>300</y>
     <width>150</width>
     <font>
       <font name="Normal" family="OpenSans" style="REGULAR" size="11.881188118811881">
@@ -726,8 +727,8 @@
   <widget type="led" version="2.0.0">
     <name>OnManualStartR</name>
     <pv_name>$(vacPREFIX):OnManualStartR</pv_name>
-    <x>210</x>
-    <y>260</y>
+    <x>10</x>
+    <y>340</y>
     <off_color>
       <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
       </color>
@@ -746,8 +747,8 @@
   <widget type="label" version="2.0.0">
     <name>Label OnManualStartR</name>
     <text>Manual Start</text>
-    <x>230</x>
-    <y>260</y>
+    <x>30</x>
+    <y>340</y>
     <width>150</width>
     <font>
       <font name="Normal" family="OpenSans" style="REGULAR" size="11.881188118811881">
@@ -772,8 +773,8 @@
   <widget type="led" version="2.0.0">
     <name>OnAutoStartR</name>
     <pv_name>$(vacPREFIX):OnAutoStartR</pv_name>
-    <x>210</x>
-    <y>280</y>
+    <x>10</x>
+    <y>320</y>
     <off_color>
       <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
       </color>
@@ -792,8 +793,8 @@
   <widget type="label" version="2.0.0">
     <name>Label OnAutoStartR</name>
     <text>Auto Start</text>
-    <x>230</x>
-    <y>280</y>
+    <x>30</x>
+    <y>320</y>
     <width>150</width>
     <font>
       <font name="Normal" family="OpenSans" style="REGULAR" size="11.881188118811881">
@@ -816,8 +817,8 @@
     </border_color>
   </widget>
   <widget type="led" version="2.0.0">
-    <name>AtNominalSpdR</name>
-    <pv_name>$(vacPREFIX):AtNominalSpdR</pv_name>
+    <name>StatR == 2</name>
+    <pv_name>=`$(vacPREFIX):StatR` == 2</pv_name>
     <x>210</x>
     <y>300</y>
     <off_color>
@@ -836,8 +837,8 @@
     </actions>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label AtNominalSpdR</name>
-    <text>At Nominal Speed</text>
+    <name>Label Running</name>
+    <text>Running</text>
     <x>230</x>
     <y>300</y>
     <width>150</width>
@@ -864,7 +865,7 @@
   <widget type="polyline" version="2.0.0">
     <name>Polyline_1</name>
     <x>10</x>
-    <y>350</y>
+    <y>370</y>
     <width>401</width>
     <height>1</height>
     <points>
@@ -884,7 +885,7 @@
     <name>Label Interlocks</name>
     <text>Interlocks</text>
     <x>10</x>
-    <y>353</y>
+    <y>373</y>
     <width>60</width>
     <font>
       <font name="Normal" family="OpenSans" style="REGULAR" size="11.881188118811881">
@@ -917,7 +918,7 @@
     <pv_name>$(vacPREFIX):OverrideITLckCmd</pv_name>
     <text>Bypass</text>
     <x>10</x>
-    <y>370</y>
+    <y>390</y>
     <width>151</width>
     <height>24</height>
     <font>
@@ -945,7 +946,7 @@
     <pv_name>$(vacPREFIX):ClrOverrideITLckCmd</pv_name>
     <text>Clear Bypass</text>
     <x>10</x>
-    <y>393</y>
+    <y>413</y>
     <width>151</width>
     <height>24</height>
     <font>
@@ -966,7 +967,7 @@
     <name>ITLckTrigR</name>
     <pv_name>$(vacPREFIX):ITLckTrigR</pv_name>
     <x>210</x>
-    <y>370</y>
+    <y>390</y>
     <off_color>
       <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
       </color>
@@ -986,7 +987,7 @@
     <name>Label ITLckTrigR</name>
     <text>Interlock Trigger</text>
     <x>230</x>
-    <y>370</y>
+    <y>390</y>
     <width>150</width>
     <font>
       <font name="Normal" family="OpenSans" style="REGULAR" size="11.881188118811881">
@@ -1012,7 +1013,7 @@
     <name>Interlocks</name>
     <file>../../COMMON/Faceplate/vac-vpp_vpt-interlocks-popup.bob</file>
     <x>10</x>
-    <y>440</y>
+    <y>460</y>
     <height>80</height>
     <resize>2</resize>
     <actions>
@@ -1025,7 +1026,7 @@
   <widget type="polyline" version="2.0.0">
     <name>Polyline_2</name>
     <x>10</x>
-    <y>530</y>
+    <y>550</y>
     <width>401</width>
     <height>1</height>
     <points>
@@ -1045,7 +1046,7 @@
     <name>AutoStartDisStR</name>
     <pv_name>$(vacPREFIX):AutoStartDisStR</pv_name>
     <x>10</x>
-    <y>540</y>
+    <y>560</y>
     <off_color>
       <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
       </color>
@@ -1065,7 +1066,7 @@
     <name>Label AutoStartDisStR</name>
     <text>Auto Start Disabled</text>
     <x>30</x>
-    <y>540</y>
+    <y>560</y>
     <width>150</width>
     <font>
       <font name="Normal" family="OpenSans" style="REGULAR" size="11.881188118811881">
@@ -1098,7 +1099,7 @@
     <pv_name>$(vacPREFIX):AutoStartDisCmd</pv_name>
     <text>Disable Automatic Start</text>
     <x>10</x>
-    <y>560</y>
+    <y>580</y>
     <width>151</width>
     <height>24</height>
     <font>
@@ -1126,7 +1127,7 @@
     <pv_name>$(vacPREFIX):AutoStartEnaCmd</pv_name>
     <text>Enable Automatic Start</text>
     <x>10</x>
-    <y>583</y>
+    <y>603</y>
     <width>151</width>
     <height>24</height>
     <font>
@@ -1154,7 +1155,7 @@
     </actions>
     <text>Engineering Screen</text>
     <x>170</x>
-    <y>610</y>
+    <y>630</y>
     <width>210</width>
     <height>24</height>
     <font>
@@ -1198,4 +1199,107 @@
       </color>
     </border_color>
   </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label DCVolR</name>
+    <text>Voltage:</text>
+    <x>10</x>
+    <y>118</y>
+    <width>80</width>
+    <height>21</height>
+    <font>
+      <font name="Normal" family="OpenSans" style="REGULAR" size="11.881188118811881">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="Black" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="White" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <actions>
+    </actions>
+    <border_color>
+      <color name="Blue" red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>DCVolR</name>
+    <pv_name>$(vacPREFIX):DCVolR</pv_name>
+    <x>100</x>
+    <y>120</y>
+    <width>310</width>
+    <height>21</height>
+    <font>
+      <font name="Normal" family="OpenSans" style="REGULAR" size="11.881188118811881">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color name="Blue" red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>RlyStatR</name>
+    <pv_name>$(vacPREFIX):RlyStatR</pv_name>
+    <x>210</x>
+    <y>340</y>
+    <off_color>
+      <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
+      </color>
+    </off_color>
+    <on_color>
+      <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+      </color>
+    </on_color>
+    <foreground_color>
+      <color name="Button Grey" red="180" green="180" blue="180">
+      </color>
+    </foreground_color>
+    <actions>
+    </actions>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label Relay status</name>
+    <text>Relay status</text>
+    <x>230</x>
+    <y>340</y>
+    <width>150</width>
+    <font>
+      <font name="Normal" family="OpenSans" style="REGULAR" size="11.881188118811881">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="Black" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="White" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <actions>
+    </actions>
+    <border_color>
+      <color name="Blue" red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
 </display>
-- 
GitLab