diff --git a/src/rec/aiRecord.c b/src/rec/aiRecord.c index a77a18239..e68f58154 100644 --- a/src/rec/aiRecord.c +++ b/src/rec/aiRecord.c @@ -314,8 +314,8 @@ static long get_alarm_double(DBADDR *paddr,struct dbr_alDouble *pad) static void alarm(aiRecord *pai) { - double val; - float hyst, lalm, hihi, high, low, lolo; + double val, hyst, lalm; + float hihi, high, low, lolo; unsigned short hhsv, llsv, hsv, lsv; if(pai->udf == TRUE ){ diff --git a/src/rec/aoRecord.c b/src/rec/aoRecord.c index 34e6dd551..2d0149765 100644 --- a/src/rec/aoRecord.c +++ b/src/rec/aoRecord.c @@ -389,7 +389,7 @@ static void alarm(pao) struct aoRecord *pao; { double val; - float hyst, lalm, hihi, high, low, lolo; + double hyst, lalm, hihi, high, low, lolo; unsigned short hhsv, llsv, hsv, lsv; if(pao->udf == TRUE ){ @@ -472,7 +472,7 @@ static void convert(pao,value) /* now set value equal to desired output value */ /* apply the output rate of change */ if ( (pao->oroc) != 0.0 ){/*must be defined and >0*/ - float diff; + double diff; diff = value - pao->oval; if (diff < 0){ diff --git a/src/rec/calcRecord.c b/src/rec/calcRecord.c index 8ac3ea765..694b03bab 100644 --- a/src/rec/calcRecord.c +++ b/src/rec/calcRecord.c @@ -304,8 +304,8 @@ static long get_alarm_double(paddr,pad) static void alarm(pcalc) struct calcRecord *pcalc; { - double val; - float hyst, lalm, hihi, high, low, lolo; + double val, hyst, lalm; + float hihi, high, low, lolo; unsigned short hhsv, llsv, hsv, lsv; if(pcalc->udf == TRUE ){ diff --git a/src/rec/calcoutRecord.c b/src/rec/calcoutRecord.c index ad076d750..2f57fa23b 100644 --- a/src/rec/calcoutRecord.c +++ b/src/rec/calcoutRecord.c @@ -513,8 +513,8 @@ static long get_alarm_double(paddr,pad) static void alarm(pcalc) struct calcoutRecord *pcalc; { - double val; - float hyst, lalm, hihi, high, low, lolo; + double hyst, lalm, val; + float hihi, high, low, lolo; unsigned short hhsv, llsv, hsv, lsv; if(pcalc->udf == TRUE ){ diff --git a/src/rec/dfanoutRecord.c b/src/rec/dfanoutRecord.c index 4fe26f47e..e2f67bfb2 100644 --- a/src/rec/dfanoutRecord.c +++ b/src/rec/dfanoutRecord.c @@ -176,7 +176,7 @@ static void alarm(pdfanout) struct dfanoutRecord *pdfanout; { double val; - float hyst, lalm, hihi, high, low, lolo; + double hyst, lalm, hihi, high, low, lolo; unsigned short hhsv, llsv, hsv, lsv; if(pdfanout->udf == TRUE ){ diff --git a/src/rec/selRecord.c b/src/rec/selRecord.c index 53d0940d1..2763c19c5 100644 --- a/src/rec/selRecord.c +++ b/src/rec/selRecord.c @@ -284,8 +284,8 @@ static long get_alarm_double(paddr,pad) static void alarm(psel) struct selRecord *psel; { - double val; - float hyst, lalm, hihi, high, low, lolo; + double hyst, lalm, val; + float hihi, high, low, lolo; unsigned short hhsv, llsv, hsv, lsv; if(psel->udf == TRUE ){ diff --git a/src/rec/subRecord.c b/src/rec/subRecord.c index c3dd61ff3..4558db0ca 100644 --- a/src/rec/subRecord.c +++ b/src/rec/subRecord.c @@ -304,8 +304,8 @@ static long get_alarm_double(paddr,pad) static void alarm(psub) struct subRecord *psub; { - double val; - float hyst, lalm, hihi, high, low, lolo; + double hyst, lalm, val; + float hihi, high, low, lolo; unsigned short hhsv, llsv, hsv, lsv; if(psub->udf == TRUE ){