lin-epics-modules/sinqepicsapp
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated the first-time-poll of C804 Axis

Browse Source
This commit is contained in:
mathis_s
2024-09-18 13:19:32 +02:00
parent 20e5c35d44
commit d44fdbf736
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sinqEPICSApp/src/C804Axis.cpp
View File

@ -47,15 +47,15 @@ asynStatus C804Axis::poll(bool *moving)
// Local variable declaration // Local variable declaration
static const char *functionName = "C804Axis::poll"; static const char *functionName = "C804Axis::poll";
// The poll function is just a wrapper around poll_inner and handles mainly // The poll function is just a wrapper around poll_no_param_lib_update and handles mainly
// the callParamCallbacks() function // the callParamCallbacks() function
asynStatus status_poll = C804Axis::poll_inner(moving); asynStatus status_poll = C804Axis::poll_no_param_lib_update(moving);
// According to the function documentation of asynMotorAxis::poll, this // According to the function documentation of asynMotorAxis::poll, this
// function should be called at the end of a poll implementation. // function should be called at the end of a poll implementation.
asynStatus status_callback = callParamCallbacks(); asynStatus status_callback = callParamCallbacks();
if (status_callback != asynSuccess) if (status_callback != asynSuccess)
{ {d
asynPrint(pC_->pasynUserSelf, ASYN_TRACE_ERROR, asynPrint(pC_->pasynUserSelf, ASYN_TRACE_ERROR,
"%s: Updating the parameter library failed for axis %d\n", functionName, axisNo_); "%s: Updating the parameter library failed for axis %d\n", functionName, axisNo_);
return status_callback; return status_callback;
@ -67,7 +67,7 @@ asynStatus C804Axis::poll(bool *moving)
} }
// Perform the actual poll // Perform the actual poll
asynStatus C804Axis::poll_inner(bool *moving) asynStatus C804Axis::poll_no_param_lib_update(bool *moving)
{ {
// Local variable declaration // Local variable declaration
static const char *functionName = "C804Axis::poll"; static const char *functionName = "C804Axis::poll";
@ -138,7 +138,7 @@ asynStatus C804Axis::poll_inner(bool *moving)
/* /*
We know that the motor resolution must not be zero. During the startup of the We know that the motor resolution must not be zero. During the startup of the
IOC, polls can happen before the record is fully initialized. In that case, IOC, polls can happen before the record is fully initialized. In that case,
all values are zero. This all values are zero.
*/ */
if (motorRecResolution_ == 0) if (motorRecResolution_ == 0)
{ {

2
sinqEPICSApp/src/C804Axis.h
View File

@ -19,7 +19,7 @@ public:
asynStatus stop(double acceleration); asynStatus stop(double acceleration);
asynStatus home(double minVelocity, double maxVelocity, double acceleration, int forwards); asynStatus home(double minVelocity, double maxVelocity, double acceleration, int forwards);
asynStatus poll(bool *moving); asynStatus poll(bool *moving);
asynStatus poll_inner(bool *moving); asynStatus poll_no_param_lib_update(bool *moving);
asynStatus enable(int on); asynStatus enable(int on);
protected: protected: