EPICS_driver_modules/StreamDevice
0
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix ai/ao conversion when using LINR=NO CONVERSION together with ASLO or AOFF

Browse Source
This commit is contained in:
zimoch
2017-01-18 16:03:02 +01:00
parent 0936ac7840
commit 0a90eb3d9c
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/devaiStream.c
View File

@ -55,11 +55,14 @@ static long readData (dbCommon *record, format_t *format)
ai->rval = rval; ai->rval = rval;
if (ai->linr == menuConvertNO_CONVERSION) if (ai->linr == menuConvertNO_CONVERSION)
{ {
/* allow more bits than 32 */ /* allow integers with more than 32 bits */
double val;
if (format->type == DBF_ULONG) if (format->type == DBF_ULONG)
ai->val = (unsigned long)rval; val = (unsigned long)rval;
else else
ai->val = rval; val = rval;
if (ai->aslo != 0.0 && ai->aslo != 1.0) val *= ai->aslo;
ai->val = val + ai->aoff;
return DO_NOT_CONVERT; return DO_NOT_CONVERT;
} }
return OK; return OK;

22
src/devaoStream.c
View File

@ -46,11 +46,14 @@ static long readData (dbCommon *record, format_t *format)
ao->rval = rval; ao->rval = rval;
if (ao->linr == menuConvertNO_CONVERSION) if (ao->linr == menuConvertNO_CONVERSION)
{ {
/* allow more bits than 32 */ /* allow integers with more than 32 bits */
double val;
if (format->type == DBF_ULONG) if (format->type == DBF_ULONG)
ao->val = (unsigned long)rval; val = (unsigned long)rval;
else else
ao->val = rval; val = rval;
if (ao->aslo != 0.0 && ao->aslo != 1.0) val *= ao->aslo;
ao->val = val + ao->aoff;
return DO_NOT_CONVERT; return DO_NOT_CONVERT;
} }
return OK; return OK;
@ -63,20 +66,21 @@ static long writeData (dbCommon *record, format_t *format)
{ {
aoRecord *ao = (aoRecord *) record; aoRecord *ao = (aoRecord *) record;
double val = (INIT_RUN ? ao->val : ao->oval) - ao->aoff;
if (ao->aslo != 0.0 && ao->aslo != 1.0) val /= ao->aslo;
switch (format->type) switch (format->type)
{ {
case DBF_DOUBLE: case DBF_DOUBLE:
{ {
double val = (INIT_RUN ? ao->val : ao->oval) - ao->aoff;
if (ao->aslo != 0.0 && ao->aslo != 1.0) val /= ao->aslo;
return streamPrintf (record, format, val); return streamPrintf (record, format, val);
} }
case DBF_ULONG: case DBF_ULONG:
{ {
if (ao->linr == menuConvertNO_CONVERSION) if (ao->linr == menuConvertNO_CONVERSION)
{ {
/* allow more bits than 32 */ /* allow integers with more than 32 bits */
return streamPrintf (record, format, (unsigned long)(INIT_RUN ? ao->val : ao->oval)); return streamPrintf (record, format, (unsigned long)val);
} }
return streamPrintf (record, format, (unsigned long)ao->rval); return streamPrintf (record, format, (unsigned long)ao->rval);
} }
@ -84,8 +88,8 @@ static long writeData (dbCommon *record, format_t *format)
{ {
if (ao->linr == menuConvertNO_CONVERSION) if (ao->linr == menuConvertNO_CONVERSION)
{ {
/* allow more bits than 32 */ /* allow integers with more than 32 bits */
return streamPrintf (record, format, (long)(INIT_RUN ? ao->val : ao->oval)); return streamPrintf (record, format, (long)val);
} }
return streamPrintf (record, format, (long)ao->rval); return streamPrintf (record, format, (long)ao->rval);
} }