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

- code format update (LIB61850-517)

Browse Source
v1.6
Michael Zillgith 1 month ago
parent 3b322de408
commit 4a37e625d7
1 changed files with 42 additions and 22 deletions
Show Stats Download Patch File Download Diff File

64
src/iec61850/client/client_control.c
Unescape Escape View File

@ -78,7 +78,8 @@ convertToMmsAndInsertFC(char* newItemId, const char* originalObjectName, const c
int srcIndex = 0; int srcIndex = 0;
int dstIndex = 0; int dstIndex = 0;
while (originalObjectName[srcIndex] != '.') { while (originalObjectName[srcIndex] != '.')
{
newItemId[dstIndex] = originalObjectName[srcIndex]; newItemId[dstIndex] = originalObjectName[srcIndex];
srcIndex++; srcIndex++;
dstIndex++; dstIndex++;
@ -90,7 +91,8 @@ convertToMmsAndInsertFC(char* newItemId, const char* originalObjectName, const c
newItemId[dstIndex++] = '$'; newItemId[dstIndex++] = '$';
srcIndex++; srcIndex++;
while (srcIndex < originalLength) { while (srcIndex < originalLength)
{
if (originalObjectName[srcIndex] == '.') if (originalObjectName[srcIndex] == '.')
newItemId[dstIndex] = '$'; newItemId[dstIndex] = '$';
else else
@ -124,7 +126,8 @@ ControlObjectClient_createEx(const char* objectReference, IedConnection connecti
MmsVariableSpecification* ctlVal = NULL; MmsVariableSpecification* ctlVal = NULL;
MmsVariableSpecification* t = NULL; MmsVariableSpecification* t = NULL;
if (MmsVariableSpecification_getType(controlObjectSpec) == MMS_STRUCTURE) { if (MmsVariableSpecification_getType(controlObjectSpec) == MMS_STRUCTURE)
{
MmsVariableSpecification* oper = MmsVariableSpecification_getNamedVariableRecursive(controlObjectSpec, "Oper"); MmsVariableSpecification* oper = MmsVariableSpecification_getNamedVariableRecursive(controlObjectSpec, "Oper");
if (oper) if (oper)
@ -136,7 +139,8 @@ ControlObjectClient_createEx(const char* objectReference, IedConnection connecti
if (ctlVal == NULL) if (ctlVal == NULL)
ctlVal = MmsVariableSpecification_getNamedVariableRecursive(oper, "setMag"); ctlVal = MmsVariableSpecification_getNamedVariableRecursive(oper, "setMag");
if (ctlVal) { if (ctlVal)
{
if (MmsVariableSpecification_getType(ctlVal) == MMS_STRUCTURE) if (MmsVariableSpecification_getType(ctlVal) == MMS_STRUCTURE)
isAPC = true; isAPC = true;
} }
@ -157,14 +161,16 @@ ControlObjectClient_createEx(const char* objectReference, IedConnection connecti
/* TODO Add additional checks dependent on control model */ /* TODO Add additional checks dependent on control model */
} }
if (hasOper == false) { if (hasOper == false)
{
if (DEBUG_IED_CLIENT) if (DEBUG_IED_CLIENT)
printf("IED_CLIENT: control is missing required element \"Oper\"\n"); printf("IED_CLIENT: control is missing required element \"Oper\"\n");
goto exit_function; goto exit_function;
} }
if ((ctlVal == NULL) || (t == NULL)) { if ((ctlVal == NULL) || (t == NULL))
{
if (DEBUG_IED_CLIENT) if (DEBUG_IED_CLIENT)
printf("IED_CLIENT: \"Oper\" is missing required element\n"); printf("IED_CLIENT: \"Oper\" is missing required element\n");
goto exit_function; goto exit_function;
@ -188,7 +194,8 @@ ControlObjectClient_createEx(const char* objectReference, IedConnection connecti
self->analogValue = NULL; self->analogValue = NULL;
/* Check for T element type (Binary time -> Ed.1,UTC time -> Ed.2) */ /* Check for T element type (Binary time -> Ed.1,UTC time -> Ed.2) */
if (t) { if (t)
{
if (MmsVariableSpecification_getType(t) == MMS_BINARY_TIME) if (MmsVariableSpecification_getType(t) == MMS_BINARY_TIME)
self->edition = 1; self->edition = 1;
else else
@ -224,7 +231,8 @@ ControlObjectClient_create(const char* objectReference, IedConnection connection
uint32_t ctlModel = IedConnection_readUnsigned32Value(connection, &error, reference, IEC61850_FC_CF); uint32_t ctlModel = IedConnection_readUnsigned32Value(connection, &error, reference, IEC61850_FC_CF);
if (error != IED_ERROR_OK) { if (error != IED_ERROR_OK)
{
if (DEBUG_IED_CLIENT) if (DEBUG_IED_CLIENT)
printf("IED_CLIENT: ControlObjectClient_create: failed to get %s from server\n", reference); printf("IED_CLIENT: ControlObjectClient_create: failed to get %s from server\n", reference);
@ -234,7 +242,8 @@ ControlObjectClient_create(const char* objectReference, IedConnection connection
MmsVariableSpecification* ctlVarSpec = MmsVariableSpecification* ctlVarSpec =
IedConnection_getVariableSpecification(connection, &error, objectReference, IEC61850_FC_CO); IedConnection_getVariableSpecification(connection, &error, objectReference, IEC61850_FC_CO);
if (error != IED_ERROR_OK) { if (error != IED_ERROR_OK)
{
if (DEBUG_IED_CLIENT) if (DEBUG_IED_CLIENT)
printf("IED_CLIENT: ControlObjectClient_create: failed to get data directory of control object\n"); printf("IED_CLIENT: ControlObjectClient_create: failed to get data directory of control object\n");
@ -353,7 +362,8 @@ createOriginValue(ControlObjectClient self)
MmsValue* orIdent; MmsValue* orIdent;
if (self->orIdent != NULL) { if (self->orIdent)
{
int octetStringLen = strlen(self->orIdent); int octetStringLen = strlen(self->orIdent);
orIdent = MmsValue_newOctetString(0, octetStringLen); orIdent = MmsValue_newOctetString(0, octetStringLen);
@ -398,8 +408,10 @@ prepareOperParameters(ControlObjectClient self, MmsValue* ctlVal, uint64_t operT
operParameters = MmsValue_createEmptyStructure(operElementCount); operParameters = MmsValue_createEmptyStructure(operElementCount);
/* support simplified usage of APC controls - user doesn't need to create the structure */ /* support simplified usage of APC controls - user doesn't need to create the structure */
if (self->analogValue != NULL) { if (self->analogValue != NULL)
if (MmsValue_getType(ctlVal) != MMS_STRUCTURE) { {
if (MmsValue_getType(ctlVal) != MMS_STRUCTURE)
{
MmsValue_setElement(self->analogValue, 0, ctlVal); MmsValue_setElement(self->analogValue, 0, ctlVal);
ctlVal = self->analogValue; ctlVal = self->analogValue;
} }
@ -409,7 +421,8 @@ prepareOperParameters(ControlObjectClient self, MmsValue* ctlVal, uint64_t operT
int index = 1; int index = 1;
if (self->hasTimeActivatedMode) { if (self->hasTimeActivatedMode)
{
MmsValue* operTm = MmsValue_newUtcTimeByMsTime(operTime); MmsValue* operTm = MmsValue_newUtcTimeByMsTime(operTime);
MmsValue_setElement(operParameters, index++, operTm); MmsValue_setElement(operParameters, index++, operTm);
} }
@ -423,7 +436,8 @@ prepareOperParameters(ControlObjectClient self, MmsValue* ctlVal, uint64_t operT
self->ctlNum++; self->ctlNum++;
} }
if (self->hasCtlNum) { if (self->hasCtlNum)
{
MmsValue* ctlNum = MmsValue_newUnsignedFromUint32(self->ctlNum); MmsValue* ctlNum = MmsValue_newUnsignedFromUint32(self->ctlNum);
MmsValue_setElement(operParameters, index++, ctlNum); MmsValue_setElement(operParameters, index++, ctlNum);
} }
@ -440,13 +454,15 @@ prepareOperParameters(ControlObjectClient self, MmsValue* ctlVal, uint64_t operT
MmsValue* ctlTime; MmsValue* ctlTime;
if (self->edition == 2) { if (self->edition == 2)
{
ctlTime = MmsValue_newUtcTimeByMsTime(timestamp); ctlTime = MmsValue_newUtcTimeByMsTime(timestamp);
if (self->connection) if (self->connection)
MmsValue_setUtcTimeQuality(ctlTime, self->connection->timeQuality); MmsValue_setUtcTimeQuality(ctlTime, self->connection->timeQuality);
} }
else { else
{
ctlTime = MmsValue_newBinaryTime(false); ctlTime = MmsValue_newBinaryTime(false);
MmsValue_setBinaryTime(ctlTime, timestamp); MmsValue_setBinaryTime(ctlTime, timestamp);
} }
@ -481,7 +497,8 @@ ControlObjectClient_operate(ControlObjectClient self, MmsValue* ctlVal, uint64_t
{ {
bool success = false; bool success = false;
if (ctlVal == NULL) { if (ctlVal == NULL)
{
if (DEBUG_IED_CLIENT) if (DEBUG_IED_CLIENT)
printf("IED_CLIENT: operate - (ctlVal == NULL)!\n"); printf("IED_CLIENT: operate - (ctlVal == NULL)!\n");
@ -513,7 +530,8 @@ ControlObjectClient_operate(ControlObjectClient self, MmsValue* ctlVal, uint64_t
self->lastMmsError = mmsError; self->lastMmsError = mmsError;
self->lastAccessError = writeResult; self->lastAccessError = writeResult;
if (mmsError != MMS_ERROR_NONE) { if (mmsError != MMS_ERROR_NONE)
{
if (DEBUG_IED_CLIENT) if (DEBUG_IED_CLIENT)
printf("IED_CLIENT: operate failed!\n"); printf("IED_CLIENT: operate failed!\n");
@ -541,8 +559,8 @@ internalOperateHandler(uint32_t invokeId, void* parameter, MmsError err, MmsData
IedConnectionOutstandingCall call = iedConnection_lookupOutstandingCall(self->connection, invokeId); IedConnectionOutstandingCall call = iedConnection_lookupOutstandingCall(self->connection, invokeId);
if (call) { if (call)
{
ControlObjectClient_ControlActionHandler handler = (ControlObjectClient_ControlActionHandler) call->callback; ControlObjectClient_ControlActionHandler handler = (ControlObjectClient_ControlActionHandler) call->callback;
IedClientError iedError = iedConnection_mapMmsErrorToIedError(err); IedClientError iedError = iedConnection_mapMmsErrorToIedError(err);
@ -552,7 +570,8 @@ internalOperateHandler(uint32_t invokeId, void* parameter, MmsError err, MmsData
self->lastMmsError = err; self->lastMmsError = err;
self->lastAccessError = accessError; self->lastAccessError = accessError;
if (iedError == IED_ERROR_OK) { if (iedError == IED_ERROR_OK)
{
iedError = iedConnection_mapDataAccessErrorToIedError(accessError); iedError = iedConnection_mapDataAccessErrorToIedError(accessError);
if (iedError == IED_ERROR_OK) if (iedError == IED_ERROR_OK)
@ -563,7 +582,8 @@ internalOperateHandler(uint32_t invokeId, void* parameter, MmsError err, MmsData
iedConnection_releaseOutstandingCall(self->connection, call); iedConnection_releaseOutstandingCall(self->connection, call);
} }
else { else
{
if (DEBUG_IED_CLIENT) if (DEBUG_IED_CLIENT)
printf("IED_CLIENT: internal error - no matching outstanding call (ID: %u)!\n", invokeId); printf("IED_CLIENT: internal error - no matching outstanding call (ID: %u)!\n", invokeId);
} }

Write Preview
Loading…
Cancel
Save