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

Merge changes from 3.14.12.5 (revno 12582)

Browse Source
This commit is contained in:
Andrew Johnson
2015-03-25 12:53:13 -05:00
parent 490540b005 0a1cf17681
commit ffcbd4ca8b
5 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/std/rec/aiRecord.dbd.pod
View File

@@ -404,8 +404,8 @@ monitoring functionality.
pp(TRUE)
interest(2)
}
field(ROFF,DBF_LONG) {
prompt("Raw Offset, obsolete")
field(ROFF,DBF_ULONG) {
prompt("Raw Offset")
pp(TRUE)
interest(2)
}

18
src/std/rec/aoRecord.c
View File

@@ -498,10 +498,20 @@ static void convert(aoRecord *prec, double value)
}
value -= prec->aoff;
if (prec->aslo != 0) value /= prec->aslo;
if (value >= 0.0)
prec->rval = (epicsInt32)(value + 0.5) - prec->roff;
else
prec->rval = (epicsInt32)(value - 0.5) - prec->roff;
/* Apply raw offset and limits, round to 32-bit integer */
value -= prec->roff;
if (value >= 0.0) {
if (value >= (0x7fffffff - 0.5))
prec->rval = 0x7fffffff;
else
prec->rval = (epicsInt32)(value + 0.5);
} else {
if (value > (0.5 - 0x80000000))
prec->rval = (epicsInt32)(value - 0.5);
else
prec->rval = 0x80000000;
}
}

4
src/std/rec/aoRecord.dbd.pod
View File

@@ -342,8 +342,8 @@ information on these fields.
size(16)
prop(YES)
}
field(ROFF,DBF_LONG) {
prompt("Raw Offset, obsolete")
field(ROFF,DBF_ULONG) {
prompt("Raw Offset")
pp(TRUE)
interest(2)
}