lin-epics-modules/motorBase
0
0
Fork 0
forked from epics_driver_modules/motorBase
Code Pull Requests Activity

Added parentheses to avoid compiler warnings

Browse Source
This commit is contained in:
MarkRivers
2009-09-01 14:04:08 +00:00
parent 421077a826
commit 3fbf486165
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
motorApp/MotorSrc/motorRecord.cc
+6 -6
View File
@@ -2,9 +2,9 @@
FILENAME... motorRecord.cc
USAGE... Motor Record Support.
Version: $Revision: 1.53 $
Modified By: $Author: sluiter $
Last Modified: $Date: 2009-06-18 19:19:57 $
Version: $Revision: 1.54 $
Modified By: $Author: rivers $
Last Modified: $Date: 2009-09-01 14:04:08 $
*/
/*
@@ -756,7 +756,7 @@ static long postProcess(motorRecord * pmr)
/* Use if encoder or ReadbackLink is in use. */
msta.All = pmr->msta;
bool use_rel = (pmr->rtry != 0 && (msta.Bits.EA_PRESENT && pmr->ueip) || pmr->urip);
bool use_rel = (((pmr->rtry != 0) && (msta.Bits.EA_PRESENT && pmr->ueip)) || pmr->urip);
double relpos = pmr->diff / pmr->mres;
double relbpos = ((pmr->dval - pmr->bdst) - pmr->drbv) / pmr->mres;
@@ -832,7 +832,7 @@ static long postProcess(motorRecord * pmr)
/* Use if encoder or ReadbackLink is in use. */
msta.All = pmr->msta;
bool use_rel = (pmr->rtry != 0 && (msta.Bits.EA_PRESENT && pmr->ueip) || pmr->urip);
bool use_rel = (((pmr->rtry != 0) && (msta.Bits.EA_PRESENT && pmr->ueip)) || pmr->urip);
double relpos = pmr->diff / pmr->mres;
double relbpos = ((pmr->dval - pmr->bdst) - pmr->drbv) / pmr->mres;
@@ -2094,7 +2094,7 @@ static RTN_STATUS do_work(motorRecord * pmr, CALLBACK_VALUE proc_ind)
msta.All = pmr->msta;
/*** Use if encoder or ReadbackLink is in use. ***/
if (pmr->rtry != 0 && (msta.Bits.EA_PRESENT && pmr->ueip) || pmr->urip)
if (((pmr->rtry != 0) && (msta.Bits.EA_PRESENT && pmr->ueip)) || pmr->urip)
use_rel = true;
else
use_rel = false;