RYTEC
/
libiec61850
mirror of https://github.com/mz-automation/libiec61850.git
6
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- C# wrapper: fixed bug in client readObject functions

Browse Source
pull/6/head
Michael Zillgith 9 years ago
parent a597762c11
commit da21bb2e76
3 changed files with 68 additions and 17 deletions
Show Stats Download Patch File Download Diff File

56
dotnet/IEC61850forCSharp/IEC61850ClientAPI.cs
Unescape Escape View File

@ -1,7 +1,7 @@
/*
* IEC61850ClientAPI.cs
*
* Copyright 2014 Michael Zillgith
* Copyright 2014-2016 Michael Zillgith
*
* This file is part of libIEC61850.
*
@ -266,6 +266,10 @@ namespace IEC61850
[DllImport ("iec61850", CallingConvention=CallingConvention.Cdecl)]
static extern void MmsValue_delete (IntPtr self);
[DllImport ("iec61850", CallingConvention=CallingConvention.Cdecl)]
static extern int MmsValue_getDataAccessError(IntPtr self);
/****************
* IedConnection
***************/
@ -838,7 +842,7 @@ namespace IEC61850
if (error != 0)
throw new IedConnectionException ("Reading value failed", error);
if (mmsValue.ToInt32 () == 0)
if (mmsValue == IntPtr.Zero)
throw new IedConnectionException ("Variable not found on server", error);
return mmsValue;
@ -856,6 +860,22 @@ namespace IEC61850
return new MmsValue (value, true);
}
private IntPtr readObjectInternalAndCheckDataAccessError(string objectReference, FunctionalConstraint fc)
{
IntPtr mmsValue = readObjectInternal (objectReference, fc);
if (MmsValue_getType(mmsValue) == (int) MmsType.MMS_DATA_ACCESS_ERROR) {
int dataAccessError = MmsValue_getDataAccessError (mmsValue);
MmsValue_delete (mmsValue);
throw new IedConnectionException ("Data access error", dataAccessError);
}
return mmsValue;
}
/// <summary>Read the value of a basic data attribute (BDA) of type boolean.</summary>
/// <param name="objectReference">The object reference of a BDA.</param>
/// <param name="fc">The functional constraint (FC) of the object</param>
@ -863,12 +883,18 @@ namespace IEC61850
/// <exception cref="IedConnectionException">This exception is thrown if there is a connection or service error</exception>
public bool ReadBooleanValue (string objectReference, FunctionalConstraint fc)
{
var mmsValue = ReadValue (objectReference, fc);
IntPtr mmsValue = readObjectInternalAndCheckDataAccessError (objectReference, fc);
if (mmsValue.GetType () == MmsType.MMS_BOOLEAN)
return mmsValue.GetBoolean ();
else
if (MmsValue_getType (mmsValue) != (int) MmsType.MMS_BOOLEAN) {
MmsValue_delete (mmsValue);
throw new IedConnectionException ("Result is not of type boolean (MMS_BOOLEAN)", 0);
}
bool value = MmsValue_getBoolean (mmsValue);
MmsValue_delete (mmsValue);
return value;
}
/// <summary>Read the value of a basic data attribute (BDA) of type float.</summary>
@ -877,10 +903,12 @@ namespace IEC61850
/// <exception cref="IedConnectionException">This exception is thrown if there is a connection or service error</exception>
public float ReadFloatValue (string objectReference, FunctionalConstraint fc)
{
IntPtr mmsValue = readObjectInternal (objectReference, fc);
IntPtr mmsValue = readObjectInternalAndCheckDataAccessError (objectReference, fc);
if (MmsValue_getType (mmsValue) != (int)MmsType.MMS_FLOAT)
throw new IedConnectionException ("Result is not of type float", 0);
if (MmsValue_getType (mmsValue) != (int)MmsType.MMS_FLOAT) {
MmsValue_delete (mmsValue);
throw new IedConnectionException ("Result is not of type float (MMS_FLOAT)", 0);
}
float value = MmsValue_toFloat (mmsValue);
@ -895,7 +923,7 @@ namespace IEC61850
/// <exception cref="IedConnectionException">This exception is thrown if there is a connection or service error</exception>
public string ReadStringValue (string objectReference, FunctionalConstraint fc)
{
IntPtr mmsValue = readObjectInternal (objectReference, fc);
IntPtr mmsValue = readObjectInternalAndCheckDataAccessError (objectReference, fc);
if (!((MmsValue_getType (mmsValue) == (int)MmsType.MMS_VISIBLE_STRING) || (MmsValue_getType (mmsValue) == (int)MmsType.MMS_STRING))) {
MmsValue_delete (mmsValue);
@ -917,7 +945,7 @@ namespace IEC61850
/// <exception cref="IedConnectionException">This exception is thrown if there is a connection or service error</exception>
public Quality ReadQualityValue (string objectReference, FunctionalConstraint fc)
{
IntPtr mmsValue = readObjectInternal (objectReference, fc);
IntPtr mmsValue = readObjectInternalAndCheckDataAccessError (objectReference, fc);
if (MmsValue_getType (mmsValue) == (int)MmsType.MMS_BIT_STRING) {
int bitStringValue = (int)MmsValue_getBitStringAsInteger (mmsValue);
@ -936,7 +964,7 @@ namespace IEC61850
/// <exception cref="IedConnectionException">This exception is thrown if there is a connection or service error</exception>
public int ReadBitStringValue (string objectReference, FunctionalConstraint fc)
{
IntPtr mmsValue = readObjectInternal (objectReference, fc);
IntPtr mmsValue = readObjectInternalAndCheckDataAccessError (objectReference, fc);
if (MmsValue_getType (mmsValue) == (int)MmsType.MMS_BIT_STRING) {
int bitStringValue = (int)MmsValue_getBitStringAsInteger (mmsValue);
@ -955,7 +983,7 @@ namespace IEC61850
/// <exception cref="IedConnectionException">This exception is thrown if there is a connection or service error</exception>
public UInt64 ReadTimestampValue (string objectReference, FunctionalConstraint fc)
{
var mmsValuePtr = readObjectInternal (objectReference, fc);
var mmsValuePtr = readObjectInternalAndCheckDataAccessError (objectReference, fc);
var mmsValue = new MmsValue (mmsValuePtr, true);
@ -973,7 +1001,7 @@ namespace IEC61850
/// <exception cref="IedConnectionException">This exception is thrown if there is a connection or service error</exception>
public Int64 ReadIntegerValue (string objectReference, FunctionalConstraint fc)
{
var mmsValuePtr = readObjectInternal (objectReference, fc);
var mmsValuePtr = readObjectInternalAndCheckDataAccessError (objectReference, fc);
var mmsValue = new MmsValue (mmsValuePtr, true);

1
dotnet/IEC61850forCSharp/MmsValue.cs
Unescape Escape View File

@ -175,7 +175,6 @@ namespace IEC61850
this.responsableForDeletion = false;
}
// TODO make internal
internal MmsValue (IntPtr value, bool responsableForDeletion)
{
valueReference = value;

24
dotnet/tests/Test.cs
Unescape Escape View File

@ -165,6 +165,30 @@ namespace tests
iedServer.Destroy ();
}
[Test ()]
public void ReadNonExistingObject()
{
IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("../../model.cfg");
IedServer iedServer = new IedServer (iedModel);
iedServer.Start (10002);
IedConnection connection = new IedConnection ();
connection.Connect ("localhost", 10002);
MmsValue value = connection.ReadValue ("simpleIOGenericIO/GGIO1.SPCSO1.stVal", FunctionalConstraint.MX);
Assert.IsNotNull (value);
Assert.AreEqual (MmsType.MMS_DATA_ACCESS_ERROR, value.GetType ());
iedServer.Stop ();
iedServer.Destroy ();
}
[Test ()]
public void AccessDataModelServerSide()
{

Write Preview
Loading…
Cancel
Save