diff --git a/Makefile b/Makefile index 1c9fa85..fae07b1 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ REQUIRED+=sinqMotor motorBase_VERSION=7.2.2 # Specify the version of sinqMotor we want to build against -sinqMotor_VERSION=mathis_s +sinqMotor_VERSION=0.13.0 # These headers allow to depend on this library for derived drivers. HEADERS += src/pmacAsynIPPort.h diff --git a/src/turboPmacAxis.cpp b/src/turboPmacAxis.cpp index 574c7d8..74fded0 100644 --- a/src/turboPmacAxis.cpp +++ b/src/turboPmacAxis.cpp @@ -497,17 +497,17 @@ asynStatus turboPmacAxis::doPoll(bool *moving) { pC_->pasynUser())) { asynPrint(pC_->pasynUser(), ASYN_TRACE_ERROR, - "Controller \"%s\", axis %d => %s, line %d\nReached " - "unreachable state P%2.2d00 = %d.%s\n", + "Controller \"%s\", axis %d => %s, line %d\nUnknown " + "state P%2.2d00 = %d.%s\n", pC_->portName, axisNo_, __PRETTY_FUNCTION__, __LINE__, axisNo_, axStatus, pC_->getMsgPrintControl().getSuffix()); } resetCountStatus = false; - snprintf(userMessage, sizeof(userMessage), - "Unknown state P%2.2d00 = %d has been reached. Please call " - "the support.", - axisNo_, error); + snprintf( + userMessage, sizeof(userMessage), + "Reached unknown state P%2.2d00 = %d. Please call the support.", + axisNo_, error); pl_status = setStringParam(pC_->motorMessageText(), userMessage); if (pl_status != asynSuccess) { return pC_->paramLibAccessFailed(pl_status, "motorMessageText_",