Compare commits

...

2 Commits
1.5.2 ... 1.5.3

Author SHA1 Message Date
6e4724cde4 Fixed error messages
Some checks failed
Test And Build / Lint (push) Failing after 4s
Test And Build / Build (push) Failing after 8s
2026-01-09 13:46:14 +01:00
a9fe5e70c8 Update src/turboPmacAxis.cpp
Some checks failed
Test And Build / Lint (push) Failing after 4s
Test And Build / Build (push) Failing after 8s
2026-01-09 13:20:29 +01:00
2 changed files with 19 additions and 16 deletions

View File

@@ -33,7 +33,7 @@ turboPmac exports the following IOC shell functions:
The full turboPmacX.cmd file looks like this: The full turboPmacX.cmd file looks like this:
``` ```bash
# Define the name of the controller and the corresponding port # Define the name of the controller and the corresponding port
epicsEnvSet("DRIVER_PORT","turboPmacX") epicsEnvSet("DRIVER_PORT","turboPmacX")
epicsEnvSet("IP_PORT","p$(DRIVER_PORT)") epicsEnvSet("IP_PORT","p$(DRIVER_PORT)")

View File

@@ -620,16 +620,18 @@ asynStatus turboPmacAxis::handleError(int error, char *userMessage,
if (pC_->getMsgPrintControl().shouldBePrinted( if (pC_->getMsgPrintControl().shouldBePrinted(
pC_->portName, axisNo_, __PRETTY_FUNCTION__, __LINE__, true, pC_->portName, axisNo_, __PRETTY_FUNCTION__, __LINE__, true,
pC_->pasynUser())) { pC_->pasynUser())) {
asynPrint(pC_->pasynUser(), ASYN_TRACE_ERROR, asynPrint(
"Controller \"%s\", axis %d => %s, line %d\nAir cushion " pC_->pasynUser(), ASYN_TRACE_ERROR,
"feedback stopped during movement (P%2.2d01 = %d).%s\n", "Controller \"%s\", axis %d => %s, line %d\nLost feedback "
pC_->portName, axisNo_, __PRETTY_FUNCTION__, __LINE__, "from auxiliary device during movement (P%2.2d01 = %d).%s\n",
axisNo_, error, pC_->getMsgPrintControl().getSuffix()); pC_->portName, axisNo_, __PRETTY_FUNCTION__, __LINE__, axisNo_,
error, pC_->getMsgPrintControl().getSuffix());
} }
snprintf(userMessage, sizeUserMessage, snprintf(
"Air cushion feedback stopped during movement (P%2.2d01 = " userMessage, sizeUserMessage,
"%d). Please call the support.", "Lost feedback from auxiliary device during movement (P%2.2d01 = "
axisNo_, error); "%d). Please call the support.",
axisNo_, error);
setAxisParamChecked(this, motorMessageText, userMessage); setAxisParamChecked(this, motorMessageText, userMessage);
break; break;
case 9: case 9:
@@ -638,16 +640,17 @@ asynStatus turboPmacAxis::handleError(int error, char *userMessage,
pC_->pasynUser())) { pC_->pasynUser())) {
asynPrint( asynPrint(
pC_->pasynUser(), ASYN_TRACE_ERROR, pC_->pasynUser(), ASYN_TRACE_ERROR,
"Controller \"%s\", axis %d => %s, line %d\nNo air cushion " "Controller \"%s\", axis %d => %s, line %d\nNo feedback from "
"feedback before movement start (P%2.2d01 = %d).%s\n", "auxiliary device before movement (P%2.2d01 = %d).%s\n",
pC_->portName, axisNo_, __PRETTY_FUNCTION__, __LINE__, axisNo_, pC_->portName, axisNo_, __PRETTY_FUNCTION__, __LINE__, axisNo_,
error, pC_->getMsgPrintControl().getSuffix()); error, pC_->getMsgPrintControl().getSuffix());
} }
snprintf(userMessage, sizeUserMessage, snprintf(
"No air cushion feedback before movement start (P%2.2d01 = " userMessage, sizeUserMessage,
"%d). Please call the support.", "No feedback from auxiliary device before movement (P%2.2d01 = "
axisNo_, error); "%d). Please call the support.",
axisNo_, error);
setAxisParamChecked(this, motorMessageText, userMessage); setAxisParamChecked(this, motorMessageText, userMessage);
break; break;
case 10: case 10: