Commit c71414d5 authored by Gino Tosti's avatar Gino Tosti
Browse files

added check on sampling times for all data types

parent 8c901232

templates/BaseJavaIDL.tmpl

+9 −9
Original line number Diff line number Diff line
@@ -262,8 +262,8 @@ public class ${Assembly}BaseImpl extends TCSHardwareDeviceImpl implements ${Asse 
#set $type=$x.GetSheet["OPC UA Data type"][$idx].upper()

		try {

			$x.GetSheet["Short name"][$idx] = baciH.createRO${y[$type][0]}Prop("$x.GetSheet["Short name"][$idx]","$x.GetSheet["OPC_UA node"][$idx]","INT16"); 

#if str($x.GetSheet["Alarm high"][$idx]) !="nan" and str($x.GetSheet["Alarm high"][$idx]).strip() !="NA" and str($x.GetSheet["Alarm high"][$idx]).strip() !="" and $y[$type][1] != "S"

#if str($x.GetSheet["Alarm high"][$idx]) !="nan" and str($x.GetSheet["Alarm high"][$idx]).strip() !="NA" and str($x.GetSheet["Alarm high"][$idx]).strip() !="" and $y[$type][1] != "S"

#if str($x.GetSheet["Alarm high"][$idx]) !="nan" and str($x.GetSheet["Alarm high"][$idx]).strip() !="NA" and str($x.GetSheet["Alarm high"][$idx]).strip() !="" and $y[$type][1] != "S" and $x.GetSheet["Sampling Interval (s)"][$idx].strip() !="" and $x.GetSheet["Sampling Interval (s)"][$idx].strip() !="NA" and $x.GetSheet["Sampling Interval (s)"][$idx].strip() !="nan"

#if str($x.GetSheet["Alarm high"][$idx]) !="nan" and str($x.GetSheet["Alarm high"][$idx]).strip() !="NA" and str($x.GetSheet["Alarm high"][$idx]).strip() !="" and $y[$type][1] != "S"  and $x.GetSheet["Sampling Interval (s)"][$idx].strip() !="" and $x.GetSheet["Sampling Interval (s)"][$idx].strip() !="NA" and $x.GetSheet["Sampling Interval (s)"][$idx].strip() !="nan"

			baciH.addValueListener("$x.GetSheet["Short name"][$idx]",$x.GetSheet["Sampling Interval (s)"][$idx],$x.GetSheet["Sampling Interval (s)"][$idx]);

  #end if

 #end if
@@ -274,8 +274,8 @@ public class ${Assembly}BaseImpl extends TCSHardwareDeviceImpl implements ${Asse 
#set $type=$x.GetSheet["OPC UA Data type"][$idx].upper()

		try {

			$x.GetSheet["Short name"][$idx] = baciH.createRO${y[$type][0]}Prop("$x.GetSheet["Short name"][$idx]","$x.GetSheet["OPC_UA node"][$idx]","UINT16");

#if str($x.GetSheet["Alarm high"][$idx]) !="nan" and str($x.GetSheet["Alarm high"][$idx]).strip() !="NA" and str($x.GetSheet["Alarm high"][$idx]).strip() !="" and $y[$type][1] != "S"

#if str($x.GetSheet["Alarm low"][$idx]) !="nan" and str($x.GetSheet["Alarm low"][$idx]).strip() !="NA" and str($x.GetSheet["Alarm low"][$idx]).strip() !="" and $y[$type][1] != "S"

#if str($x.GetSheet["Alarm high"][$idx]) !="nan" and str($x.GetSheet["Alarm high"][$idx]).strip() !="NA" and str($x.GetSheet["Alarm high"][$idx]).strip() !="" and $y[$type][1] != "S" and $x.GetSheet["Sampling Interval (s)"][$idx].strip() !="" and $x.GetSheet["Sampling Interval (s)"][$idx].strip() !="NA" and $x.GetSheet["Sampling Interval (s)"][$idx].strip() !="nan"

#if str($x.GetSheet["Alarm low"][$idx]) !="nan" and str($x.GetSheet["Alarm low"][$idx]).strip() !="NA" and str($x.GetSheet["Alarm low"][$idx]).strip() !="" and $y[$type][1] != "S" and $x.GetSheet["Sampling Interval (s)"][$idx].strip() !="" and $x.GetSheet["Sampling Interval (s)"][$idx].strip() !="NA" and $x.GetSheet["Sampling Interval (s)"][$idx].strip() !="nan"

			baciH.addValueListener("$x.GetSheet["Short name"][$idx]",$x.GetSheet["Sampling Interval (s)"][$idx],$x.GetSheet["Sampling Interval (s)"][$idx]);

  #end if

 #end if
@@ -286,8 +286,8 @@ public class ${Assembly}BaseImpl extends TCSHardwareDeviceImpl implements ${Asse 
#set $type=$x.GetSheet["OPC UA Data type"][$idx].upper()

		try {

			$x.GetSheet["Short name"][$idx] = baciH.createRO${y[$type][0]}Prop("$x.GetSheet["Short name"][$idx]","$x.GetSheet["OPC_UA node"][$idx]","UINT32");

#if str($x.GetSheet["Alarm high"][$idx]) !="nan" and str($x.GetSheet["Alarm high"][$idx]).strip() !="NA" and str($x.GetSheet["Alarm high"][$idx]).strip() !="" and $y[$type][1] != "S"

#if str($x.GetSheet["Alarm low"][$idx]) !="nan" and str($x.GetSheet["Alarm low"][$idx]).strip() !="NA" and str($x.GetSheet["Alarm low"][$idx]).strip() !="" and $y[$type][1] != "S"

#if str($x.GetSheet["Alarm high"][$idx]) !="nan" and str($x.GetSheet["Alarm high"][$idx]).strip() !="NA" and str($x.GetSheet["Alarm high"][$idx]).strip() !="" and $y[$type][1] != "S" and $x.GetSheet["Sampling Interval (s)"][$idx].strip() !="" and $x.GetSheet["Sampling Interval (s)"][$idx].strip() !="NA" and $x.GetSheet["Sampling Interval (s)"][$idx].strip() !="nan"

#if str($x.GetSheet["Alarm low"][$idx]) !="nan" and str($x.GetSheet["Alarm low"][$idx]).strip() !="NA" and str($x.GetSheet["Alarm low"][$idx]).strip() !="" and $y[$type][1] != "S" and $x.GetSheet["Sampling Interval (s)"][$idx].strip() !="" and $x.GetSheet["Sampling Interval (s)"][$idx].strip() !="NA" and $x.GetSheet["Sampling Interval (s)"][$idx].strip() !="nan"

			baciH.addValueListener("$x.GetSheet["Short name"][$idx]",$x.GetSheet["Sampling Interval (s)"][$idx],$x.GetSheet["Sampling Interval (s)"][$idx]);

  #end if

 #end if
@@ -298,8 +298,8 @@ public class ${Assembly}BaseImpl extends TCSHardwareDeviceImpl implements ${Asse 
#set $type=$x.GetSheet["OPC UA Data type"][$idx].upper()

		try {

			$x.GetSheet["Short name"][$idx] = baciH.createRO${y[$type][0]}Prop("$x.GetSheet["Short name"][$idx]","$x.GetSheet["OPC_UA node"][$idx]");

#if str($x.GetSheet["Alarm high"][$idx]) !="nan" and str($x.GetSheet["Alarm high"][$idx]).strip() !="NA" and str($x.GetSheet["Alarm high"][$idx]).strip() !="" and $y[$type][1] != "S"

#if str($x.GetSheet["Alarm low"][$idx]) !="nan" and str($x.GetSheet["Alarm low"][$idx]).strip() !="NA" and str($x.GetSheet["Alarm low"][$idx]).strip() !="" and $y[$type][1] != "S" and $x.GetSheet["Sampling Interval (s)"][$idx] !="" and $x.GetSheet["Sampling Interval (s)"][$idx] !="NA" and $x.GetSheet["Sampling Interval (s)"][$idx] !="nan"

#if str($x.GetSheet["Alarm high"][$idx]) !="nan" and str($x.GetSheet["Alarm high"][$idx]).strip() !="NA" and str($x.GetSheet["Alarm high"][$idx]).strip() !="" and $y[$type][1] != "S" and $x.GetSheet["Sampling Interval (s)"][$idx].strip() !="" and $x.GetSheet["Sampling Interval (s)"][$idx].strip() !="NA" and $x.GetSheet["Sampling Interval (s)"][$idx].strip() !="nan"

#if str($x.GetSheet["Alarm low"][$idx]) !="nan" and str($x.GetSheet["Alarm low"][$idx]).strip() !="NA" and str($x.GetSheet["Alarm low"][$idx]).strip() !="" and $y[$type][1] != "S" and $x.GetSheet["Sampling Interval (s)"][$idx].strip() !="" and $x.GetSheet["Sampling Interval (s)"][$idx].strip() !="NA" and $x.GetSheet["Sampling Interval (s)"][$idx].strip() !="nan"

			baciH.addValueListener("$x.GetSheet["Short name"][$idx]",$x.GetSheet["Sampling Interval (s)"][$idx],$x.GetSheet["Sampling Interval (s)"][$idx]);

  #end if

 #end if