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

Merged changes from 3.14 branch

Browse Source 
Fixed issues building on Solaris.

Up to revno 12497.
This commit is contained in:
Andrew Johnson
2014-09-25 16:34:12 -05:00
parent d73b4eb470 e1eac6657d
commit 8fde7fb4f3
28 changed files with 159 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/std/dev/devAiSoft.c
View File

@@ -20,6 +20,7 @@
#include "alarm.h"
#include "dbDefs.h"
#include "dbAccess.h"
#include "epicsMath.h"
#include "recGbl.h"
#include "devSup.h"
#include "aiRecord.h"
@@ -78,7 +79,7 @@ static long read_ai(aiRecord *prec)
if (!dbGetLink(&prec->inp, DBR_DOUBLE, &val, 0, 0)) {
/* Apply smoothing algorithm */
if (prec->smoo != 0.0 && prec->dpvt)
if (prec->smoo != 0.0 && prec->dpvt && finite(prec->val))
prec->val = val * (1.00 - prec->smoo) + (prec->val * prec->smoo);
else
prec->val = val;