Merged changes from 3.15 branch to revno 12699

2015-07-24 12:01:53 -05:00
parent a5e1f367d6 c5130468cd
commit 4d3831ce58
13 changed files with 55 additions and 53 deletions
--- a/src/std/dev/devAiSoftCallback.c
+++ b/src/std/dev/devAiSoftCallback.c
@@ -23,6 +23,7 @@
 #include "dbChannel.h"
 #include "dbNotify.h"
 #include "epicsAssert.h"
+#include "epicsMath.h"
 #include "recGbl.h"
 #include "recSup.h"
 #include "devSup.h"
@@ -190,7 +191,7 @@ static long read_ai(aiRecord *prec)
    }

    /* Apply smoothing algorithm */
-    if (prec->smoo != 0.0 && pdevPvt->smooth)
+    if (prec->smoo != 0.0 && pdevPvt->smooth && finite(prec->val))
        prec->val = prec->val * prec->smoo +
            pdevPvt->buffer.value * (1.0 - prec->smoo);
    else