diff --git a/db/EMU.substitutions b/db/EMU.substitutions
index 4753e33d4d2b590702f05b9ed1df6a6ca815c9a7..59068373b3a7f4d666a23992c7190a24e684336c 100644
--- a/db/EMU.substitutions
+++ b/db/EMU.substitutions
@@ -482,38 +482,30 @@ pattern {DEVICE,NELM_COMP,DET,SCAN_SLIT,MTRREC}
##########################################################################
file ecat2el41xx.template
{
- pattern {PREFIX,CH_ID, SLAVE_IDX,PDO_IDX, EOFF, ESLO, DRVL, DRVH}
- {"LNS-ISRC-010:PBI-EM","HVhor-SP", 3, 0, 0, 0.0003051850947599719, -10, 10}
- {"LNS-ISRC-010:PBI-EM","HVver-SP", 3, 2, 0, 0.0003051850947599719, -10, 10}
- {"LNS-ISRC-010:PBI-EM","BPS1-CurS", 2 ,0, 0, 0.0003051850947599719}
-# {"LNS-ISRC-010:PBI-EM","BPS1-CurS", 2 ,0, 0, 0,00048829615161595504}
- {"LNS-ISRC-010:PBI-EM","BPS1-VolS", 2 ,1, 0 , 0.0003051850947599719}
-# {"LNS-ISRC-010:PBI-EM","BPS1-VolS", 2 ,1, 0 , 0,09155552842799157}
- {"LNS-ISRC-010:PBI-EM","BPS2-CurS", 2 ,2, 0, 0.0003051850947599719}
-# {"LNS-ISRC-010:PBI-EM","BPS2-CurS", 2 ,2, 0, 0,00048829615161595504}
- {"LNS-ISRC-010:PBI-EM","BPS2-VolS", 2 ,3, 0 , 0.0003051850947599719}
-# {"LNS-ISRC-010:PBI-EM","BPS2-VolS", 2 ,3, 0 , 0,09155552842799157}
+ pattern {PREFIX,CH_ID, SLAVE_IDX,PDO_IDX, EOFF, ESLO, DRVL, DRVH, PREC,EGU}
+ {"LNS-ISRC-010:PBI-EM","HVhor-SP", 3, 0, 0, 0.0003051850947599719, -10, 10,5,"kV"}
+ {"LNS-ISRC-010:PBI-EM","HVver-SP", 3, 2, 0, 0.0003051850947599719, -10, 10,5,"kV"}
+ {"LNS-ISRC-010:PBI-EM","BPS1-CurS", 2 ,0, 0,0.000244148, 0, 8,1,"mA"}
+ {"LNS-ISRC-010:PBI-EM","BPS1-VolS", 2 ,1, 0 , 0.09155553, 0, 1500,1,"V"}
+ {"LNS-ISRC-010:PBI-EM","BPS2-CurS", 2 ,2, 0, 0.000244148, 0, 8,1,"mA"}
+ {"LNS-ISRC-010:PBI-EM","BPS2-VolS", 2 ,3, 0 , 0.09155553, 0, 1500,1,"V"}
}
file ecat2el316x.template
{
pattern {PREFIX,CH_ID, SLAVE_IDX, PDO_IDX}
- {"LNS-ISRC-010:PBI-EM","BPS1-CurR",1 ,0, 0, 0.0003051850947599719}
-# {"LNS-ISRC-010:PBI-EM","BPS1-CurR",1 ,0, 0, 0,00048829615161595504}
- {"LNS-ISRC-010:PBI-EM","BPS1-VolR",1 ,1, 0, 0.0003051850947599719}
-# {"LNS-ISRC-010:PBI-EM","BPS1-VolR",1 ,1, 0, 0,09155552842799157}
- {"LNS-ISRC-010:PBI-EM","BPS2-CurR",1 ,2, 0, 0.0003051850947599719}
-# {"LNS-ISRC-010:PBI-EM","BPS2-CurR",1 ,2, 0, 0,00048829615161595504}
- {"LNS-ISRC-010:PBI-EM","BPS2-VolR",1 ,3, 0, 0.0003051850947599719}
-# {"LNS-ISRC-010:PBI-EM","BPS2-VolR",1 ,3, 0, 0,09155552842799157}
+ {"LNS-ISRC-010:PBI-EM","BPS1-CurR",1 ,0, 0, 0.000244148}
+ {"LNS-ISRC-010:PBI-EM","BPS1-VolR",1 ,1, 0, 0.09155553}
+ {"LNS-ISRC-010:PBI-EM","BPS2-CurR",1 ,2, 0, 0.000244148}
+ {"LNS-ISRC-010:PBI-EM","BPS2-VolR",1 ,3, 0, 0.09155553}
}
file ecat2slave.template
{
- pattern {PREFIX,DTYP,MOD_ID,SLAVE_IDX}
- {"LNS-ISRC-010:PBI-EM","ES4134","ES4134",3}
- {"LNS-ISRC-010:PBI-EM","EL4104","EL4104",2}
- {"LNS-ISRC-010:PBI-EM","ES3164","ES3164",1}
+ pattern {PREFIX,DTYP,MOD_ID,SLAVE_IDX,DEVICENAME}
+ {"LNS-ISRC-010:PBI-EM","ES4134","ES4134",3,""}
+ {"LNS-ISRC-010:PBI-EM","EL4104","EL4104",2,""}
+ {"LNS-ISRC-010:PBI-EM","ES3164","ES3164",1,""}
}
@@ -557,4 +549,3 @@ pattern {P, M, NAME, DESC, VARIABLE, SPORT}
{LNS-ISRC-010,PBI-EM,VER-BRAKE, "brake",M33,GEOBRICK_ASYN}
{LNS-ISRC-010,PBI-EM,CURRENT_ERR,"current to high", P93, GEOBRICK_ASYN}
}
-
diff --git a/opi/EMU.opi b/opi/EMU.opi
index 3eeabaaf608c8e79e2304a5d24d27afd871e088e..74c46fa2c2eab434ecac2d0869b84b8c8f2d1d11 100644
--- a/opi/EMU.opi
+++ b/opi/EMU.opi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<display typeId="org.csstudio.opibuilder.Display" version="1.0.0">
<show_close_button>true</show_close_button>
<rules />
@@ -3536,10 +3536,10 @@ $(pv_value)</tooltip>
<push_action_index>0</push_action_index>
<rules>
<rule name="Enable" prop_id="enabled" out_exp="false">
- <exp bool_exp="pv0==0 && pv1==0 && pv2==0 && pv3==0 && pv4==0 && pv5==0">
+ <exp bool_exp="pv0==0 && pv1==0 && pv2==0 && pv3==0 && pv4==0 && pv5==0 && pv6==0">
<value>true</value>
</exp>
- <exp bool_exp="pv0==1 || pv1==0 || pv2==0 || pv3==0 || pv4==0 || pv5==0">
+ <exp bool_exp="pv0==1 || pv1==0 || pv2==0 || pv3==0 || pv4==0 || pv5==0 ||pv6==0">
<value>false</value>
</exp>
<pv trig="true">${PREFIX_SCAN}:$(NAME_MTR).BUSY</pv>
@@ -3548,6 +3548,7 @@ $(pv_value)</tooltip>
<pv trig="true">INFN-SRC:INTK-HMI:FM3</pv>
<pv trig="true">INFN-SRC:INTK-HMI:FM4</pv>
<pv trig="true">INFN-SRC:INTK-HMI:FM5</pv>
+ <pv trig="true">${PREFIX_SCAN}:$(PROC)-AUTO-HOME</pv>
</rule>
</rules>
<enabled>true</enabled>
@@ -3557,7 +3558,7 @@ $(pv_value)</tooltip>
<scripts>
<path pathString="EmbeddedJs" checkConnect="true" sfe="false" seoe="false">
<scriptName>StartArchiving</scriptName>
- <scriptText><![CDATA[importPackage(Packages.org.csstudio.opibuilder.scriptUtil);
+ <scriptText><![CDATA[importPackage(Packages.org.csstudio.opibuilder.scriptUtil);
if(PVUtil.getDouble(pvs[0])==1){pvs[1].setValue(1);}]]></scriptText>
<pv trig="true">${PREFIX_SCAN}:$(NAME_MTR).EXSC</pv>
<pv trig="false">LNS-ISRC-010:PBI-EM:Archive</pv>