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

Don't print messages on expected errors

Browse Source
This commit is contained in:
MarkRivers
2015-03-21 19:43:59 +00:00
parent 7672a49cbd
commit 78fb30d1c4
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
motorApp/NewportSrc/XPSAxis.cpp
+10 -10
View File
@@ -963,7 +963,7 @@ asynStatus XPSAxis::getPositionCompare()
bool enable;
int status;
int i;
double minPosition, maxPosition, stepSize, pulseWidth, settlingTime;
double minPosition=0, maxPosition=0, stepSize=0, pulseWidth, settlingTime;
static const char *functionName = "getPositionCompare";
setIntegerParam(pC_->XPSPositionCompareMode_, XPSPositionCompareModeDisable);
@@ -975,22 +975,22 @@ asynStatus XPSAxis::getPositionCompare()
return asynError;
}
status = PositionerPositionCompareGet(pollSocket_, positionerName_, &minPosition, &maxPosition, &stepSize, &enable);
if (status) {
asynPrint(pasynUser_, ASYN_TRACE_ERROR,
"%s:%s: [%s,%d]: error calling PositionerPositionCompareGet status=%d\n",
driverName, functionName, pC_->portName, axisNo_, status);
return asynError;
if (status == 0) {
setDoubleParam(pC_->XPSPositionCompareMinPosition_, minPosition);
setDoubleParam(pC_->XPSPositionCompareMaxPosition_, maxPosition);
setDoubleParam(pC_->XPSPositionCompareStepSize_, stepSize);
}
status = PositionerPositionCompareAquadBWindowedGet(pollSocket_, positionerName_, &minPosition, &maxPosition, &enable);
if (status == 0) {
setDoubleParam(pC_->XPSPositionCompareMinPosition_, minPosition);
setDoubleParam(pC_->XPSPositionCompareMaxPosition_, maxPosition);
}
if (enable) setIntegerParam(pC_->XPSPositionCompareMode_, XPSPositionCompareModePulse);
asynPrint(pasynUser_, ASYN_TRACE_FLOW,
"%s:%s: set XPS %s, axis %d "
" enable=%d, minPosition=%f, maxPosition=%f, stepSize=%f, pulseWidth=%f, settlingTime=%f\n",
driverName, functionName, pC_->portName, axisNo_,
enable, minPosition, maxPosition, stepSize, pulseWidth, settlingTime);
setDoubleParam(pC_->XPSPositionCompareMinPosition_, minPosition);
setDoubleParam(pC_->XPSPositionCompareMaxPosition_, maxPosition);
setDoubleParam(pC_->XPSPositionCompareStepSize_, stepSize);
for (i=0; i<MAX_PULSE_WIDTHS; i++) {
if (fabs(pulseWidth - positionComparePulseWidths[i]) < 0.001) break;
}