From dde15eb30d4487c887b22d8e799d0ee929e18218 Mon Sep 17 00:00:00 2001 From: smathis Date: Wed, 18 Jun 2025 10:19:43 +0200 Subject: [PATCH] Updated param lib accessors to use macro to reduce boilerplate --- src/seleneGuideController.cpp | 3 +++ src/seleneLiftAxis.cpp | 11 ++++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/seleneGuideController.cpp b/src/seleneGuideController.cpp index 546dfdc..0b52e76 100644 --- a/src/seleneGuideController.cpp +++ b/src/seleneGuideController.cpp @@ -1,4 +1,7 @@ #include "seleneGuideController.h" +#include "seleneAngleAxis.h" +#include "seleneLiftAxis.h" +#include "seleneOffsetAxis.h" #include "turboPmacController.h" #include #include diff --git a/src/seleneLiftAxis.cpp b/src/seleneLiftAxis.cpp index 4e15c83..47f409b 100644 --- a/src/seleneLiftAxis.cpp +++ b/src/seleneLiftAxis.cpp @@ -434,19 +434,16 @@ asynStatus seleneLiftAxis::startCombinedMove() { asynStatus seleneLiftAxis::stop(double acceleration) { // Status of read-write-operations of ASCII commands to the controller - asynStatus rw_status = asynSuccess; - - // Status of parameter library operations - asynStatus pl_status = asynSuccess; + asynStatus status = asynSuccess; char response[pC_->MAXBUF_] = {0}; // ========================================================================= // 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( pC_->pasynUser(), ASYN_TRACE_ERROR, "Controller \"%s\", axis %d => %s, line %d\nStopping the movement " @@ -456,7 +453,7 @@ asynStatus seleneLiftAxis::stop(double acceleration) { setAxisParamChecked(this, motorStatusProblem, true); } - return rw_status; + return status; } asynStatus seleneLiftAxis::doReset() {