From ffbd1f3f6a4d93a1416ecca4ceb53b579100e454 Mon Sep 17 00:00:00 2001 From: Michael Zillgith Date: Wed, 28 Jan 2015 15:20:55 +0100 Subject: [PATCH] - fixed bug in StaticModelGenerator.java --- src/iec61850/server/mms_mapping/control.c | 12 ++++++------ tools/model_generator/genmodel.jar | Bin 73829 -> 73830 bytes .../tools/StaticModelGenerator.java | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/iec61850/server/mms_mapping/control.c b/src/iec61850/server/mms_mapping/control.c index 227b2fcd..3b6e663e 100644 --- a/src/iec61850/server/mms_mapping/control.c +++ b/src/iec61850/server/mms_mapping/control.c @@ -44,7 +44,7 @@ #define STATE_UNSELECTED 0 #define STATE_READY 1 -#define STATE_WAIT_FOR_ACTICATION_TIME 2 +#define STATE_WAIT_FOR_ACTIVATION_TIME 2 #define STATE_PERFORM_TEST 3 #define STATE_WAIT_FOR_EXECUTION 4 #define STATE_OPERATE 5 @@ -345,13 +345,13 @@ executeStateMachine: switch (state) { - case STATE_WAIT_FOR_ACTICATION_TIME: + case STATE_WAIT_FOR_ACTIVATION_TIME: case STATE_WAIT_FOR_EXECUTION: { ControlHandlerResult dynamicCheckResult = CONTROL_RESULT_OK; bool isTimeActivatedControl = false; - if (state == STATE_WAIT_FOR_ACTICATION_TIME) + if (state == STATE_WAIT_FOR_ACTIVATION_TIME) isTimeActivatedControl = true; if (self->waitForExecutionHandler != NULL) { @@ -667,7 +667,7 @@ Control_processControlActions(MmsMapping* self, uint64_t currentTimeInMs) while (element != NULL) { ControlObject* controlObject = (ControlObject*) element->data; - if (controlObject->state == STATE_WAIT_FOR_ACTICATION_TIME) { + if (controlObject->state == STATE_WAIT_FOR_ACTIVATION_TIME) { if (controlObject->operateTime <= currentTimeInMs) { @@ -1395,7 +1395,7 @@ Control_writeAccessControlObject(MmsMapping* self, MmsDomain* domain, char* vari int state = getState(controlObject); - if (state == STATE_WAIT_FOR_ACTICATION_TIME) { + if (state == STATE_WAIT_FOR_ACTIVATION_TIME) { indication = DATA_ACCESS_ERROR_TEMPORARILY_UNAVAILABLE; ControlObject_sendLastApplError(controlObject, connection, "Oper", @@ -1452,7 +1452,7 @@ Control_writeAccessControlObject(MmsMapping* self, MmsDomain* domain, char* vari initiateControlTask(controlObject); - setState(controlObject, STATE_WAIT_FOR_ACTICATION_TIME); + setState(controlObject, STATE_WAIT_FOR_ACTIVATION_TIME); if (DEBUG_IED_SERVER) printf("Oper: activate time activated control\n"); diff --git a/tools/model_generator/genmodel.jar b/tools/model_generator/genmodel.jar index 182f0d55c15dbd9178b8150a01ec2fcba66cc628..4ad96abb02c4fd22b701b2df8028b60b51b52bd0 100644 GIT binary patch delta 4010 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 delta 3893 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 diff --git a/tools/model_generator/src/com/libiec61850/tools/StaticModelGenerator.java b/tools/model_generator/src/com/libiec61850/tools/StaticModelGenerator.java index 6a8c8efd..ba23d76d 100644 --- a/tools/model_generator/src/com/libiec61850/tools/StaticModelGenerator.java +++ b/tools/model_generator/src/com/libiec61850/tools/StaticModelGenerator.java @@ -827,7 +827,7 @@ public class StaticModelGenerator { sgcbString += sgcb.getActSG() + ", " + sgcb.getNumOfSGs() + ", 0, false, 0, 0, "; if (currentSGCBVariableNumber < (sgcbVariableNames.size() - 1)) - sgcbString += "&" + sgcbVariableNames.get(currentGseVariableNumber + 1); + sgcbString += "&" + sgcbVariableNames.get(currentSGCBVariableNumber + 1); else sgcbString += "NULL";