From 9cd889b5cba3d6fca3282776dbaf95a49e04964a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kriszti=C3=A1n=20L=C3=B6ki?= <krisztian.loki@ess.eu>
Date: Tue, 1 Jun 2021 10:50:32 +0200
Subject: [PATCH] Fixed area ODH detector indexes

---
 .../embedded_displays/ODH_Monit_Sub.bob       |  12 +-
 NON-APPROVED/odh/ODH_Area_Layout_CTL.bob      |  17 +-
 NON-APPROVED/odh/ODH_Area_Layout_CXB.bob      |  35 ++--
 NON-APPROVED/odh/ODH_Area_Layout_HCB.bob      |  60 ++++---
 NON-APPROVED/odh/ODH_Area_Layout_TS2.bob      |  10 +-
 NON-APPROVED/odh/ODH_Main.bob                 | 168 ++++++++++--------
 6 files changed, 174 insertions(+), 128 deletions(-)

diff --git a/NON-APPROVED/odh/99-Shared/embedded_displays/ODH_Monit_Sub.bob b/NON-APPROVED/odh/99-Shared/embedded_displays/ODH_Monit_Sub.bob
index c7b7ddb8..8b4e3649 100644
--- a/NON-APPROVED/odh/99-Shared/embedded_displays/ODH_Monit_Sub.bob
+++ b/NON-APPROVED/odh/99-Shared/embedded_displays/ODH_Monit_Sub.bob
@@ -8,7 +8,7 @@
   <height>30</height>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_O2Level</name>
-    <pv_name>$(P)-$(R):O2Level</pv_name>
+    <pv_name>$(P):O2Level</pv_name>
     <x>93</x>
     <y>5</y>
     <width>55</width>
@@ -19,7 +19,7 @@
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED_LA</name>
-    <pv_name>$(P)-$(R):O2Lvl19_5</pv_name>
+    <pv_name>$(P):O2Lvl19_5</pv_name>
     <x>200</x>
     <y>5</y>
     <off_color>
@@ -33,7 +33,7 @@
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED_LB</name>
-    <pv_name>$(P)-$(R):O2Lvl18</pv_name>
+    <pv_name>$(P):O2Lvl18</pv_name>
     <x>287</x>
     <y>5</y>
     <off_color>
@@ -47,7 +47,7 @@
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED_OK</name>
-    <pv_name>$(P)-$(R):MonitHealthy</pv_name>
+    <pv_name>$(P):MonitHealthy</pv_name>
     <x>374</x>
     <y>5</y>
     <off_color>
@@ -61,7 +61,7 @@
   </widget>
   <widget type="led" version="2.0.0">
     <name>LED_OK_1</name>
-    <pv_name>$(P)-$(R):Maint</pv_name>
+    <pv_name>$(P):Maint</pv_name>
     <x>461</x>
     <y>5</y>
     <off_color>
@@ -79,8 +79,6 @@
       <action type="open_display">
         <file>$(POPUPS)/ODH_Expert_Monit.bob</file>
         <macros>
-          <P>$(P)-$(R)</P>
-          <R>$(R)</R>
         </macros>
         <target>standalone</target>
         <description>ODH $(R)</description>
diff --git a/NON-APPROVED/odh/ODH_Area_Layout_CTL.bob b/NON-APPROVED/odh/ODH_Area_Layout_CTL.bob
index c8c6b1e2..aa8aa872 100644
--- a/NON-APPROVED/odh/ODH_Area_Layout_CTL.bob
+++ b/NON-APPROVED/odh/ODH_Area_Layout_CTL.bob
@@ -119,7 +119,7 @@
           <x>71</x>
           <y>74</y>
           <width>140</width>
-          <height>21</height>
+          <height>25</height>
           <vertical_alignment>1</vertical_alignment>
           <auto_size>true</auto_size>
         </widget>
@@ -142,8 +142,9 @@
         <widget type="group" version="2.0.0">
           <name>O2iM_20</name>
           <macros>
-            <P>CTLG-CS:ODH-O2iM-$(R)</P>
-            <R>20</R>
+            <IDX>20</IDX>
+            <P>CTLG-CS:ODH-O2iM-$(IDX)</P>
+            <R>$(IDX)</R>
           </macros>
           <x>396</x>
           <y>422</y>
@@ -256,8 +257,9 @@
         <widget type="group" version="2.0.0">
           <name>O2iM_21</name>
           <macros>
-            <P>CTLG-CS:ODH-O2iM-$(R)</P>
-            <R>21</R>
+            <IDX>21</IDX>
+            <P>CTLG-CS:ODH-O2iM-$(IDX)</P>
+            <R>$(IDX)</R>
           </macros>
           <x>396</x>
           <y>249</y>
@@ -370,8 +372,9 @@
         <widget type="group" version="2.0.0">
           <name>O2iM_22</name>
           <macros>
-            <P>CTLG-CS:ODH-O2iM-$(R)</P>
-            <R>22</R>
+            <IDX>22</IDX>
+            <P>CTLG-CS:ODH-O2iM-$(IDX)</P>
+            <R>$(IDX)</R>
           </macros>
           <x>395</x>
           <y>80</y>
diff --git a/NON-APPROVED/odh/ODH_Area_Layout_CXB.bob b/NON-APPROVED/odh/ODH_Area_Layout_CXB.bob
index 9c0ee424..565ba735 100644
--- a/NON-APPROVED/odh/ODH_Area_Layout_CXB.bob
+++ b/NON-APPROVED/odh/ODH_Area_Layout_CXB.bob
@@ -142,8 +142,9 @@
         <widget type="group" version="2.0.0">
           <name>O2iM_13</name>
           <macros>
-            <P>CXB-CXH:ODH-O2iM-$(R)</P>
-            <R>13</R>
+            <IDX>13</IDX>
+            <P>CXB-CXH:ODH-O2iM-$(IDX)</P>
+            <R>$(IDX)</R>
           </macros>
           <x>350</x>
           <y>76</y>
@@ -256,8 +257,9 @@
         <widget type="group" version="2.0.0">
           <name>O2iM_14</name>
           <macros>
-            <P>CXB-CXH:ODH-O2iM-$(R)</P>
-            <R>14</R>
+            <IDX>14</IDX>
+            <P>CXB-CXH:ODH-O2iM-$(IDX)</P>
+            <R>$(IDX)</R>
           </macros>
           <x>797</x>
           <y>464</y>
@@ -370,8 +372,9 @@
         <widget type="group" version="2.0.0">
           <name>O2iM_15</name>
           <macros>
-            <P>CXB-CXH:ODH-O2iM-$(R)</P>
-            <R>15</R>
+            <IDX>15</IDX>
+            <P>CXB-CXH:ODH-O2iM-$(IDX)</P>
+            <R>$(IDX)</R>
           </macros>
           <x>609</x>
           <y>464</y>
@@ -484,8 +487,9 @@
         <widget type="group" version="2.0.0">
           <name>O2iM_16</name>
           <macros>
-            <P>CXB-CXH:ODH-O2iM-$(R)</P>
-            <R>16</R>
+            <IDX>16</IDX>
+            <P>CXB-CXH:ODH-O2iM-$(IDX)</P>
+            <R>$(IDX)</R>
           </macros>
           <x>251</x>
           <y>464</y>
@@ -598,8 +602,9 @@
         <widget type="group" version="2.0.0">
           <name>O2iM_17</name>
           <macros>
-            <P>CXB-CXH:ODH-O2iM-$(R)</P>
-            <R>17</R>
+            <IDX>17</IDX>
+            <P>CXB-CXH:ODH-O2iM-$(IDX)</P>
+            <R>$(IDX)</R>
           </macros>
           <x>65</x>
           <y>464</y>
@@ -712,8 +717,9 @@
         <widget type="group" version="2.0.0">
           <name>O2iM_18</name>
           <macros>
-            <P>CXB-CXH:ODH-O2iM-$(R)</P>
-            <R>18</R>
+            <IDX>18</IDX>
+            <P>CXB-CXH:ODH-O2iM-$(IDX)</P>
+            <R>$(IDX)</R>
           </macros>
           <x>458</x>
           <y>193</y>
@@ -827,8 +833,9 @@
         <widget type="group" version="2.0.0">
           <name>O2iM_19</name>
           <macros>
-            <P>CXB-CXH:ODH-O2iM-$(R)</P>
-            <R>19</R>
+            <IDX>19</IDX>
+            <P>CXB-CXH:ODH-O2iM-$(IDX)</P>
+            <R>$(IDX)</R>
           </macros>
           <x>460</x>
           <y>325</y>
diff --git a/NON-APPROVED/odh/ODH_Area_Layout_HCB.bob b/NON-APPROVED/odh/ODH_Area_Layout_HCB.bob
index 7a5b6b5c..b0d41a64 100644
--- a/NON-APPROVED/odh/ODH_Area_Layout_HCB.bob
+++ b/NON-APPROVED/odh/ODH_Area_Layout_HCB.bob
@@ -142,8 +142,9 @@
         <widget type="group" version="2.0.0">
           <name>O2iM_2</name>
           <macros>
-            <P>HCB-ACH:ODH-O2iM-$(R)</P>
-            <R>2</R>
+            <IDX>2</IDX>
+            <P>HCB-ACH:ODH-O2iM-$(IDX)</P>
+            <R>$(IDX)</R>
           </macros>
           <x>366</x>
           <y>422</y>
@@ -258,8 +259,9 @@
         <widget type="group" version="2.0.0">
           <name>O2iM_3</name>
           <macros>
-            <P>HCB-ACH:ODH-O2iM-$(R)</P>
-            <R>3</R>
+            <IDX>3</IDX>
+            <P>HCB-ACH:ODH-O2iM-$(IDX)</P>
+            <R>$(IDX)</R>
           </macros>
           <x>366</x>
           <y>273</y>
@@ -374,8 +376,9 @@
         <widget type="group" version="2.0.0">
           <name>O2iM_4</name>
           <macros>
-            <P>HCB-ACH:ODH-O2iM-$(R)</P>
-            <R>4</R>
+            <IDX>4</IDX>
+            <P>HCB-ACH:ODH-O2iM-$(IDX)</P>
+            <R>$(IDX)</R>
           </macros>
           <x>366</x>
           <y>89</y>
@@ -490,8 +493,9 @@
         <widget type="group" version="2.0.0">
           <name>O2iM_9</name>
           <macros>
-            <P>HCB-TCH:ODH-O2iM-$(R)</P>
-            <R>9</R>
+            <IDX>9</IDX>
+            <P>HCB-TCH:ODH-O2iM-$(IDX)</P>
+            <R>$(IDX)</R>
           </macros>
           <x>34</x>
           <y>217</y>
@@ -606,8 +610,9 @@
         <widget type="group" version="2.0.0">
           <name>O2iM_11</name>
           <macros>
-            <P>HCB-HPGS:ODH-O2iM-$(R)</P>
-            <R>11</R>
+            <IDX>11</IDX>
+            <P>HCB-HPGS:ODH-O2iM-$(IDX)</P>
+            <R>$(IDX)</R>
           </macros>
           <x>80</x>
           <y>65</y>
@@ -722,8 +727,9 @@
         <widget type="group" version="2.0.0">
           <name>O2iM_7</name>
           <macros>
-            <P>HCB-TCH:ODH-O2iM-$(R)</P>
-            <R>7</R>
+            <IDX>7</IDX>
+            <P>HCB-TCH:ODH-O2iM-$(IDX)</P>
+            <R>$(IDX)</R>
           </macros>
           <x>34</x>
           <y>463</y>
@@ -838,8 +844,9 @@
         <widget type="group" version="2.0.0">
           <name>O2iM_8</name>
           <macros>
-            <P>HCB-TCH:ODH-O2iM-$(R)</P>
-            <R>8</R>
+            <IDX>8</IDX>
+            <P>HCB-TCH:ODH-O2iM-$(IDX)</P>
+            <R>$(IDX)</R>
           </macros>
           <x>33</x>
           <y>328</y>
@@ -954,8 +961,9 @@
         <widget type="group" version="2.0.0">
           <name>O2iM_6</name>
           <macros>
-            <P>HCB-TCH:ODH-O2iM-$(R)</P>
-            <R>6</R>
+            <IDX>6</IDX>
+            <P>HCB-TCH:ODH-O2iM-$(IDX)</P>
+            <R>$(IDX)</R>
           </macros>
           <x>256</x>
           <y>422</y>
@@ -1068,8 +1076,9 @@
         <widget type="group" version="2.0.0">
           <name>O2iM_10</name>
           <macros>
-            <P>HCB-HPGS:ODH-O2iM-$(R)</P>
-            <R>10</R>
+            <IDX>10</IDX>
+            <P>HCB-HPGS:ODH-O2iM-$(IDX)</P>
+            <R>$(IDX)</R>
           </macros>
           <x>211</x>
           <y>66</y>
@@ -1182,8 +1191,9 @@
         <widget type="group" version="2.0.0">
           <name>O2iM_1</name>
           <macros>
-            <P>HCB-ACH:ODH-O2iM-$(R)</P>
-            <R>1</R>
+            <IDX>1</IDX>
+            <P>HCB-ACH:ODH-O2iM-$(IDX)</P>
+            <R>$(IDX)</R>
           </macros>
           <x>755</x>
           <y>337</y>
@@ -1296,8 +1306,9 @@
         <widget type="group" version="2.0.0">
           <name>O2iM_12</name>
           <macros>
-            <P>HCB-DogSh:ODH-O2iM-$(R)</P>
-            <R>12</R>
+            <IDX>12</IDX>
+            <P>HCB-DogSh:ODH-O2iM-$(IDX)</P>
+            <R>$(IDX)</R>
           </macros>
           <x>858</x>
           <y>442</y>
@@ -1410,8 +1421,9 @@
         <widget type="group" version="2.0.0">
           <name>O2iM_5</name>
           <macros>
-            <P>HCB-ACH:ODH-O2iM-$(R)</P>
-            <R>5</R>
+            <IDX>5</IDX>
+            <P>HCB-ACH:ODH-O2iM-$(IDX)</P>
+            <R>$(IDX)</R>
           </macros>
           <x>755</x>
           <y>164</y>
diff --git a/NON-APPROVED/odh/ODH_Area_Layout_TS2.bob b/NON-APPROVED/odh/ODH_Area_Layout_TS2.bob
index c9bdc6e1..c3655c5a 100644
--- a/NON-APPROVED/odh/ODH_Area_Layout_TS2.bob
+++ b/NON-APPROVED/odh/ODH_Area_Layout_TS2.bob
@@ -181,8 +181,9 @@
         <widget type="group" version="2.0.0">
           <name>O2iM_1</name>
           <macros>
-            <P>KG-GTA:ODH-O2iM-$(R)</P>
-            <R>1</R>
+            <IDX>1</IDX>
+            <P>KG-GTA:ODH-O2iM-$(IDX)</P>
+            <R>$(IDX)</R>
           </macros>
           <x>25</x>
           <y>39</y>
@@ -279,8 +280,9 @@
         <widget type="group" version="2.0.0">
           <name>O2iM_2</name>
           <macros>
-            <P>KG-GTA:ODH-O2iM-$(R)</P>
-            <R>2</R>
+            <IDX>2</IDX>
+            <P>KG-GTA:ODH-O2iM-$(IDX)</P>
+            <R>$(IDX)</R>
           </macros>
           <x>585</x>
           <y>39</y>
diff --git a/NON-APPROVED/odh/ODH_Main.bob b/NON-APPROVED/odh/ODH_Main.bob
index b300955a..55bd5139 100644
--- a/NON-APPROVED/odh/ODH_Main.bob
+++ b/NON-APPROVED/odh/ODH_Main.bob
@@ -256,10 +256,11 @@ Healthy</text>
         </background_color>
       </widget>
       <widget type="embedded" version="2.0.0">
-        <name>Embedded Display_13</name>
+        <name>$(P)</name>
         <macros>
-          <P>HCB-ACH:ODH-O2iM</P>
-          <R>1</R>
+          <IDX>1</IDX>
+          <P>HCB-ACH:ODH-O2iM-$(IDX)</P>
+          <R>$(IDX)</R>
         </macros>
         <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
         <x>10</x>
@@ -268,10 +269,11 @@ Healthy</text>
         <height>30</height>
       </widget>
       <widget type="embedded" version="2.0.0">
-        <name>Embedded Display_14</name>
+        <name>$(P)</name>
         <macros>
-          <P>HCB-ACH:ODH-O2iM</P>
-          <R>2</R>
+          <IDX>2</IDX>
+          <P>HCB-ACH:ODH-O2iM-$(IDX)</P>
+          <R>$(IDX)</R>
         </macros>
         <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
         <x>10</x>
@@ -280,10 +282,11 @@ Healthy</text>
         <height>30</height>
       </widget>
       <widget type="embedded" version="2.0.0">
-        <name>Embedded Display_15</name>
+        <name>$(P)</name>
         <macros>
-          <P>HCB-ACH:ODH-O2iM</P>
-          <R>3</R>
+          <IDX>3</IDX>
+          <P>HCB-ACH:ODH-O2iM-$(IDX)</P>
+          <R>$(IDX)</R>
         </macros>
         <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
         <x>10</x>
@@ -292,10 +295,11 @@ Healthy</text>
         <height>30</height>
       </widget>
       <widget type="embedded" version="2.0.0">
-        <name>Embedded Display_16</name>
+        <name>$(P)</name>
         <macros>
-          <P>HCB-ACH:ODH-O2iM</P>
-          <R>4</R>
+          <IDX>4</IDX>
+          <P>HCB-ACH:ODH-O2iM-$(IDX)</P>
+          <R>$(IDX)</R>
         </macros>
         <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
         <x>10</x>
@@ -304,10 +308,11 @@ Healthy</text>
         <height>30</height>
       </widget>
       <widget type="embedded" version="2.0.0">
-        <name>Embedded Display_17</name>
+        <name>$(P)</name>
         <macros>
-          <P>HCB-ACH:ODH-O2iM</P>
-          <R>5</R>
+          <IDX>5</IDX>
+          <P>HCB-ACH:ODH-O2iM-$(IDX)</P>
+          <R>$(IDX)</R>
         </macros>
         <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
         <x>10</x>
@@ -316,10 +321,11 @@ Healthy</text>
         <height>30</height>
       </widget>
       <widget type="embedded" version="2.0.0">
-        <name>Embedded Display_18</name>
+        <name>$(P)</name>
         <macros>
-          <P>HCB-TCH:ODH-O2iM</P>
-          <R>6</R>
+          <IDX>6</IDX>
+          <P>HCB-TCH:ODH-O2iM-$(IDX)</P>
+          <R>$(IDX)</R>
         </macros>
         <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
         <x>10</x>
@@ -328,10 +334,11 @@ Healthy</text>
         <height>30</height>
       </widget>
       <widget type="embedded" version="2.0.0">
-        <name>Embedded Display_19</name>
+        <name>$(P)</name>
         <macros>
-          <P>HCB-TCH:ODH-O2iM</P>
-          <R>7</R>
+          <IDX>7</IDX>
+          <P>HCB-TCH:ODH-O2iM-$(IDX)</P>
+          <R>$(IDX)</R>
         </macros>
         <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
         <x>10</x>
@@ -340,10 +347,11 @@ Healthy</text>
         <height>30</height>
       </widget>
       <widget type="embedded" version="2.0.0">
-        <name>Embedded Display_20</name>
+        <name>$(P)</name>
         <macros>
-          <P>HCB-TCH:ODH-O2iM</P>
-          <R>8</R>
+          <IDX>8</IDX>
+          <P>HCB-TCH:ODH-O2iM-$(IDX)</P>
+          <R>$(IDX)</R>
         </macros>
         <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
         <x>10</x>
@@ -352,10 +360,11 @@ Healthy</text>
         <height>30</height>
       </widget>
       <widget type="embedded" version="2.0.0">
-        <name>Embedded Display_21</name>
+        <name>$(P)</name>
         <macros>
-          <P>HCB-TCH:ODH-O2iM</P>
-          <R>9</R>
+          <IDX>9</IDX>
+          <P>HCB-TCH:ODH-O2iM-$(IDX)</P>
+          <R>$(IDX)</R>
         </macros>
         <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
         <x>10</x>
@@ -364,10 +373,11 @@ Healthy</text>
         <height>30</height>
       </widget>
       <widget type="embedded" version="2.0.0">
-        <name>Embedded Display_22</name>
+        <name>$(P)</name>
         <macros>
-          <P>HCB-HPGS:ODH-O2iM</P>
-          <R>10</R>
+          <IDX>10</IDX>
+          <P>HCB-HPGS:ODH-O2iM-$(IDX)</P>
+          <R>$(IDX)</R>
         </macros>
         <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
         <x>10</x>
@@ -376,10 +386,11 @@ Healthy</text>
         <height>30</height>
       </widget>
       <widget type="embedded" version="2.0.0">
-        <name>Embedded Display_23</name>
+        <name>$(P)</name>
         <macros>
-          <P>HCB-HPGS:ODH-O2iM</P>
-          <R>11</R>
+          <IDX>11</IDX>
+          <P>HCB-HPGS:ODH-O2iM-$(IDX)</P>
+          <R>$(IDX)</R>
         </macros>
         <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
         <x>10</x>
@@ -388,10 +399,11 @@ Healthy</text>
         <height>30</height>
       </widget>
       <widget type="embedded" version="2.0.0">
-        <name>Embedded Display_24</name>
+        <name>$(P)</name>
         <macros>
-          <P>HCB-DogSh:ODH-O2iM</P>
-          <R>12</R>
+          <IDX>12</IDX>
+          <P>HCB-DogSh:ODH-O2iM-$(IDX)</P>
+          <R>$(IDX)</R>
         </macros>
         <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
         <x>10</x>
@@ -562,10 +574,11 @@ $(pv_name)</tooltip>
         </background_color>
       </widget>
       <widget type="embedded" version="2.0.0">
-        <name>Embedded Display_37</name>
+        <name>$(P)</name>
         <macros>
-          <P>CXB-CXH:ODH-O2iM</P>
-          <R>13</R>
+          <IDX>13</IDX>
+          <P>CXB-CXH:ODH-O2iM-$(IDX)</P>
+          <R>$(IDX)</R>
         </macros>
         <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
         <x>10</x>
@@ -574,10 +587,11 @@ $(pv_name)</tooltip>
         <height>30</height>
       </widget>
       <widget type="embedded" version="2.0.0">
-        <name>Embedded Display_38</name>
+        <name>$(P)</name>
         <macros>
-          <P>CXB-CXH:ODH-O2iM</P>
-          <R>14</R>
+          <IDX>14</IDX>
+          <P>CXB-CXH:ODH-O2iM-$(IDX)</P>
+          <R>$(IDX)</R>
         </macros>
         <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
         <x>10</x>
@@ -586,10 +600,11 @@ $(pv_name)</tooltip>
         <height>30</height>
       </widget>
       <widget type="embedded" version="2.0.0">
-        <name>Embedded Display_39</name>
+        <name>$(P)</name>
         <macros>
-          <P>CXB-CXH:ODH-O2iM</P>
-          <R>15</R>
+          <IDX>15</IDX>
+          <P>CXB-CXH:ODH-O2iM-$(IDX)</P>
+          <R>$(IDX)</R>
         </macros>
         <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
         <x>10</x>
@@ -598,10 +613,11 @@ $(pv_name)</tooltip>
         <height>30</height>
       </widget>
       <widget type="embedded" version="2.0.0">
-        <name>Embedded Display_40</name>
+        <name>$(P)</name>
         <macros>
-          <P>CXB-CXH:ODH-O2iM</P>
-          <R>16</R>
+          <IDX>16</IDX>
+          <P>CXB-CXH:ODH-O2iM-$(IDX)</P>
+          <R>$(IDX)</R>
         </macros>
         <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
         <x>10</x>
@@ -610,10 +626,11 @@ $(pv_name)</tooltip>
         <height>30</height>
       </widget>
       <widget type="embedded" version="2.0.0">
-        <name>Embedded Display_41</name>
+        <name>$(P)</name>
         <macros>
-          <P>CXB-CXH:ODH-O2iM</P>
-          <R>17</R>
+          <IDX>17</IDX>
+          <P>CXB-CXH:ODH-O2iM-$(IDX)</P>
+          <R>$(IDX)</R>
         </macros>
         <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
         <x>10</x>
@@ -622,10 +639,11 @@ $(pv_name)</tooltip>
         <height>30</height>
       </widget>
       <widget type="embedded" version="2.0.0">
-        <name>Embedded Display_42</name>
+        <name>$(P)</name>
         <macros>
-          <P>CXB-CXH:ODH-O2iM</P>
-          <R>18</R>
+          <IDX>18</IDX>
+          <P>CXB-CXH:ODH-O2iM-$(IDX)</P>
+          <R>$(IDX)</R>
         </macros>
         <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
         <x>10</x>
@@ -634,10 +652,11 @@ $(pv_name)</tooltip>
         <height>30</height>
       </widget>
       <widget type="embedded" version="2.0.0">
-        <name>Embedded Display_43</name>
+        <name>$(P)</name>
         <macros>
-          <P>CXB-CXH:ODH-O2iM</P>
-          <R>19</R>
+          <IDX>19</IDX>
+          <P>CXB-CXH:ODH-O2iM-$(IDX)</P>
+          <R>$(IDX)</R>
         </macros>
         <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
         <x>10</x>
@@ -697,10 +716,11 @@ $(pv_name)</tooltip>
         </background_color>
       </widget>
       <widget type="embedded" version="2.0.0">
-        <name>Embedded Display_54</name>
+        <name>$(P)</name>
         <macros>
-          <P>CTLG-CS:ODH-O2iM</P>
-          <R>20</R>
+          <IDX>20</IDX>
+          <P>CTLG-CS:ODH-O2iM-$(IDX)</P>
+          <R>$(IDX)</R>
         </macros>
         <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
         <x>10</x>
@@ -709,10 +729,11 @@ $(pv_name)</tooltip>
         <height>30</height>
       </widget>
       <widget type="embedded" version="2.0.0">
-        <name>Embedded Display_55</name>
+        <name>$(P)</name>
         <macros>
-          <P>CTLG-CS:ODH-O2iM</P>
-          <R>21</R>
+          <IDX>21</IDX>
+          <P>CTLG-CS:ODH-O2iM-$(IDX)</P>
+          <R>$(IDX)</R>
         </macros>
         <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
         <x>10</x>
@@ -721,10 +742,11 @@ $(pv_name)</tooltip>
         <height>30</height>
       </widget>
       <widget type="embedded" version="2.0.0">
-        <name>Embedded Display_56</name>
+        <name>$(P)</name>
         <macros>
-          <P>CTLG-CS:ODH-O2iM</P>
-          <R>22</R>
+          <IDX>22</IDX>
+          <P>CTLG-CS:ODH-O2iM-$(IDX)</P>
+          <R>$(IDX)</R>
         </macros>
         <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
         <x>10</x>
@@ -784,10 +806,11 @@ $(pv_name)</tooltip>
         </background_color>
       </widget>
       <widget type="embedded" version="2.0.0">
-        <name>Embedded Display_57</name>
+        <name>$(P)</name>
         <macros>
-          <P>KG-GTA:ODH-O2iM</P>
-          <R>1</R>
+          <IDX>1</IDX>
+          <P>KG-GTA:ODH-O2iM-$(IDX)</P>
+          <R>$(IDX)</R>
         </macros>
         <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
         <x>10</x>
@@ -796,10 +819,11 @@ $(pv_name)</tooltip>
         <height>30</height>
       </widget>
       <widget type="embedded" version="2.0.0">
-        <name>Embedded Display_58</name>
+        <name>$(P)</name>
         <macros>
-          <P>KG-GTA:ODH-O2iM</P>
-          <R>2</R>
+          <IDX>2</IDX>
+          <P>KG-GTA:ODH-O2iM-$(IDX)</P>
+          <R>$(IDX)</R>
         </macros>
         <file>$(EMBEDDED_DISPLAYS)/ODH_Monit_Sub.bob</file>
         <x>10</x>
-- 
GitLab