- small code cleanup

pull/6/head
Michael Zillgith 10 years ago
parent c730c93229
commit eab59b8ae8

@ -174,7 +174,7 @@
#define CONFIG_MMS_MAX_NUMBER_OF_VMD_SPECIFIC_DATA_SETS 10 #define CONFIG_MMS_MAX_NUMBER_OF_VMD_SPECIFIC_DATA_SETS 10
/* Maximum number of the members in a data set (named variable list) */ /* Maximum number of the members in a data set (named variable list) */
#define CONFIG_MMS_MAX_NUMBER_OF_DATA_SET_MEMBERS 50 #define CONFIG_MMS_MAX_NUMBER_OF_DATA_SET_MEMBERS 100
/* Definition of supported services */ /* Definition of supported services */
#define MMS_DEFAULT_PROFILE 1 #define MMS_DEFAULT_PROFILE 1

@ -110,6 +110,8 @@ int main(int argc, char** argv) {
IedServer_lockDataModel(iedServer); IedServer_lockDataModel(iedServer);
for (i = 0; i < 16; i++) { for (i = 0; i < 16; i++) {
updateCMVArrayElement(mhai1_ha_phsAHar_mx, i, mag, angle, quality, timestamp); updateCMVArrayElement(mhai1_ha_phsAHar_mx, i, mag, angle, quality, timestamp);
mag += 0.1f;
angle += 0.05f;
} }
IedServer_unlockDataModel(iedServer); IedServer_unlockDataModel(iedServer);

@ -103,7 +103,7 @@ void
ReportControl_destroy(ReportControl* self); ReportControl_destroy(ReportControl* self);
void void
ReportControl_valueUpdated(ReportControl* self, int dataSetEntryIndex, ReportInclusionFlag flag, MmsValue* value); ReportControl_valueUpdated(ReportControl* self, int dataSetEntryIndex, ReportInclusionFlag flag);
MmsValue* MmsValue*
ReportControl_getRCBValue(ReportControl* rc, char* elementName); ReportControl_getRCBValue(ReportControl* rc, char* elementName);

@ -2520,7 +2520,7 @@ MmsMapping_triggerReportObservers(MmsMapping* self, MmsValue* value, ReportInclu
} }
if (DataSet_isMemberValue(rc->dataSet, value, &index)) { if (DataSet_isMemberValue(rc->dataSet, value, &index)) {
ReportControl_valueUpdated(rc, index, flag, value); ReportControl_valueUpdated(rc, index, flag);
} }
} }
} }

@ -2464,7 +2464,7 @@ Reporting_processReportEvents(MmsMapping* self, uint64_t currentTimeInMs)
} }
void void
ReportControl_valueUpdated(ReportControl* self, int dataSetEntryIndex, ReportInclusionFlag flag, MmsValue* value) ReportControl_valueUpdated(ReportControl* self, int dataSetEntryIndex, ReportInclusionFlag flag)
{ {
ReportControl_lockNotify(self); ReportControl_lockNotify(self);

@ -218,8 +218,9 @@ alternateArrayAccess(MmsServerConnection connection,
namedVariable, structValue); namedVariable, structValue);
} }
} }
else else {
value = MmsValue_getElement(arrayValue, index); value = MmsValue_getElement(arrayValue, index);
}
else { else {
value = MmsValue_createEmptyArray(numberOfElements); value = MmsValue_createEmptyArray(numberOfElements);
@ -284,7 +285,7 @@ addNamedVariableToResultList(MmsVariableSpecification* namedVariable, MmsDomain*
alternateArrayAccess(connection, alternateAccess, domain, alternateArrayAccess(connection, alternateAccess, domain,
nameIdStr, values, namedVariable); nameIdStr, values, namedVariable);
} }
else { //getCompleteArray else { /* return complete array */
MmsValue* value = mmsServer_getValue(connection->server, domain, nameIdStr, connection); MmsValue* value = mmsServer_getValue(connection->server, domain, nameIdStr, connection);
appendValueToResultList(value, values); appendValueToResultList(value, values);
} }

Loading…
Cancel
Save