var name changed
This commit is contained in:
@@ -128,7 +128,7 @@ bool JAConditionalSignalUpdateGAM::Initialise(MARTe::StructuredDataI &data) {
|
|||||||
level++;
|
level++;
|
||||||
uint32 n_inputs = data.GetNumberOfChildren();
|
uint32 n_inputs = data.GetNumberOfChildren();
|
||||||
comparators = new comparator_t[n_inputs];
|
comparators = new comparator_t[n_inputs];
|
||||||
StreamString buffer;
|
StreamString strbuff;
|
||||||
TypeDescriptor td;
|
TypeDescriptor td;
|
||||||
for (uint32 i = 0; ok && i < n_inputs; i++) {
|
for (uint32 i = 0; ok && i < n_inputs; i++) {
|
||||||
ok = data.MoveToChild(i);
|
ok = data.MoveToChild(i);
|
||||||
@@ -138,14 +138,14 @@ bool JAConditionalSignalUpdateGAM::Initialise(MARTe::StructuredDataI &data) {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
level++;
|
level++;
|
||||||
ok = data.Read("Type", buffer);
|
ok = data.Read("Type", strbuff);
|
||||||
if (!ok) {
|
if (!ok) {
|
||||||
REPORT_ERROR(ErrorManagement::ParametersError,
|
REPORT_ERROR(ErrorManagement::ParametersError,
|
||||||
"Missing mandatory field Type from InputSignals[%lu]",
|
"Missing mandatory field Type from InputSignals[%lu]",
|
||||||
i);
|
i);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
td = TypeDescriptor::GetTypeDescriptorFromTypeName(buffer.Buffer());
|
td = TypeDescriptor::GetTypeDescriptorFromTypeName(strbuff.Buffer());
|
||||||
ok = (td == UnsignedInteger8Bit) || (td == UnsignedInteger16Bit) ||
|
ok = (td == UnsignedInteger8Bit) || (td == UnsignedInteger16Bit) ||
|
||||||
(td == UnsignedInteger32Bit);
|
(td == UnsignedInteger32Bit);
|
||||||
if (!ok) {
|
if (!ok) {
|
||||||
@@ -153,19 +153,19 @@ bool JAConditionalSignalUpdateGAM::Initialise(MARTe::StructuredDataI &data) {
|
|||||||
"Wrong value for field Type from InputSignals[%d]", i);
|
"Wrong value for field Type from InputSignals[%d]", i);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
buffer = "";
|
strbuff = "";
|
||||||
ok = data.Read("Comparator", buffer);
|
ok = data.Read("Comparator", strbuff);
|
||||||
if (!ok) {
|
if (!ok) {
|
||||||
REPORT_ERROR(
|
REPORT_ERROR(
|
||||||
ErrorManagement::ParametersError,
|
ErrorManagement::ParametersError,
|
||||||
"Missing mandatory field Comparator from InputSignals[%d]", i);
|
"Missing mandatory field Comparator from InputSignals[%d]", i);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
ok = parse_comparator(buffer, comparators[i].comparator);
|
ok = parse_comparator(strbuff, comparators[i].comparator);
|
||||||
if (!ok) {
|
if (!ok) {
|
||||||
REPORT_ERROR(ErrorManagement::ParametersError,
|
REPORT_ERROR(ErrorManagement::ParametersError,
|
||||||
"Non Valid Comparator `%s` from InputSignals[%d]",
|
"Non Valid Comparator `%s` from InputSignals[%d]",
|
||||||
buffer.Buffer(), i);
|
strbuff.Buffer(), i);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
ok = data.Read("Value", comparators[i].value);
|
ok = data.Read("Value", comparators[i].value);
|
||||||
|
|||||||
Reference in New Issue
Block a user