Compare commits
59 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| c12682f0c1 | |||
| 78810c3364 | |||
| 21c9adec35 | |||
| 01a0239dfb | |||
| 0e2b5f5e93 | |||
| 50aa44014b | |||
| 6d00209e8a | |||
| a70bcc0d75 | |||
| bf3406be1c | |||
| 91e2519832 | |||
| 829665c078 | |||
| 4fd95743c4 | |||
| 5845d2e908 | |||
| 501b240250 | |||
| 5f35c2277d | |||
| 4f972fd53d | |||
| 2fc2ad1970 | |||
| 3f7998eb9a | |||
| ed36207a4c | |||
| 54a11344f7 | |||
| 8bbae3691d | |||
| 06b116c5fd | |||
| 3c8f5045f2 | |||
| 1b82da8362 | |||
| a908d56bad | |||
| 404a4cd713 | |||
| dc89906af0 | |||
| b63f2c8cec | |||
| dd7c67e53e | |||
| 50b61ef634 | |||
| d70689626a | |||
| f1f673df6e | |||
| c1761a161c | |||
| 1495e9a0e3 | |||
| 62cec4d8e1 | |||
| c1cb407ea3 | |||
| b27babfa10 | |||
| 7906b788f8 | |||
| 08bd303ab3 | |||
| f93e16eb36 | |||
| fb5ba8f14e | |||
| 18bc3dfc5f | |||
| 738780f897 | |||
| 2223a9b23e | |||
| 4cf500cc96 | |||
| e7dc673395 | |||
| 572ee5c671 | |||
| 2e5059da33 | |||
| c945896da1 | |||
| 1054b87467 | |||
| a7c82d1238 | |||
| f6d7f3846d | |||
| b53cf770ae | |||
| 50192858e9 | |||
| d4bb77bae1 | |||
| 3bafc5110c | |||
| 31875ddd99 | |||
| 980ea59958 | |||
| 4ee211b481 |
@@ -33,7 +33,7 @@ turboPmac exports the following IOC shell functions:
|
||||
|
||||
The full turboPmacX.cmd file looks like this:
|
||||
|
||||
```
|
||||
```bash
|
||||
# Define the name of the controller and the corresponding port
|
||||
epicsEnvSet("DRIVER_PORT","turboPmacX")
|
||||
epicsEnvSet("IP_PORT","p$(DRIVER_PORT)")
|
||||
|
||||
-1
Submodule sinqMotor deleted from e234d05815
+19
-16
@@ -202,7 +202,7 @@ asynStatus turboPmacAxis::init() {
|
||||
// here to mm/s^2.
|
||||
motorAccel = motorAccel * 1000;
|
||||
|
||||
if (nvals != 8) {
|
||||
if (nvals != 7) {
|
||||
return pC_->couldNotParseResponse(command, response, axisNo_,
|
||||
__PRETTY_FUNCTION__, __LINE__);
|
||||
}
|
||||
@@ -620,16 +620,18 @@ asynStatus turboPmacAxis::handleError(int error, char *userMessage,
|
||||
if (pC_->getMsgPrintControl().shouldBePrinted(
|
||||
pC_->portName, axisNo_, __PRETTY_FUNCTION__, __LINE__, true,
|
||||
pC_->pasynUser())) {
|
||||
asynPrint(pC_->pasynUser(), ASYN_TRACE_ERROR,
|
||||
"Controller \"%s\", axis %d => %s, line %d\nAir cushion "
|
||||
"feedback stopped during movement (P%2.2d01 = %d).%s\n",
|
||||
pC_->portName, axisNo_, __PRETTY_FUNCTION__, __LINE__,
|
||||
axisNo_, error, pC_->getMsgPrintControl().getSuffix());
|
||||
asynPrint(
|
||||
pC_->pasynUser(), ASYN_TRACE_ERROR,
|
||||
"Controller \"%s\", axis %d => %s, line %d\nLost feedback "
|
||||
"from auxiliary device during movement (P%2.2d01 = %d).%s\n",
|
||||
pC_->portName, axisNo_, __PRETTY_FUNCTION__, __LINE__, axisNo_,
|
||||
error, pC_->getMsgPrintControl().getSuffix());
|
||||
}
|
||||
snprintf(userMessage, sizeUserMessage,
|
||||
"Air cushion feedback stopped during movement (P%2.2d01 = "
|
||||
"%d). Please call the support.",
|
||||
axisNo_, error);
|
||||
snprintf(
|
||||
userMessage, sizeUserMessage,
|
||||
"Lost feedback from auxiliary device during movement (P%2.2d01 = "
|
||||
"%d). Please call the support.",
|
||||
axisNo_, error);
|
||||
setAxisParamChecked(this, motorMessageText, userMessage);
|
||||
break;
|
||||
case 9:
|
||||
@@ -638,16 +640,17 @@ asynStatus turboPmacAxis::handleError(int error, char *userMessage,
|
||||
pC_->pasynUser())) {
|
||||
asynPrint(
|
||||
pC_->pasynUser(), ASYN_TRACE_ERROR,
|
||||
"Controller \"%s\", axis %d => %s, line %d\nNo air cushion "
|
||||
"feedback before movement start (P%2.2d01 = %d).%s\n",
|
||||
"Controller \"%s\", axis %d => %s, line %d\nNo feedback from "
|
||||
"auxiliary device before movement (P%2.2d01 = %d).%s\n",
|
||||
pC_->portName, axisNo_, __PRETTY_FUNCTION__, __LINE__, axisNo_,
|
||||
error, pC_->getMsgPrintControl().getSuffix());
|
||||
}
|
||||
|
||||
snprintf(userMessage, sizeUserMessage,
|
||||
"No air cushion feedback before movement start (P%2.2d01 = "
|
||||
"%d). Please call the support.",
|
||||
axisNo_, error);
|
||||
snprintf(
|
||||
userMessage, sizeUserMessage,
|
||||
"No feedback from auxiliary device before movement (P%2.2d01 = "
|
||||
"%d). Please call the support.",
|
||||
axisNo_, error);
|
||||
setAxisParamChecked(this, motorMessageText, userMessage);
|
||||
break;
|
||||
case 10:
|
||||
|
||||
Reference in New Issue
Block a user