- IED server: always send LastApplError in operate resp- independent of the control model (LIB61850-472)

v1.6_develop_471
Michael Zillgith 10 months ago
parent e62e4e89a5
commit 931fda5d32

@ -2379,7 +2379,6 @@ Control_writeAccessControlObject(MmsMapping* self, MmsDomain* domain, const char
checkResult = controlObject->checkHandler((ControlAction) controlObject, checkResult = controlObject->checkHandler((ControlAction) controlObject,
controlObject->checkHandlerParameter, ctlVal, testCondition, interlockCheck); controlObject->checkHandlerParameter, ctlVal, testCondition, interlockCheck);
} }
if (checkResult == CONTROL_ACCEPTED) if (checkResult == CONTROL_ACCEPTED)
@ -2453,14 +2452,11 @@ Control_writeAccessControlObject(MmsMapping* self, MmsDomain* domain, const char
abortControlOperation(controlObject, false, SELECT_STATE_REASON_OPERATE_FAILED, self); abortControlOperation(controlObject, false, SELECT_STATE_REASON_OPERATE_FAILED, self);
if ((controlObject->ctlModel == 3) || (controlObject->ctlModel == 4))
{
ControlObject_sendLastApplError(controlObject, connection, "Oper", ControlObject_sendLastApplError(controlObject, connection, "Oper",
controlObject->errorValue, controlObject->addCauseValue, controlObject->errorValue, controlObject->addCauseValue,
ctlNum, origin, true); ctlNum, origin, true);
} }
} }
}
} }
else if (state == STATE_UNSELECTED) else if (state == STATE_UNSELECTED)

Loading…
Cancel
Save