epics/normativeTypes
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Reorder optional fields to consistent order to match new NT spec.

Browse Source
This commit is contained in:
dhickin
2015-05-11 14:02:18 +01:00
parent 25e8c65bb0
commit 8c292eeebc
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/nt/ntmultiChannel.cpp
View File

@@ -112,17 +112,17 @@ StructureConstPtr NTMultiChannelBuilder::createStructure()
fields[ind++] = fieldCreate->createScalarArray(pvString);
names[ind] = "isConnected";
fields[ind++] = fieldCreate->createScalarArray(pvBoolean);
if(timeStamp) {
names[ind] = "timeStamp";
fields[ind++] = standardField->timeStamp();
if(descriptor) {
names[ind] = "descriptor";
fields[ind++] = fieldCreate->createScalar(pvString);
}
if(alarm) {
names[ind] = "alarm";
fields[ind++] = standardField->alarm();
}
if(descriptor) {
names[ind] = "descriptor";
fields[ind++] = fieldCreate->createScalar(pvString);
if(timeStamp) {
names[ind] = "timeStamp";
fields[ind++] = standardField->timeStamp();
}
if(severity) {
names[ind] = "severity";

6
src/nt/ntndarray.cpp
View File

@@ -116,12 +116,12 @@ StructureConstPtr NTNDArrayBuilder::createStructure()
if (descriptor)
fb->add("descriptor", pvString);
if (timeStamp)
fb->add("timeStamp", standardField->timeStamp());
if (alarm)
fb->add("alarm", standardField->alarm());
if (timeStamp)
fb->add("timeStamp", standardField->timeStamp());
if (display)
fb->add("display", standardField->display());