Skip to content

Commit b5d3dc0

Browse files
adedamola-sodeadedamola-sode
committed
removed : for motor screens, changed text on button
1 parent e70b4d2 commit b5d3dc0

File tree

3 files changed

+164
-116
lines changed

3 files changed

+164
-116
lines changed

‎example-synoptic/b23-services/synoptic/techui_support/bob/pmac/MOTOR.bob‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<description>$(name)</description>
5555
</action>
5656
</actions>
57-
<pv_name>$(P)$(M):ELOSS:ELOSS-CLEAR</pv_name>
57+
<pv_name>$(P):$(M):ELOSS:ELOSS-CLEAR</pv_name>
5858
<text>Go</text>
5959
<x>105</x>
6060
<width>205</width>
@@ -110,7 +110,7 @@
110110
</widget>
111111
<widget type="textentry" version="3.0.0">
112112
<name>TextEntry_33</name>
113-
<pv_name>$(P)$(M):LIMIT_VIOLATION:USER-HIGH-LIMIT</pv_name>
113+
<pv_name>$(P):$(M):LIMIT_VIOLATION:USER-HIGH-LIMIT</pv_name>
114114
<x>105</x>
115115
<width>205</width>
116116
<font>
@@ -130,7 +130,7 @@
130130
</widget>
131131
<widget type="textentry" version="3.0.0">
132132
<name>TextEntry_35</name>
133-
<pv_name>$(P)$(M):LIMIT_VIOLATION:USER-LOW-LIMIT</pv_name>
133+
<pv_name>$(P):$(M):LIMIT_VIOLATION:USER-LOW-LIMIT</pv_name>
134134
<x>105</x>
135135
<y>25</y>
136136
<width>205</width>
@@ -151,7 +151,7 @@
151151
</widget>
152152
<widget type="textentry" version="3.0.0">
153153
<name>TextEntry_37</name>
154-
<pv_name>$(P)$(M):LIMIT_VIOLATION:DIAL-HIGH-LIMIT</pv_name>
154+
<pv_name>$(P):$(M):LIMIT_VIOLATION:DIAL-HIGH-LIMIT</pv_name>
155155
<x>105</x>
156156
<y>50</y>
157157
<width>205</width>
@@ -172,7 +172,7 @@
172172
</widget>
173173
<widget type="textentry" version="3.0.0">
174174
<name>TextEntry_38</name>
175-
<pv_name>$(P)$(M):LIMIT_VIOLATION:DIAL-LOW-LIMIT</pv_name>
175+
<pv_name>$(P):$(M):LIMIT_VIOLATION:DIAL-LOW-LIMIT</pv_name>
176176
<x>105</x>
177177
<y>75</y>
178178
<width>205</width>
@@ -263,7 +263,7 @@
263263
<description>$(name)</description>
264264
</action>
265265
</actions>
266-
<pv_name>$(P)$(M):KILL:KILL</pv_name>
266+
<pv_name>$(P):$(M):KILL:KILL</pv_name>
267267
<text>Go</text>
268268
<x>105</x>
269269
<width>205</width>
@@ -305,7 +305,7 @@
305305
<description>$(name)</description>
306306
</action>
307307
</actions>
308-
<pv_name>$(P)$(M):SYNC_VAL_RBV:SYNC-VAL-RBV</pv_name>
308+
<pv_name>$(P):$(M):SYNC_VAL_RBV:SYNC-VAL-RBV</pv_name>
309309
<text>Go</text>
310310
<x>105</x>
311311
<width>205</width>
@@ -347,7 +347,7 @@
347347
<description>$(name)</description>
348348
</action>
349349
</actions>
350-
<pv_name>$(P)$(M):COMMANDS:HOME-FORWARD</pv_name>
350+
<pv_name>$(P):$(M):COMMANDS:HOME-FORWARD</pv_name>
351351
<text>Go</text>
352352
<x>105</x>
353353
<width>205</width>
@@ -378,7 +378,7 @@
378378
<description>$(name)</description>
379379
</action>
380380
</actions>
381-
<pv_name>$(P)$(M):COMMANDS:HOME-REVERSE</pv_name>
381+
<pv_name>$(P):$(M):COMMANDS:HOME-REVERSE</pv_name>
382382
<text>Go</text>
383383
<x>105</x>
384384
<y>25</y>
@@ -410,7 +410,7 @@
410410
<description>$(name)</description>
411411
</action>
412412
</actions>
413-
<pv_name>$(P)$(M):COMMANDS:JOG-FORWARD</pv_name>
413+
<pv_name>$(P):$(M):COMMANDS:JOG-FORWARD</pv_name>
414414
<text>Go</text>
415415
<x>105</x>
416416
<y>50</y>
@@ -442,7 +442,7 @@
442442
<description>$(name)</description>
443443
</action>
444444
</actions>
445-
<pv_name>$(P)$(M):COMMANDS:JOG-REVERSE</pv_name>
445+
<pv_name>$(P):$(M):COMMANDS:JOG-REVERSE</pv_name>
446446
<text>Go</text>
447447
<x>105</x>
448448
<y>75</y>
@@ -474,7 +474,7 @@
474474
<description>$(name)</description>
475475
</action>
476476
</actions>
477-
<pv_name>$(P)$(M):COMMANDS:TWEAK-FORWARD</pv_name>
477+
<pv_name>$(P):$(M):COMMANDS:TWEAK-FORWARD</pv_name>
478478
<text>Go</text>
479479
<x>105</x>
480480
<y>100</y>
@@ -506,7 +506,7 @@
506506
<description>$(name)</description>
507507
</action>
508508
</actions>
509-
<pv_name>$(P)$(M):COMMANDS:TWEAK-REVERSE</pv_name>
509+
<pv_name>$(P):$(M):COMMANDS:TWEAK-REVERSE</pv_name>
510510
<text>Go</text>
511511
<x>105</x>
512512
<y>125</y>
@@ -531,7 +531,7 @@
531531
</widget>
532532
<widget type="textentry" version="3.0.0">
533533
<name>TextEntry_40</name>
534-
<pv_name>$(P)$(M):COMMANDS:TWEAK-STEP</pv_name>
534+
<pv_name>$(P):$(M):COMMANDS:TWEAK-STEP</pv_name>
535535
<x>105</x>
536536
<y>150</y>
537537
<width>205</width>
@@ -660,7 +660,7 @@
660660
</widget>
661661
<widget type="combo" version="2.0.0">
662662
<name>ComboBox</name>
663-
<pv_name>$(P)$(M):CALIBRATION:DIRECTION</pv_name>
663+
<pv_name>$(P):$(M):CALIBRATION:DIRECTION</pv_name>
664664
<x>105</x>
665665
<width>205</width>
666666
<height>20</height>
@@ -694,7 +694,7 @@
694694
</widget>
695695
<widget type="combo" version="2.0.0">
696696
<name>ComboBox</name>
697-
<pv_name>$(P)$(M):CALIBRATION:SET-USE</pv_name>
697+
<pv_name>$(P):$(M):CALIBRATION:SET-USE</pv_name>
698698
<x>105</x>
699699
<y>50</y>
700700
<width>205</width>
@@ -722,7 +722,7 @@
722722
</widget>
723723
<widget type="combo" version="2.0.0">
724724
<name>ComboBox</name>
725-
<pv_name>$(P)$(M):CALIBRATION:OFFSET</pv_name>
725+
<pv_name>$(P):$(M):CALIBRATION:OFFSET</pv_name>
726726
<x>105</x>
727727
<y>75</y>
728728
<width>205</width>
@@ -750,7 +750,7 @@
750750
</widget>
751751
<widget type="combo" version="2.0.0">
752752
<name>ComboBox</name>
753-
<pv_name>$(P)$(M):CALIBRATION:USE-ENCODER</pv_name>
753+
<pv_name>$(P):$(M):CALIBRATION:USE-ENCODER</pv_name>
754754
<x>105</x>
755755
<y>100</y>
756756
<width>205</width>
@@ -771,7 +771,7 @@
771771
</widget>
772772
<widget type="textentry" version="3.0.0">
773773
<name>TextEntry_41</name>
774-
<pv_name>$(P)$(M):CALIBRATION:USER-OFFSET</pv_name>
774+
<pv_name>$(P):$(M):CALIBRATION:USER-OFFSET</pv_name>
775775
<x>105</x>
776776
<y>25</y>
777777
<width>205</width>
@@ -870,7 +870,7 @@
870870
</widget>
871871
<widget type="combo" version="2.0.0">
872872
<name>ComboBox</name>
873-
<pv_name>$(P)$(M):RESOLUTION:RESOLUTION</pv_name>
873+
<pv_name>$(P):$(M):RESOLUTION:RESOLUTION</pv_name>
874874
<x>105</x>
875875
<width>205</width>
876876
<height>20</height>
@@ -905,7 +905,7 @@
905905
</widget>
906906
<widget type="textentry" version="3.0.0">
907907
<name>TextEntry_42</name>
908-
<pv_name>$(P)$(M):RESOLUTION:MOTOR-STEP-SIZE</pv_name>
908+
<pv_name>$(P):$(M):RESOLUTION:MOTOR-STEP-SIZE</pv_name>
909909
<x>105</x>
910910
<y>25</y>
911911
<width>205</width>
@@ -926,7 +926,7 @@
926926
</widget>
927927
<widget type="textentry" version="3.0.0">
928928
<name>TextEntry_43</name>
929-
<pv_name>$(P)$(M):CALIBRATION:USER-OFFSET</pv_name>
929+
<pv_name>$(P):$(M):CALIBRATION:USER-OFFSET</pv_name>
930930
<x>105</x>
931931
<y>50</y>
932932
<width>205</width>
@@ -1084,7 +1084,7 @@
10841084
</widget>
10851085
<widget type="textentry" version="3.0.0">
10861086
<name>TextEntry_20</name>
1087-
<pv_name>$(P)$(M):MOTION:BASE-VELOCITY</pv_name>
1087+
<pv_name>$(P):$(M):MOTION:BASE-VELOCITY</pv_name>
10881088
<x>175</x>
10891089
<y>25</y>
10901090
<width>205</width>
@@ -1105,7 +1105,7 @@
11051105
</widget>
11061106
<widget type="textentry" version="3.0.0">
11071107
<name>TextEntry_19</name>
1108-
<pv_name>$(P)$(M):MOTION:MAX-VELOCITY</pv_name>
1108+
<pv_name>$(P):$(M):MOTION:MAX-VELOCITY</pv_name>
11091109
<x>175</x>
11101110
<width>205</width>
11111111
<font>
@@ -1125,7 +1125,7 @@
11251125
</widget>
11261126
<widget type="textentry" version="3.0.0">
11271127
<name>TextEntry_21</name>
1128-
<pv_name>$(P)$(M):MOTION:VELOCITY</pv_name>
1128+
<pv_name>$(P):$(M):MOTION:VELOCITY</pv_name>
11291129
<x>175</x>
11301130
<y>50</y>
11311131
<width>205</width>
@@ -1146,7 +1146,7 @@
11461146
</widget>
11471147
<widget type="textentry" version="3.0.0">
11481148
<name>TextEntry_22</name>
1149-
<pv_name>$(P)$(M):MOTION:SECS-TO-VELOCITY</pv_name>
1149+
<pv_name>$(P):$(M):MOTION:SECS-TO-VELOCITY</pv_name>
11501150
<x>175</x>
11511151
<y>75</y>
11521152
<width>205</width>
@@ -1167,7 +1167,7 @@
11671167
</widget>
11681168
<widget type="textentry" version="3.0.0">
11691169
<name>TextEntry_23</name>
1170-
<pv_name>$(P)$(M):MOTION:JVEL</pv_name>
1170+
<pv_name>$(P):$(M):MOTION:JVEL</pv_name>
11711171
<x>175</x>
11721172
<y>100</y>
11731173
<width>205</width>
@@ -1188,7 +1188,7 @@
11881188
</widget>
11891189
<widget type="textentry" version="3.0.0">
11901190
<name>TextEntry_24</name>
1191-
<pv_name>$(P)$(M):MOTION:JOG-ACCELERATION</pv_name>
1191+
<pv_name>$(P):$(M):MOTION:JOG-ACCELERATION</pv_name>
11921192
<x>175</x>
11931193
<y>125</y>
11941194
<width>205</width>
@@ -1209,7 +1209,7 @@
12091209
</widget>
12101210
<widget type="textentry" version="3.0.0">
12111211
<name>TextEntry_25</name>
1212-
<pv_name>$(P)$(M):MOTION:BACKLASH-DISTANCE</pv_name>
1212+
<pv_name>$(P):$(M):MOTION:BACKLASH-DISTANCE</pv_name>
12131213
<x>175</x>
12141214
<y>150</y>
12151215
<width>205</width>
@@ -1230,7 +1230,7 @@
12301230
</widget>
12311231
<widget type="textentry" version="3.0.0">
12321232
<name>TextEntry_26</name>
1233-
<pv_name>$(P)$(M):MOTION:BACKLASH-VELOCITY</pv_name>
1233+
<pv_name>$(P):$(M):MOTION:BACKLASH-VELOCITY</pv_name>
12341234
<x>175</x>
12351235
<y>175</y>
12361236
<width>205</width>
@@ -1251,7 +1251,7 @@
12511251
</widget>
12521252
<widget type="textentry" version="3.0.0">
12531253
<name>TextEntry_27</name>
1254-
<pv_name>$(P)$(M):MOTION:BACKLASH-SECS-TO-VELOCITY</pv_name>
1254+
<pv_name>$(P):$(M):MOTION:BACKLASH-SECS-TO-VELOCITY</pv_name>
12551255
<x>175</x>
12561256
<y>200</y>
12571257
<width>205</width>
@@ -1272,7 +1272,7 @@
12721272
</widget>
12731273
<widget type="textentry" version="3.0.0">
12741274
<name>TextEntry_28</name>
1275-
<pv_name>$(P)$(M):MOTION:MOVE-FRACTION</pv_name>
1275+
<pv_name>$(P):$(M):MOTION:MOVE-FRACTION</pv_name>
12761276
<x>175</x>
12771277
<y>225</y>
12781278
<width>205</width>
@@ -1293,7 +1293,7 @@
12931293
</widget>
12941294
<widget type="textentry" version="3.0.0">
12951295
<name>TextEntry_29</name>
1296-
<pv_name>$(P)$(M):MOTION:RETRY-DEADBAND</pv_name>
1296+
<pv_name>$(P):$(M):MOTION:RETRY-DEADBAND</pv_name>
12971297
<x>175</x>
12981298
<y>250</y>
12991299
<width>205</width>
@@ -1314,7 +1314,7 @@
13141314
</widget>
13151315
<widget type="textentry" version="3.0.0">
13161316
<name>TextEntry_30</name>
1317-
<pv_name>$(P)$(M):MOTION:MAX-RETRIES</pv_name>
1317+
<pv_name>$(P):$(M):MOTION:MAX-RETRIES</pv_name>
13181318
<x>175</x>
13191319
<y>275</y>
13201320
<width>205</width>
@@ -1527,7 +1527,7 @@
15271527
</widget>
15281528
<widget type="textentry" version="3.0.0">
15291529
<name>TextEntry_31</name>
1530-
<pv_name>$(P)$(M):OTHER:PREC</pv_name>
1530+
<pv_name>$(P):$(M):OTHER:PREC</pv_name>
15311531
<x>175</x>
15321532
<width>205</width>
15331533
<font>
@@ -1547,7 +1547,7 @@
15471547
</widget>
15481548
<widget type="textentry" version="3.0.0">
15491549
<name>TextEntry_32</name>
1550-
<pv_name>$(P)$(M):OTHER:EGU</pv_name>
1550+
<pv_name>$(P):$(M):OTHER:EGU</pv_name>
15511551
<x>175</x>
15521552
<y>25</y>
15531553
<width>205</width>

0 commit comments

Comments
 (0)