fix tests

tests/results/dlsPLC_fastValve.template

@@ -132,6 +132,8 @@ substitute "_ilk12=$(ilk12=unused)"
 substitute "_ilk13=$(ilk13=unused)"
 substitute "_ilk14=$(ilk14=unused)"
 substitute "_ilk15=$(ilk15=unused)"
+substitute "_vlvcc=$(vlvcc)"
+substitute "_device=$(device)"
 
 include "dlsPLC_valveIlk.template"
 
@@ -153,8 +155,8 @@ record(bi, "$(device):MODE") {
 
 # #########################################################################
 # Which interlocks to show on gui
-# 
-record(bi, "$(device):SHOWILK") 
+#
+record(bi, "$(device):SHOWILK")
   {
   field(DESC, "Which interlocks to display")
   field(DTYP, "Soft Channel")

tests/results/dlsPLC_feFastValve.template

@@ -112,6 +112,8 @@ substitute "_ilk12=$(ilk12=unused)"
 substitute "_ilk13=$(ilk13=unused)"
 substitute "_ilk14=$(ilk14=unused)"
 substitute "_ilk15=$(ilk15=unused)"
+substitute "_vlvcc=$(vlvcc)"
+substitute "_device=$(device)"
 
 include "dlsPLC_valveIlk.template"
 
@@ -133,8 +135,8 @@ record(bi, "$(device):MODE") {
 
 # #########################################################################
 # Which interlocks to show on gui
-# 
-record(bi, "$(device):SHOWILK") 
+#
+record(bi, "$(device):SHOWILK")
   {
   field(DESC, "Which interlocks to display")
   field(DTYP, "Soft Channel")
@@ -146,23 +148,23 @@ record(bi, "$(device):SHOWILK")
 
 # #########################################################################
 # How many interlocks for Full and Partial Arm
-# 
-record(ai, "$(device):FARMBITS") 
+#
+record(ai, "$(device):FARMBITS")
   {
   field(DESC, "Number of Full Arm interlocks")
   field(DTYP, "Soft Channel")
   field(PINI, "YES")
   field(INP, "$(farmbits=16)")
   }
-record(ai, "$(device):PARMBITS") 
+record(ai, "$(device):PARMBITS")
   {
   field(DESC, "Number of Partial Arm interlocks")
   field(DTYP, "Soft Channel")
   field(PINI, "YES")
   field(INP, "$(parmbits=16)")
   }
 
-  
+
 # #########################################################################
 # Override :DONECALC in dlsPLC_valveCtrl.template
 # as fe fast valve does not follow standard valve CON/LASTCON/STA pattern.
@@ -171,12 +173,12 @@ record(ai, "$(device):PARMBITS")
 # continue.
 #
 # IJG: 9th Dec. 2013
-# 
-#record(calcout, "$(device):DONECALC") 
+#
+#record(calcout, "$(device):DONECALC")
 #    {
 #    field(CALC, "1=1?0:1")
 #    }
-  
+
 
 
 

tests/results/dlsPLC_genericDevice.template

@@ -93,6 +93,8 @@ substitute "_ilk12=$(ilk12=unused)"
 substitute "_ilk13=$(ilk13=unused)"
 substitute "_ilk14=$(ilk14=unused)"
 substitute "_ilk15=$(ilk15=unused)"
+substitute "_vlvcc=$(vlvcc)"
+substitute "_device=$(device)"
 
 include "dlsPLC_valveIlk.template"
 

tests/results/dlsPLC_interlock.template

@@ -58,8 +58,8 @@ record(stringout, "$(device)$(interlock):NAME") {
   field(VAL, "$(desc)")
 }
 
-substitute "_device=$(device)$(interlock)"
-substitute "_vlvcc=$(device)"
+substitute "_device=$(device)"
+substitute "_vlvcc=$(vlvcc)"
 substitute "_typeprefix=:"
 substitute "_DIR=$(EMPTY=)"
 substitute "_ILK=6"

tests/results/dlsPLC_leakValve.template

@@ -69,7 +69,7 @@
 # % gui, $(name=), edmembed, vacuumValve-embed.edl, device=$(device),box-label=$(desc=$(device))
 
 # This tells the gui that we don't have debounce records
-record(ai, "$(device):HASDEBOUNCE") 
+record(ai, "$(device):HASDEBOUNCE")
     {
     field(VAL, "0")
     field(PINI, "YES")
@@ -115,6 +115,8 @@ substitute "_ilk12=$(ilk12=unused)"
 substitute "_ilk13=$(ilk13=unused)"
 substitute "_ilk14=$(ilk14=unused)"
 substitute "_ilk15=$(ilk15=unused)"
+substitute "_vlvcc=$(vlvcc)"
+substitute "_device=$(device)"
 
 include "dlsPLC_valveIlk.template"
 
@@ -141,15 +143,15 @@ record(stringin, "$(device):PAIREDIMG")
     field(VAL,"$(img)")
     }
 
-record(ai, "$(device):CURRENTP") 
+record(ai, "$(device):CURRENTP")
     {
     field(DTYP, "Soft Channel")
     field(INP, "$(img):P CP MS")
     }
 
 # NB: the OUT field is generated by :TARGETPOUT (below)
 # at run time.
-record(ao, "$(device):SETTARGETP") 
+record(ao, "$(device):SETTARGETP")
     {
     field(DTYP, "asynFloat64")
     field(OUT, "@asyn($(port), $(addr_decade)4, $(timeout=0)) FINS_DM_WRITE_32")
@@ -163,18 +165,18 @@ record(ao, "$(device):SETTARGETP")
 
 # ############################################################################
 # Target Pressure
-# 
+#
 # % archiver 10 Monitor
 # % controldesk Target Pressure readback
-record(ai, "$(device):TARGETP") 
+record(ai, "$(device):TARGETP")
   {
   field(DESC, "Target Pressure")
   field(DTYP, "Soft Channel")
   field(PREC, "$(prec=1)")
   field(INP,  "$(device):GETTARGETP.VAL MS")
   }
 
-record(subArray, "$(device):GETTARGETP") 
+record(subArray, "$(device):GETTARGETP")
   {
   field(DESC, "Get Target Pressure")
   field(DTYP, "Soft Channel")
@@ -183,16 +185,16 @@ record(subArray, "$(device):GETTARGETP")
   field(MALM, "100")
   }
 
-# Target Pressure is in DM$(addr)+4. Calc the index into the 
+# Target Pressure is in DM$(addr)+4. Calc the index into the
 # century record
-record(calcout, "$(device):TARGETPINDX") 
+record(calcout, "$(device):TARGETPINDX")
   {
   field(CALC, "$(addr_decade)%10+4")
   field(OUT, "$(device):GETTARGETP.INDX PP")
   field(PINI, "YES")
   }
 
-# TARGETP is in DM$(addr)+4. Calc the inp link to the 
+# TARGETP is in DM$(addr)+4. Calc the inp link to the
 # century record. Needs to be done after PINI, so note
 # the flnk
 record(scalcout, "$(device):TARGETPINP")
@@ -205,7 +207,7 @@ record(scalcout, "$(device):TARGETPINP")
   }
 
 # Disable the scalcout record so we don't keep writing values
-record(ao, "$(device):TARGETPINPDIS") 
+record(ao, "$(device):TARGETPINPDIS")
   {
   field(VAL, "1")
   field(OUT, "$(device):TARGETPINP.DISA")

tests/results/dlsPLC_mpsPermit.template

@@ -34,6 +34,8 @@ substitute "_ilk12=$(ilk12=unused)"
 substitute "_ilk13=$(ilk13=unused)"
 substitute "_ilk14=$(ilk14=unused)"
 substitute "_ilk15=$(ilk15=unused)"
+substitute "_vlvcc=$(vlvcc)"
+substitute "_device=$(device)"
 
 include "dlsPLC_valveIlk.template"
 
@@ -86,7 +88,7 @@ record(bi, "$(device):MODE")
     field(ONAM, "Service")
 }
 
-record(subArray, "$(device):GETSTA") 
+record(subArray, "$(device):GETSTA")
 {
   field(DESC, "Get status")
   field(DTYP, "Soft Channel")
@@ -95,19 +97,19 @@ record(subArray, "$(device):GETSTA")
   field(MALM, "100")
 }
 
-# STA is in DM$(addr)+2. Calc the index into the 
+# STA is in DM$(addr)+2. Calc the index into the
 # century record
-record(calcout, "$(device):STAINDX") 
+record(calcout, "$(device):STAINDX")
 {
   field(CALC, "$(addr)%100+2")
   field(OUT, "$(device):GETSTA.INDX PP")
   field(PINI, "YES")
 }
 
-# STA is in DM$(addr)+3. Calc the inp link to the 
+# STA is in DM$(addr)+3. Calc the inp link to the
 # century record. Needs to be done after PINI, so note
 # the flnk
-record(scalcout, "$(device):STAINP") 
+record(scalcout, "$(device):STAINP")
 {
   field(CALC, "PRINTF(AA,FLOOR($(addr)/100))")
   field(AA, "$(vlvcc):DM%dXX CP MS")
@@ -117,14 +119,14 @@ record(scalcout, "$(device):STAINP")
 }
 
 # Disable the scalcout record so we don't keep writing values
-record(ao, "$(device):STAINPDIS") 
+record(ao, "$(device):STAINPDIS")
 {
   field(VAL, "1")
   field(OUT, "$(device):STAINP.DISA")
 }
 
 
-record(subArray, "$(device):GETMODSTA") 
+record(subArray, "$(device):GETMODSTA")
 {
   field(DESC, "Get mode")
   field(DTYP, "Soft Channel")
@@ -133,19 +135,19 @@ record(subArray, "$(device):GETMODSTA")
   field(MALM, "100")
 }
 
-# STA is in DM$(addr)+5. Calc the index into the 
+# STA is in DM$(addr)+5. Calc the index into the
 # century record
-record(calcout, "$(device):MODSTAINDX") 
+record(calcout, "$(device):MODSTAINDX")
 {
   field(CALC, "$(addr)%100+5")
   field(OUT, "$(device):GETMODSTA.INDX PP")
   field(PINI, "YES")
 }
 
-# STA is in DM$(addr)+5. Calc the inp link to the 
+# STA is in DM$(addr)+5. Calc the inp link to the
 # century record. Needs to be done after PINI, so note
 # the flnk
-record(scalcout, "$(device):MODSTAINP") 
+record(scalcout, "$(device):MODSTAINP")
 {
   field(CALC, "PRINTF(AA,FLOOR($(addr)/100))")
   field(AA, "$(vlvcc):DM%dXX CP MS")
@@ -155,7 +157,7 @@ record(scalcout, "$(device):MODSTAINP")
 }
 
 # Disable the scalcout record so we don't keep writing values
-record(ao, "$(device):MODSTAINPDIS") 
+record(ao, "$(device):MODSTAINPDIS")
 {
   field(VAL, "1")
   field(OUT, "$(device):MODSTAINP.DISA")

tests/results/dlsPLC_vacPump.template

@@ -101,6 +101,8 @@ substitute "_ilk12=$(ilk12=unused)"
 substitute "_ilk13=$(ilk13=unused)"
 substitute "_ilk14=$(ilk14=unused)"
 substitute "_ilk15=$(ilk15=unused)"
+substitute "_vlvcc=$(vlvcc)"
+substitute "_device=$(device)"
 
 include "dlsPLC_valveIlk.template"
 

tests/results/dlsPLC_vacValve.template

@@ -119,6 +119,8 @@ substitute "_ilk12=$(ilk12=unused)"
 substitute "_ilk13=$(ilk13=unused)"
 substitute "_ilk14=$(ilk14=unused)"
 substitute "_ilk15=$(ilk15=unused)"
+substitute "_vlvcc=$(vlvcc)"
+substitute "_device=$(device)"
 
 include "dlsPLC_valveIlk.template"
 

tests/results/dlsPLC_vacValveBistable.template

@@ -130,12 +130,12 @@ record(mbbi, "$(device):STA") {
   field(SXVL, "6")
   field(NOBT, "3")
   field(SHFT, "4")
-  field(INP, "$(device):GETLASTCON.VAL CP MS")  
+  field(INP, "$(device):GETLASTCON.VAL CP MS")
 }
 
 # ###################################################################
 # Open Interlock Status
-# 
+#
 # % archiver 10 Monitor
 # % controldesk Open Interlock Status smon
 record(mbbi, "$(device):OPENILKSTA") {
@@ -149,12 +149,12 @@ record(mbbi, "$(device):OPENILKSTA") {
   field(ONSV, "NO_ALARM")
   field(NOBT, "1")
   field(SHFT, "2")
-  field(INP, "$(device):GETLASTCON.VAL CP MS")  
+  field(INP, "$(device):GETLASTCON.VAL CP MS")
 }
 
 # ###################################################################
 # Close Interlock Status
-# 
+#
 # % archiver 10 Monitor
 # % controldesk Close Interlock Status smon
 record(mbbi, "$(device):CLOSEILKSTA") {
@@ -168,7 +168,7 @@ record(mbbi, "$(device):CLOSEILKSTA") {
   field(ONSV, "NO_ALARM")
   field(NOBT, "1")
   field(SHFT, "3")
-  field(INP, "$(device):GETLASTCON.VAL CP MS")  
+  field(INP, "$(device):GETLASTCON.VAL CP MS")
 }
 
 # Override GETOPS to get data from $(addr)+2 instead of $(addr)+4
@@ -181,7 +181,7 @@ record(mbbiDirect, "$(device):MODSTA") {
   field(DTYP, "Raw Soft Channel")
   field(NOBT, "1")
   field(SHFT, "7")
-  field(INP, "$(device):GETLASTCON.VAL CP MS")    
+  field(INP, "$(device):GETLASTCON.VAL CP MS")
 }
 
 substitute "_DIR=OPEN"
@@ -205,6 +205,8 @@ substitute "_ilk12=$(ilk12=unused)"
 substitute "_ilk13=$(ilk13=unused)"
 substitute "_ilk14=$(ilk14=unused)"
 substitute "_ilk15=$(ilk15=unused)"
+substitute "_vlvcc=$(vlvcc)"
+substitute "_device=$(device)"
 
 include "dlsPLC_valveIlk.template"
 
@@ -230,6 +232,8 @@ substitute "_ilk12=$(cilk12=unused)"
 substitute "_ilk13=$(cilk13=unused)"
 substitute "_ilk14=$(cilk14=unused)"
 substitute "_ilk15=$(cilk15=unused)"
+substitute "_vlvcc=$(vlvcc)"
+substitute "_device=$(device)"
 
 include "dlsPLC_valveIlk.template"