diff --git a/NON-APPROVED/ts2-010rfc-rflps/scripts/macroNames.py b/NON-APPROVED/ts2-010rfc-rflps/scripts/macroNames.py index aedf68c8bc845e5db6c4fc109559f3f2c786b734..bd1b8f84fbb978b21d4b97a38c2db11dbab4663d 100644 --- a/NON-APPROVED/ts2-010rfc-rflps/scripts/macroNames.py +++ b/NON-APPROVED/ts2-010rfc-rflps/scripts/macroNames.py @@ -52,10 +52,14 @@ di04_ = "RFS-FIM-110:DI4" di05_ = "RFS-VacPS-110:I-SP" di06_ = "RFS-VacPS-120:I-SP" di07_ = "RFS-FIM-110:DI7" -di08_ = "RFS-ADR-201001:ItckStat" -di09_ = "RFS-ADR-110:ItckStat" -di10_ = "RFS-ADR-120:ItckStat" -di11_ = "RFS-FIM-110:DI11" +# Old configuration forAtomki's SCB +#di08_ = "RFS-ADR-201001:ItckStat" +#di09_ = "RFS-ADR-110:ItckStat" +#di10_ = "RFS-ADR-120:ItckStat" +di08_ = "RFS-FIM-110:DI8" +di09_ = "RFS-ADR-201001:ItckStat" +di10_ = "RFS-ADR-201002:ItckStat" +di11_ = "RFS-ADR-201003:ItckStat" di12_ = "RFS-FIM-110:DI12" di13_ = "RFS-FIM-110:DI13" di14_ = "RFS-FIM-110:DI14" diff --git a/NON-APPROVED/ts2-010rfc-rflps/support/overview.bob b/NON-APPROVED/ts2-010rfc-rflps/support/overview.bob index 9249f6142c0897f6c961eb81382248a4a620e8bc..07ad5ed1ba216200b3c22690379c1ff0dfc19ca1 100644 --- a/NON-APPROVED/ts2-010rfc-rflps/support/overview.bob +++ b/NON-APPROVED/ts2-010rfc-rflps/support/overview.bob @@ -132,8 +132,8 @@ <widget type="textupdate" version="2.0.0"> <name>Text Update_4</name> <pv_name>$(PREFIX):RFS-Kly-110:GreenLight-INT-RB</pv_name> - <x>80</x> - <y>296</y> + <x>310</x> + <y>230</y> <width>90</width> <horizontal_alignment>1</horizontal_alignment> <vertical_alignment>1</vertical_alignment> @@ -159,8 +159,8 @@ <widget type="textupdate" version="2.0.0"> <name>Text Update_5</name> <pv_name>$(PREFIX):RFS-Kly-110:YellowLight-INT-RB</pv_name> - <x>80</x> - <y>271</y> + <x>310</x> + <y>205</y> <width>90</width> <horizontal_alignment>1</horizontal_alignment> <vertical_alignment>1</vertical_alignment> @@ -186,8 +186,8 @@ <widget type="textupdate" version="2.0.0"> <name>Text Update_6</name> <pv_name>$(PREFIX):RFS-Kly-110:RedLight-INT-RB</pv_name> - <x>80</x> - <y>246</y> + <x>310</x> + <y>180</y> <width>90</width> <horizontal_alignment>1</horizontal_alignment> <vertical_alignment>1</vertical_alignment> @@ -402,9 +402,9 @@ else: </widget> <widget type="led" version="2.0.0"> <name>LED_17</name> - <pv_name>$(PREFIX):RFS-ADR-110:ItckStat:FastIntStat</pv_name> - <x>359</x> - <y>460</y> + <pv_name>$(PREFIX):RFS-ADR-201002:ItckStat:FastIntStat</pv_name> + <x>520</x> + <y>246</y> <off_color> <color name="MAJOR" red="252" green="13" blue="27"> </color> @@ -422,12 +422,11 @@ else: </widget> <widget type="textupdate" version="2.0.0"> <name>Text Update_34</name> - <pv_name>$(PREFIX):RFS-ADR-110:ItckStat.DESC</pv_name> - <x>100</x> - <y>460</y> + <pv_name>$(PREFIX):RFS-ADR-201002:ItckStat.DESC</pv_name> + <x>560</x> + <y>246</y> <width>240</width> <transparent>true</transparent> - <horizontal_alignment>2</horizontal_alignment> <vertical_alignment>1</vertical_alignment> <border_alarm_sensitive>false</border_alarm_sensitive> </widget> @@ -1942,7 +1941,7 @@ widget.setPropertyValue('tooltip', pvs[0].getName() + </widget> <widget type="textupdate" version="2.0.0"> <name>Text Update_37</name> - <pv_name>$(PREFIX):RFS-ADR-120:ItckStat.DESC</pv_name> + <pv_name>$(PREFIX):RFS-ADR-201003:ItckStat.DESC</pv_name> <x>100</x> <y>493</y> <width>240</width> @@ -1953,7 +1952,7 @@ widget.setPropertyValue('tooltip', pvs[0].getName() + </widget> <widget type="led" version="2.0.0"> <name>LED_20</name> - <pv_name>$(PREFIX):RFS-ADR-120:ItckStat:FastIntStat</pv_name> + <pv_name>$(PREFIX):RFS-ADR-201003:ItckStat:FastIntStat</pv_name> <x>359</x> <y>493</y> <off_color> @@ -2176,8 +2175,8 @@ widget.setPropertyValue('tooltip', pvs[0].getName() + <symbol>images/SG-TL70-W-2.png</symbol> <symbol>images/SG-TL70-G-2.png</symbol> </symbols> - <x>520</x> - <y>226</y> + <x>410</x> + <y>222</y> <width>30</width> <height>30</height> <border_alarm_sensitive>false</border_alarm_sensitive> @@ -2189,8 +2188,8 @@ widget.setPropertyValue('tooltip', pvs[0].getName() + <symbol>images/SG-TL70-W-2.png</symbol> <symbol>images/SG-TL70-Y-2.png</symbol> </symbols> - <x>520</x> - <y>203</y> + <x>410</x> + <y>199</y> <width>30</width> <height>30</height> <border_alarm_sensitive>false</border_alarm_sensitive> @@ -2202,8 +2201,8 @@ widget.setPropertyValue('tooltip', pvs[0].getName() + <symbol>images/SG-TL70-W-2.png</symbol> <symbol>images/SG-TL70-R-2.png</symbol> </symbols> - <x>520</x> - <y>180</y> + <x>410</x> + <y>176</y> <width>30</width> <height>30</height> <border_alarm_sensitive>false</border_alarm_sensitive>