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

Added INT16/UINT32 support

parent fd598c2d

templates/BaseJavaIDL.tmpl

+14 −6
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ public class ${Assembly}BaseImpl extends TCSHardwareDeviceImpl implements ${Asse 
#else if ($x.GetSheet["OPC UA Data type"][$idx]).upper()=='INT16'

#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]");

			$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"

			baciH.addValueListener("$x.GetSheet["Short name"][$idx]",$x.GetSheet["Sampling Interval (s)"][$idx],$x.GetSheet["Sampling Interval (s)"][$idx]);
@@ -272,7 +272,7 @@ public class ${Assembly}BaseImpl extends TCSHardwareDeviceImpl implements ${Asse 
#else if ($x.GetSheet["OPC UA Data type"][$idx]).upper()=='UINT16'

#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]");

			$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"

			baciH.addValueListener("$x.GetSheet["Short name"][$idx]",$x.GetSheet["Sampling Interval (s)"][$idx],$x.GetSheet["Sampling Interval (s)"][$idx]);
@@ -284,7 +284,7 @@ public class ${Assembly}BaseImpl extends TCSHardwareDeviceImpl implements ${Asse 
#else if ($x.GetSheet["OPC UA Data type"][$idx]).upper()=='UINT32'

#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]");

			$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"

			baciH.addValueListener("$x.GetSheet["Short name"][$idx]",$x.GetSheet["Sampling Interval (s)"][$idx],$x.GetSheet["Sampling Interval (s)"][$idx]);
@@ -319,21 +319,21 @@ public class ${Assembly}BaseImpl extends TCSHardwareDeviceImpl implements ${Asse 
#else if ($x.SetSheet["OPC UA Data type"][$idx]).upper()=='INT16'

#set $type=$x.SetSheet["OPC UA Data type"][$idx].upper()

		try{

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

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

		} catch (IllegalArgumentException|PropertyInitializationFailed e){

			m_logger.log(Level.SEVERE, "Exception in creating Property:"+"$x.SetSheet["Short name"][$idx]"+":"+e.getMessage());

		}

#else if ($x.SetSheet["OPC UA Data type"][$idx]).upper()=='UINT16'

#set $type=$x.SetSheet["OPC UA Data type"][$idx].upper()

		try{

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

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

		} catch (IllegalArgumentException|PropertyInitializationFailed e){

			m_logger.log(Level.SEVERE, "Exception in creating Property:"+"$x.SetSheet["Short name"][$idx]"+":"+e.getMessage());

		}

#else if ($x.SetSheet["OPC UA Data type"][$idx]).upper()=='UINT32'

#set $type=$x.SetSheet["OPC UA Data type"][$idx].upper()

		try{		

			$x.SetSheet["Short name"][$idx] = baci.HcreateRW${y[$type][0]}Prop("$x.SetSheet["Short name"][$idx]","$x.SetSheet["OPC_UA node"][$idx]");

			$x.SetSheet["Short name"][$idx] = baci.HcreateRW${y[$type][0]}Prop("$x.SetSheet["Short name"][$idx]","$x.SetSheet["OPC_UA node"][$idx]","UINT32);

		} catch (IllegalArgumentException|PropertyInitializationFailed e){

			m_logger.log(Level.SEVERE, "Exception in creating Property:"+"$x.SetSheet["Short name"][$idx]"+":"+e.getMessage());

		}
@@ -352,6 +352,10 @@ public class ${Assembly}BaseImpl extends TCSHardwareDeviceImpl implements ${Asse 
		try{

#if ($x.ModeSheet["OPC UA Data type"][$idx]).upper()=='INT16'

			$name = baciH.createRW${y[$x.ModeSheet["OPC UA Data type"][$idx].upper()][0]}Prop("$name","$x.ModeSheet["OPC_UA node"][$idx]","INT16");	

#else if ($x.ModeSheet["OPC UA Data type"][$idx]).upper()=='UINT16'

			$name = baciH.createRW${y[$x.ModeSheet["OPC UA Data type"][$idx].upper()][0]}Prop("$name","$x.ModeSheet["OPC_UA node"][$idx]","UINT16");	

#else if ($x.ModeSheet["OPC UA Data type"][$idx]).upper()=='UINT32'

			$name = baciH.createRW${y[$x.ModeSheet["OPC UA Data type"][$idx].upper()][0]}Prop("$name","$x.ModeSheet["OPC_UA node"][$idx]","UINT32");	

#else 

			$name = baciH.createRW${y[$x.ModeSheet["OPC UA Data type"][$idx].upper()][0]}Prop("$name","$x.ModeSheet["OPC_UA node"][$idx]");

#end if
@@ -367,6 +371,10 @@ public class ${Assembly}BaseImpl extends TCSHardwareDeviceImpl implements ${Asse 
		try{

#if ($x.CmdSheet["OPC UA Data type"][$idx]).upper()=='INT16'

			$name = baciH.createRW${y[$x.ModeSheet["OPC UA Data type"][$idx].upper()][0]}Prop("$name","$x.ModeSheet["OPC_UA node"][$idx]","INT16");

#else if ($x.CmdSheet["OPC UA Data type"][$idx]).upper()=='UINT16'

			$name = baciH.createRW${y[$x.ModeSheet["OPC UA Data type"][$idx].upper()][0]}Prop("$name","$x.ModeSheet["OPC_UA node"][$idx]","UINT16");

#else if ($x.CmdSheet["OPC UA Data type"][$idx]).upper()=='UINT32'

			$name = baciH.createRW${y[$x.ModeSheet["OPC UA Data type"][$idx].upper()][0]}Prop("$name","$x.ModeSheet["OPC_UA node"][$idx]","UINT32");

#else

			$name = baciH.createRW${y[$x.CmdSheet["OPC UA Data type"][$idx].upper()][0]}Prop("$name", "$x.CmdSheet["OPC_UA node"][$idx]");

#end if

test/checkIcdduplicated.py

0 → 100644
+34 −0
Original line number Diff line number Diff line 
from datetime import date

import sys,os

from optparse import OptionParser

import pandas as pd

from GenDevice.excelIcd import excelIcd

from IPython import embed

# Read the ICD excel file



def printColHea(sheet):

	print("Columns idx, name")

	for i,col in enumerate(sheet.columns):

		print(i,"  :",col) 

	

if __name__=="__main__":

	usage = "usage: %prog [options] arg"

	parser = OptionParser()

	today = date.today()

	parser.add_option("-f", "--file", dest="book_file",

                  help="ICD Exel File ", metavar="FILE")

	parser.add_option("-s", "--sheet", dest="sheet", default='Main',

                  help="ICD Exel File Sheet Name to show", metavar="SHEET")



	(options, args) = parser.parse_args()

	gen_dir=os.environ["PYGEN"]

	excel_file =options.book_file

	

	wb=excelIcd(excel_file)

	sheet=wb.sheets[options.sheet]

	printColHea(sheet)

	print(sheet.duplicated())

	embed()