stv0g/libiec61850
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

- IEC 61850 client: Changed result strings of IedConnection_getDataDirectoryByFC. Removed appended FC string.

Browse source
This commit is contained in:
Michael Zillgith 2017-08-19 11:24:00 +02:00
parent b1641b82ff
commit 291d21ef9e
5 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dotnet/IEC61850forCSharp/IEC61850ClientAPI.cs
View file

@ -823,7 +823,7 @@ namespace IEC61850
return QueryLogByTime (logRef, startTimeMs, stopTimeMs, out moreFollows);
}
/// <summary>Read the variable specification (type description of a DA or FDCO</summary>
/// <summary>Read the variable specification (type description of a DA or FCDO</summary>
/// <param name="objectReference">The object reference of a DA or FCDO.</param>
/// <param name="fc">The functional constraint (FC) of the object</param>
/// <exception cref="IedConnectionException">This exception is thrown if there is a connection or service error</exception>

2
dotnet/IEC61850forCSharp/IEC61850forCSharp.csproj
View file

@ -7,8 +7,6 @@
<OutputType>Library</OutputType>
<RootNamespace>iec61850dotnet</RootNamespace>
<AssemblyName>iec61850dotnet</AssemblyName>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>

2
examples/iec61850_client_example1/client_example1.c
View file

@ -50,6 +50,8 @@ int main(int argc, char** argv) {
if (error == IED_ERROR_OK) {
IedConnection_getServerDirectory(con, &error, false);
/* read an analog measurement value from server */
MmsValue* value = IedConnection_readObject(con, &error, "simpleIOGenericIO/GGIO1.AnIn1.mag.f", IEC61850_FC_MX);

8
src/iec61850/client/ied_connection.c
View file

@ -1981,13 +1981,9 @@ getDataDirectoryByFc(IedConnection self, IedClientError* error,
int elementNameLen = strlen(subElementName);
char* elementName = (char*) GLOBAL_MALLOC(elementNameLen + 5);
char* elementName = (char*) GLOBAL_MALLOC(elementNameLen + 1);
memcpy(elementName, subElementName, elementNameLen);
elementName[elementNameLen] = '[';
elementName[elementNameLen + 1] = *(fcPos + 1);
elementName[elementNameLen + 2] = *(fcPos + 2);
elementName[elementNameLen + 3] = ']';
elementName[elementNameLen + 4] = 0;
elementName[elementNameLen] = 0;
if (!addToStringSet(dataDirectory, elementName))
GLOBAL_FREEMEM(elementName);

6
src/iec61850/inc/iec61850_client.h
View file

@ -1740,8 +1740,10 @@ IedConnection_getDataDirectoryFC(IedConnection self, IedClientError* error, cons
* \brief returns the directory of the given data object/data attribute with the given FC
*
* Implementation of the GetDataDirectory ACSI service. This will return the list of
* C strings with all data attributes or sub data objects as elements. The returned
* strings will contain the functional constraint appended in square brackets when appropriate.
* C strings with all data attributes or sub data objects as elements.
*
* WARNING: Starting with version 1.0.3 the functional constraint will no longer be appended to
* the name string.
*
* \param self the connection object
* \param error the error code if an error occurs