Updated param lib accessors to use macro to reduce boilerplate
This commit is contained in:
@ -1,4 +1,7 @@
|
|||||||
#include "seleneGuideController.h"
|
#include "seleneGuideController.h"
|
||||||
|
#include "seleneAngleAxis.h"
|
||||||
|
#include "seleneLiftAxis.h"
|
||||||
|
#include "seleneOffsetAxis.h"
|
||||||
#include "turboPmacController.h"
|
#include "turboPmacController.h"
|
||||||
#include <epicsExport.h>
|
#include <epicsExport.h>
|
||||||
#include <errlog.h>
|
#include <errlog.h>
|
||||||
|
@ -434,19 +434,16 @@ asynStatus seleneLiftAxis::startCombinedMove() {
|
|||||||
|
|
||||||
asynStatus seleneLiftAxis::stop(double acceleration) {
|
asynStatus seleneLiftAxis::stop(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 response[pC_->MAXBUF_] = {0};
|
char response[pC_->MAXBUF_] = {0};
|
||||||
|
|
||||||
// =========================================================================
|
// =========================================================================
|
||||||
|
|
||||||
// Stop all axes
|
// Stop all axes
|
||||||
rw_status = pC_->writeRead(axisNo_, "P150=8", response, 0);
|
status = pC_->writeRead(axisNo_, "P150=8", response, 0);
|
||||||
|
|
||||||
if (rw_status != asynSuccess) {
|
if (status != asynSuccess) {
|
||||||
asynPrint(
|
asynPrint(
|
||||||
pC_->pasynUser(), ASYN_TRACE_ERROR,
|
pC_->pasynUser(), ASYN_TRACE_ERROR,
|
||||||
"Controller \"%s\", axis %d => %s, line %d\nStopping the movement "
|
"Controller \"%s\", axis %d => %s, line %d\nStopping the movement "
|
||||||
@ -456,7 +453,7 @@ asynStatus seleneLiftAxis::stop(double acceleration) {
|
|||||||
setAxisParamChecked(this, motorStatusProblem, true);
|
setAxisParamChecked(this, motorStatusProblem, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
return rw_status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
asynStatus seleneLiftAxis::doReset() {
|
asynStatus seleneLiftAxis::doReset() {
|
||||||
|
Reference in New Issue
Block a user