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

Changed method name to match sinqMotor

Browse Source
This commit is contained in:
mathis_s
2025-04-25 16:04:45 +02:00
parent b8c9a58baa
commit 78257dc618
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/seleneLiftAxis.cpp
View File

@ -60,7 +60,7 @@ seleneLiftAxis::seleneLiftAxis(seleneGuideController *pC, int axis1No,
for (int i = 0; i < numAxes_; i++) { for (int i = 0; i < numAxes_; i++) {
oAxis = dynamic_cast<seleneOffsetAxis *>(pC->getAxis(axisNos[i])); oAxis = dynamic_cast<seleneOffsetAxis *>(pC->getAxis(axisNos[i]));
if (oAxis == nullptr) { if (oAxis == nullptr) {
asynPrint(pC_->asynUserSelf(), ASYN_TRACE_ERROR, asynPrint(pC_->pasynUser(), ASYN_TRACE_ERROR,
"Controller \"%s\", axis %d => %s, line %d\nFATAL ERROR " "Controller \"%s\", axis %d => %s, line %d\nFATAL ERROR "
"(given axis number %d is not an instance of " "(given axis number %d is not an instance of "
"seleneOffsetAxis).\nTerminating IOC.\n", "seleneOffsetAxis).\nTerminating IOC.\n",
@ -118,7 +118,7 @@ asynStatus seleneLiftAxis::init() {
&motorRecResolution); &motorRecResolution);
if (status == asynParamUndefined) { if (status == asynParamUndefined) {
if (now + maxInitTime < time(NULL)) { if (now + maxInitTime < time(NULL)) {
asynPrint(pC_->asynUserSelf(), ASYN_TRACE_ERROR, asynPrint(pC_->pasynUser(), ASYN_TRACE_ERROR,
"Controller \"%s\", axis %d => %s, line " "Controller \"%s\", axis %d => %s, line "
"%d\nInitializing the parameter library failed.\n", "%d\nInitializing the parameter library failed.\n",
pC_->portName, axisNo_, __PRETTY_FUNCTION__, pC_->portName, axisNo_, __PRETTY_FUNCTION__,
@ -538,7 +538,7 @@ asynStatus seleneLiftAxis::stop(double acceleration) {
if (rw_status != asynSuccess) { if (rw_status != asynSuccess) {
asynPrint( asynPrint(
pC_->asynUserSelf(), ASYN_TRACE_ERROR, pC_->pasynUser(), ASYN_TRACE_ERROR,
"Controller \"%s\", axis %d => %s, line %d\nStopping the movement " "Controller \"%s\", axis %d => %s, line %d\nStopping the movement "
"failed.\n", "failed.\n",
pC_->portName, axisNo_, __PRETTY_FUNCTION__, __LINE__); pC_->portName, axisNo_, __PRETTY_FUNCTION__, __LINE__);

2
src/seleneOffsetAxis.cpp
View File

@ -99,7 +99,7 @@ asynStatus seleneOffsetAxis::init() {
&motorRecResolution); &motorRecResolution);
if (status == asynParamUndefined) { if (status == asynParamUndefined) {
if (now + maxInitTime < time(NULL)) { if (now + maxInitTime < time(NULL)) {
asynPrint(pC_->asynUserSelf(), ASYN_TRACE_ERROR, asynPrint(pC_->pasynUser(), ASYN_TRACE_ERROR,
"Controller \"%s\", axis %d => %s, line " "Controller \"%s\", axis %d => %s, line "
"%d\nInitializing the parameter library failed.\n", "%d\nInitializing the parameter library failed.\n",
pC_->portName, axisNo_, __PRETTY_FUNCTION__, pC_->portName, axisNo_, __PRETTY_FUNCTION__,