Converted float=>double in the alarm() routines of many record types
where the .dbd field type didn't match the temporary local variable.
This commit is contained in:
+2
-2
@@ -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 ){
|
||||
|
||||
+2
-2
@@ -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){
|
||||
|
||||
@@ -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 ){
|
||||
|
||||
@@ -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 ){
|
||||
|
||||
@@ -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 ){
|
||||
|
||||
+2
-2
@@ -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 ){
|
||||
|
||||
+2
-2
@@ -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 ){
|
||||
|
||||
Reference in New Issue
Block a user