From ca9cff0c902e86dd23e57a9a46db2da7350ecfa4 Mon Sep 17 00:00:00 2001 From: Michael Zillgith Date: Thu, 4 Dec 2014 21:32:22 +0100 Subject: [PATCH] - fixed problem in data set creation for C# API --- dotnet/IEC61850forCSharp/IEC61850ClientAPI.cs | 6 ++-- dotnet/datasets/DataSetExample.cs | 25 +++++++++-------- dotnet/reporting/ReportingExample.cs | 3 +- tools/model_generator/genconfig.jar | Bin 73522 -> 73580 bytes .../libiec61850/scl/model/DataModelValue.java | 2 -- .../scl/types/EnumerationType.java | 26 ------------------ .../tools/DynamicModelGenerator.java | 6 ++-- 7 files changed, 21 insertions(+), 47 deletions(-) diff --git a/dotnet/IEC61850forCSharp/IEC61850ClientAPI.cs b/dotnet/IEC61850forCSharp/IEC61850ClientAPI.cs index 82f133a2..6056fcaa 100644 --- a/dotnet/IEC61850forCSharp/IEC61850ClientAPI.cs +++ b/dotnet/IEC61850forCSharp/IEC61850ClientAPI.cs @@ -127,10 +127,10 @@ namespace IEC61850 static extern void IedConnection_installConnectionClosedHandler (IntPtr self, InternalConnectionClosedHandler handler, IntPtr parameter); [DllImport("iec61850", CallingConvention = CallingConvention.Cdecl)] - static extern IntPtr IedConnection_readDataSetValues (IntPtr self, out int error, string dataSetReference, IntPtr dataSet); + static extern IntPtr IedConnection_readDataSetValues (IntPtr self, out int error, [MarshalAs(UnmanagedType.LPStr)] string dataSetReference, IntPtr dataSet); [DllImport("iec61850", CallingConvention = CallingConvention.Cdecl)] - static extern IntPtr IedConnection_createDataSet (IntPtr self, out int error, string dataSetReference, IntPtr dataSet); + static extern IntPtr IedConnection_createDataSet (IntPtr self, out int error, [MarshalAs(UnmanagedType.LPStr)] string dataSetReference, IntPtr dataSet); [DllImport("iec61850", CallingConvention = CallingConvention.Cdecl)] static extern void IedConnection_deleteDataSet (IntPtr self, out int error, string dataSetReference); @@ -861,7 +861,7 @@ namespace IEC61850 IntPtr linkedList = LinkedList_create (); foreach (string dataSetElement in dataSetElements) { - IntPtr handle = System.Runtime.InteropServices.Marshal.StringToHGlobalAuto (dataSetElement); + IntPtr handle = System.Runtime.InteropServices.Marshal.StringToHGlobalAnsi (dataSetElement); LinkedList_add (linkedList, handle); } diff --git a/dotnet/datasets/DataSetExample.cs b/dotnet/datasets/DataSetExample.cs index bd73cd54..f816c24c 100644 --- a/dotnet/datasets/DataSetExample.cs +++ b/dotnet/datasets/DataSetExample.cs @@ -12,12 +12,13 @@ namespace datasets { IedConnection con = new IedConnection (); - string hostname; - - if (args.Length > 0) - hostname = args[0]; - else - hostname = "localhost"; + string hostname; + + if (args.Length > 0) + hostname = args[0]; + else + hostname = "10.0.2.2"; + //hostname = "localhost"; Console.WriteLine("Connect to " + hostname); @@ -36,13 +37,13 @@ namespace datasets List dataSetElements = new List(); - dataSetElements.Add("IEDM1CPUBHKW/DRCS1.ModOnConn.stVal[ST]"); - dataSetElements.Add("IEDM1CPUBHKW/DRCS1.ModOnConn.t[ST]"); + dataSetElements.Add("simpleIOGenericIO/GGIO1.AnIn1.mag.f[MX]"); + dataSetElements.Add("simpleIOGenericIO/GGIO1.AnIn2.mag.f[MX]"); - con.CreateDataSet("IEDM1CPUBHKW/LLN0.ds1", dataSetElements); + con.CreateDataSet("simpleIOGenericIO/LLN0.ds1", dataSetElements); // get the directory of the data set - List dataSetDirectory = con.GetDataSetDirectory("IEDM1CPUBHKW/LLN0.ds1"); + List dataSetDirectory = con.GetDataSetDirectory("simpleIOGenericIO/LLN0.ds1"); foreach (string entry in dataSetDirectory) { @@ -50,7 +51,7 @@ namespace datasets } // read the values of the newly created data set - DataSet dataSet = con.ReadDataSetValues("IEDM1CPUBHKW/LLN0.ds1", null); + DataSet dataSet = con.ReadDataSetValues("simpleIOGenericIO/LLN0.ds1", null); MmsValue dataSetValues = dataSet.GetValues(); @@ -62,7 +63,7 @@ namespace datasets // delete the data set - con.DeleteDataSet("IEDM1CPUBHKW/LLN0.ds1"); + con.DeleteDataSet("simpleIOGenericIO/LLN0.ds1"); con.Abort(); } diff --git a/dotnet/reporting/ReportingExample.cs b/dotnet/reporting/ReportingExample.cs index dceb88bd..8f0c2000 100644 --- a/dotnet/reporting/ReportingExample.cs +++ b/dotnet/reporting/ReportingExample.cs @@ -45,7 +45,8 @@ namespace reporting if (args.Length > 0) hostname = args [0]; else - hostname = "localhost"; + //hostname = "localhost"; + hostname = "172.23.44.10"; Console.WriteLine ("Connect to " + hostname); diff --git a/tools/model_generator/genconfig.jar b/tools/model_generator/genconfig.jar index 6887d633c5a64f9f603de70a093a50d54cb79511..6b33f7477dee229d83f34e3ba0df4b13078ea12e 100644 GIT binary patch delta 12358 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 diff --git a/tools/model_generator/src/com/libiec61850/scl/model/DataModelValue.java b/tools/model_generator/src/com/libiec61850/scl/model/DataModelValue.java index a0f8c613..9434bc34 100644 --- a/tools/model_generator/src/com/libiec61850/scl/model/DataModelValue.java +++ b/tools/model_generator/src/com/libiec61850/scl/model/DataModelValue.java @@ -111,8 +111,6 @@ public class DataModelValue { public void updateEnumOrdValue(TypeDeclarations typeDecls) { if (enumType != null) { - - System.out.println("Lookup enum type " + enumType); SclType sclType = typeDecls.lookupType(enumType); diff --git a/tools/model_generator/src/com/libiec61850/scl/types/EnumerationType.java b/tools/model_generator/src/com/libiec61850/scl/types/EnumerationType.java index 06c55c07..eba43be5 100644 --- a/tools/model_generator/src/com/libiec61850/scl/types/EnumerationType.java +++ b/tools/model_generator/src/com/libiec61850/scl/types/EnumerationType.java @@ -46,32 +46,6 @@ public class EnumerationType extends SclType { static List getDefaultEnumTypes() { LinkedList defaultTypes = new LinkedList(); -// EnumerationType type = new EnumerationType("Tcmd"); -// type.addEnumValue(new EnumerationValue("stop", 0)); -// type.addEnumValue(new EnumerationValue("lower", 1)); -// type.addEnumValue(new EnumerationValue("higher", 2)); -// type.addEnumValue(new EnumerationValue("reserved", 3)); -// -// defaultTypes.add(type); - - /* - - intermediate-state - off - on - bad-state - - */ - -// type = new EnumerationType("Dbpos"); -// type.addEnumValue(new EnumerationValue("intermediate-state", 0)); -// type.addEnumValue(new EnumerationValue("intermediate", 0)); /* for compatibility with older SCL files */ -// type.addEnumValue(new EnumerationValue("off", 1)); -// type.addEnumValue(new EnumerationValue("on", 2)); -// type.addEnumValue(new EnumerationValue("bad-state", 3)); -// -// defaultTypes.add(type); - return defaultTypes; } diff --git a/tools/model_generator/src/com/libiec61850/tools/DynamicModelGenerator.java b/tools/model_generator/src/com/libiec61850/tools/DynamicModelGenerator.java index 900335cd..d2e65a56 100644 --- a/tools/model_generator/src/com/libiec61850/tools/DynamicModelGenerator.java +++ b/tools/model_generator/src/com/libiec61850/tools/DynamicModelGenerator.java @@ -287,9 +287,9 @@ public class DynamicModelGenerator { if (value == null) { value = dataAttribute.getDefinition().getValue(); -// if (value != null) -// if (value.getValue() == null) -// value.updateEnumOrdValue(ied.getTypeDeclarations()); + if (value != null) + if (value.getValue() == null) + value.updateEnumOrdValue(ied.getTypeDeclarations()); } if (value != null) {