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

Removed unneeded variables

Browse Source
This commit is contained in:
mathis_s
2025-06-18 08:55:12 +02:00
parent ca52a7398e
commit 5e61af6625
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/beamShiftAxis.cpp
View File

@ -146,7 +146,7 @@ asynStatus beamShiftAxis::doPoll(bool *moving) {
asynStatus errorStatus = asynSuccess; asynStatus errorStatus = asynSuccess;
// Status of read-write-operations of ASCII commands to the controller // Status of read-write-operations of ASCII commands to the controller
asynStatus rw_status = asynSuccess; asynStatus status = asynSuccess;
// Status of parameter library operations // Status of parameter library operations
asynStatus pl_status = asynSuccess; asynStatus pl_status = asynSuccess;
@ -182,9 +182,9 @@ asynStatus beamShiftAxis::doPoll(bool *moving) {
- Lower limit - Lower limit
*/ */
snprintf(command, sizeof(command), "P154 Q110 P158 P159 Q113 Q114"); snprintf(command, sizeof(command), "P154 Q110 P158 P159 Q113 Q114");
rw_status = pC_->writeRead(axisNo(), command, response, 6); status = pC_->writeRead(axisNo(), command, response, 6);
if (rw_status != asynSuccess) { if (status != asynSuccess) {
return rw_status; return status;
}; };
nvals = sscanf(response, "%d %lf %d %d %lf %lf", (int *)moving, nvals = sscanf(response, "%d %lf %d %d %lf %lf", (int *)moving,
@ -393,10 +393,7 @@ asynStatus beamShiftAxis::doMove(double position, int relative,
double acceleration) { double acceleration) {
// Status of read-write-operations of ASCII commands to the controller // Status of read-write-operations of ASCII commands to the controller
asynStatus rw_status = asynSuccess; asynStatus status = asynSuccess;
// Status of parameter library operations
asynStatus pl_status = asynSuccess;
char command[pC_->MAXBUF_] = {0}; char command[pC_->MAXBUF_] = {0};
char response[pC_->MAXBUF_] = {0}; char response[pC_->MAXBUF_] = {0};
@ -430,8 +427,8 @@ asynStatus beamShiftAxis::doMove(double position, int relative,
motorCoordinatesPosition); motorCoordinatesPosition);
// We don't expect an answer // We don't expect an answer
rw_status = pC_->writeRead(axisNo(), command, response, 0); status = pC_->writeRead(axisNo(), command, response, 0);
if (rw_status != asynSuccess) { if (status != asynSuccess) {
asynPrint( asynPrint(
pC_->pasynUser(), ASYN_TRACE_ERROR, pC_->pasynUser(), ASYN_TRACE_ERROR,
@ -441,7 +438,7 @@ asynStatus beamShiftAxis::doMove(double position, int relative,
motorCoordinatesPosition); motorCoordinatesPosition);
setAxisParamChecked(this, motorStatusProblem, true); setAxisParamChecked(this, motorStatusProblem, true);
} }
return rw_status; return status;
} }
asynStatus beamShiftAxis::stop(double acceleration) { asynStatus beamShiftAxis::stop(double acceleration) {
@ -483,7 +480,6 @@ asynStatus beamShiftAxis::enable(bool on) {
char command[pC_->MAXBUF_] = {0}; char command[pC_->MAXBUF_] = {0};
char response[pC_->MAXBUF_] = {0}; char response[pC_->MAXBUF_] = {0};
char userMessage[pC_->MAXBUF_] = {0}; char userMessage[pC_->MAXBUF_] = {0};
asynStatus status = asynSuccess;
int nvals = 0; int nvals = 0;
int error = 0; int error = 0;
int enabled = 0; int enabled = 0;
@ -495,7 +491,10 @@ asynStatus beamShiftAxis::enable(bool on) {
if (on) { if (on) {
// Check if the axis is currently switched off // Check if the axis is currently switched off
snprintf(command, sizeof(command), "P158 P159"); snprintf(command, sizeof(command), "P158 P159");
status = pC_->writeRead(axisNo(), command, response, 2); asynStatus status = pC_->writeRead(axisNo(), command, response, 2);
if (status != asynSuccess) {
return status;
}
nvals = sscanf(response, "%d %d", &enabled, &error); nvals = sscanf(response, "%d %d", &enabled, &error);
if (nvals != 2) { if (nvals != 2) {