diff --git a/sinqEPICSApp/src/C804Axis.cpp b/sinqEPICSApp/src/C804Axis.cpp index be02488..c1e1500 100644 --- a/sinqEPICSApp/src/C804Axis.cpp +++ b/sinqEPICSApp/src/C804Axis.cpp @@ -47,15 +47,15 @@ asynStatus C804Axis::poll(bool *moving) // Local variable declaration 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 - 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 // function should be called at the end of a poll implementation. asynStatus status_callback = callParamCallbacks(); if (status_callback != asynSuccess) - { + {d asynPrint(pC_->pasynUserSelf, ASYN_TRACE_ERROR, "%s: Updating the parameter library failed for axis %d\n", functionName, axisNo_); return status_callback; @@ -67,7 +67,7 @@ asynStatus C804Axis::poll(bool *moving) } // Perform the actual poll -asynStatus C804Axis::poll_inner(bool *moving) +asynStatus C804Axis::poll_no_param_lib_update(bool *moving) { // Local variable declaration 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 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) { diff --git a/sinqEPICSApp/src/C804Axis.h b/sinqEPICSApp/src/C804Axis.h index 9181a7d..6e5bdc9 100644 --- a/sinqEPICSApp/src/C804Axis.h +++ b/sinqEPICSApp/src/C804Axis.h @@ -19,7 +19,7 @@ public: asynStatus stop(double acceleration); asynStatus home(double minVelocity, double maxVelocity, double acceleration, int forwards); asynStatus poll(bool *moving); - asynStatus poll_inner(bool *moving); + asynStatus poll_no_param_lib_update(bool *moving); asynStatus enable(int on); protected: