Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 2a018ea770 | |||
| f60f3785c5 | |||
| 72e2529ab5 | |||
| ae90b5cbe6 |
@@ -32,5 +32,5 @@ TEMPLATES += db/el734.db
|
|||||||
DBDS += sinqMotor/src/sinqMotor.dbd
|
DBDS += sinqMotor/src/sinqMotor.dbd
|
||||||
DBDS += src/el734.dbd
|
DBDS += src/el734.dbd
|
||||||
|
|
||||||
USR_CFLAGS += -Wall -Wextra -Wunused-result -Werror -fvisibility=hidden # -Wpedantic // Does not work because EPICS macros trigger warnings
|
USR_CFLAGS += -Wall -Wextra -Wunused-result -Werror # -Wpedantic // Does not work because EPICS macros trigger warnings
|
||||||
USR_CXXFLAGS += -Wall -Wextra -Wunused-result -fvisibility=hidden
|
USR_CXXFLAGS += -Wall -Wextra -Wunused-result -Werror
|
||||||
|
|||||||
+1
-1
Submodule sinqMotor updated: 59a5ba452f...e234d05815
@@ -681,6 +681,14 @@ asynStatus el734Axis::readEncoderType() {
|
|||||||
case 4:
|
case 4:
|
||||||
setAxisParamChecked(this, encoderType, AbsoluteEncoder);
|
setAxisParamChecked(this, encoderType, AbsoluteEncoder);
|
||||||
break;
|
break;
|
||||||
|
default:
|
||||||
|
asynPrint(pC_->pasynUser(), ASYN_TRACE_ERROR,
|
||||||
|
"Controller \"%s\", axis %d => %s, line %d\nUnknown encoder "
|
||||||
|
"type %d. Please call the support.\n",
|
||||||
|
pC_->portName, axisNo_, __PRETTY_FUNCTION__, __LINE__,
|
||||||
|
encoder_type);
|
||||||
|
setAxisParamChecked(this, motorStatusProblem, true);
|
||||||
|
return asynError;
|
||||||
}
|
}
|
||||||
return asynSuccess;
|
return asynSuccess;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -36,6 +36,7 @@ el734Controller::el734Controller(const char *portName,
|
|||||||
pEl734C_(std::make_unique<el734ControllerImpl>((el734ControllerImpl){
|
pEl734C_(std::make_unique<el734ControllerImpl>((el734ControllerImpl){
|
||||||
.comTimeout = comTimeout,
|
.comTimeout = comTimeout,
|
||||||
.lastResponse = {0},
|
.lastResponse = {0},
|
||||||
|
.pasynInt32SyncIOipPort = nullptr,
|
||||||
.limFromHardware = 0,
|
.limFromHardware = 0,
|
||||||
}))
|
}))
|
||||||
|
|
||||||
@@ -127,10 +128,8 @@ asynStatus el734Controller::writeRead(int axisNo, const char *command,
|
|||||||
|
|
||||||
// Definition of local variables.
|
// Definition of local variables.
|
||||||
asynStatus status = asynSuccess;
|
asynStatus status = asynSuccess;
|
||||||
asynStatus timeoutStatus = asynSuccess;
|
|
||||||
char drvMessageText[MAXBUF_] = {0};
|
char drvMessageText[MAXBUF_] = {0};
|
||||||
int motorStatusProblem = 0;
|
int motorStatusProblem = 0;
|
||||||
int numReceivedResponses = 0;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
asyn defines the following reasons for an end-of-message coming from the MCU
|
asyn defines the following reasons for an end-of-message coming from the MCU
|
||||||
@@ -354,8 +353,9 @@ static const iocshArg CreateControllerArg5 = {"Communication timeout (s)",
|
|||||||
static const iocshArg *const CreateControllerArgs[] = {
|
static const iocshArg *const CreateControllerArgs[] = {
|
||||||
&CreateControllerArg0, &CreateControllerArg1, &CreateControllerArg2,
|
&CreateControllerArg0, &CreateControllerArg1, &CreateControllerArg2,
|
||||||
&CreateControllerArg3, &CreateControllerArg4, &CreateControllerArg5};
|
&CreateControllerArg3, &CreateControllerArg4, &CreateControllerArg5};
|
||||||
static const iocshFuncDef configEl734CreateController = {"el734Controller", 6,
|
static const iocshFuncDef configEl734CreateController = {
|
||||||
CreateControllerArgs};
|
"el734Controller", 6, CreateControllerArgs,
|
||||||
|
"Create a new instance of an EL734 controller."};
|
||||||
static void configEl734CreateControllerCallFunc(const iocshArgBuf *args) {
|
static void configEl734CreateControllerCallFunc(const iocshArgBuf *args) {
|
||||||
el734CreateController(args[0].sval, args[1].sval, args[2].ival,
|
el734CreateController(args[0].sval, args[1].sval, args[2].ival,
|
||||||
args[3].dval, args[4].dval, args[5].dval);
|
args[3].dval, args[4].dval, args[5].dval);
|
||||||
|
|||||||
Reference in New Issue
Block a user