From c736c191d0d4280b941876833fa08740240fe8dd Mon Sep 17 00:00:00 2001 From: smathis Date: Tue, 10 Jun 2025 16:30:01 +0200 Subject: [PATCH] Updated dependency turboPmac to 1.1.1 --- src/seleneAngleAxis.cpp | 2 ++ src/seleneAngleAxis.h | 2 ++ src/seleneGuideController.cpp | 2 ++ src/seleneGuideController.h | 2 ++ src/seleneLiftAxis.cpp | 2 ++ src/seleneLiftAxis.h | 2 ++ src/seleneOffsetAxis.cpp | 2 ++ src/seleneOffsetAxis.h | 2 ++ turboPmac | 2 +- 9 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/seleneAngleAxis.cpp b/src/seleneAngleAxis.cpp index 6b8525c..2d6dd25 100644 --- a/src/seleneAngleAxis.cpp +++ b/src/seleneAngleAxis.cpp @@ -38,6 +38,8 @@ seleneAngleAxis::seleneAngleAxis(seleneGuideController *pController, int axisNo, } } +seleneAngleAxis::~seleneAngleAxis() {} + asynStatus seleneAngleAxis::stop(double acceleration) { return liftAxis_->stop(acceleration); } diff --git a/src/seleneAngleAxis.h b/src/seleneAngleAxis.h index 8b230c7..7c174ad 100644 --- a/src/seleneAngleAxis.h +++ b/src/seleneAngleAxis.h @@ -32,6 +32,8 @@ class seleneAngleAxis : public turboPmacAxis { seleneAngleAxis(seleneGuideController *pController, int axisNo, seleneLiftAxis *liftAxis); + virtual ~seleneAngleAxis(); + /** * @brief Implementation of the `stop` function from asynMotorAxis * diff --git a/src/seleneGuideController.cpp b/src/seleneGuideController.cpp index 8c85d25..546dfdc 100644 --- a/src/seleneGuideController.cpp +++ b/src/seleneGuideController.cpp @@ -48,6 +48,8 @@ seleneGuideController::seleneGuideController( } } +seleneGuideController::~seleneGuideController() {} + asynStatus seleneGuideController::writeInt32(asynUser *pasynUser, epicsInt32 value) { int function = pasynUser->reason; diff --git a/src/seleneGuideController.h b/src/seleneGuideController.h index dbdb6c8..2eb9d77 100644 --- a/src/seleneGuideController.h +++ b/src/seleneGuideController.h @@ -34,6 +34,8 @@ class seleneGuideController : public turboPmacController { int numAxes, double movingPollPeriod, double idlePollPeriod, double comTimeout); + virtual ~seleneGuideController(); + /** * @brief Overloaded function of turboPmacController * diff --git a/src/seleneLiftAxis.cpp b/src/seleneLiftAxis.cpp index 47ae811..8c024cd 100644 --- a/src/seleneLiftAxis.cpp +++ b/src/seleneLiftAxis.cpp @@ -115,6 +115,8 @@ seleneLiftAxis::seleneLiftAxis(seleneGuideController *pC, int axis1No, } } +seleneLiftAxis::~seleneLiftAxis() {} + asynStatus seleneLiftAxis::init() { // Local variable declaration diff --git a/src/seleneLiftAxis.h b/src/seleneLiftAxis.h index a590608..ecd767e 100644 --- a/src/seleneLiftAxis.h +++ b/src/seleneLiftAxis.h @@ -39,6 +39,8 @@ class seleneLiftAxis : public turboPmacAxis { int axis3No, int axis4No, int axis5No, int axis6No, int liftAxisNo, int angleAxisNo); + virtual ~seleneLiftAxis(); + /** * @brief Implementation of the `stop` function from asynMotorAxis * diff --git a/src/seleneOffsetAxis.cpp b/src/seleneOffsetAxis.cpp index e202aaf..83c8a9e 100644 --- a/src/seleneOffsetAxis.cpp +++ b/src/seleneOffsetAxis.cpp @@ -96,6 +96,8 @@ seleneOffsetAxis::seleneOffsetAxis(seleneGuideController *pController, } } +seleneOffsetAxis::~seleneOffsetAxis() {} + asynStatus seleneOffsetAxis::init() { // Local variable declaration diff --git a/src/seleneOffsetAxis.h b/src/seleneOffsetAxis.h index 2696b38..b13c01b 100644 --- a/src/seleneOffsetAxis.h +++ b/src/seleneOffsetAxis.h @@ -30,6 +30,8 @@ class seleneOffsetAxis : public turboPmacAxis { seleneOffsetAxis(seleneGuideController *pController, int axisNo, double xPos, double zPos); + virtual ~seleneOffsetAxis(); + /** * @brief Initialize this offset axis * diff --git a/turboPmac b/turboPmac index a11d10c..4bc3388 160000 --- a/turboPmac +++ b/turboPmac @@ -1 +1 @@ -Subproject commit a11d10cb6ca6770a9168c0a0ef6ef1e7f6436cdc +Subproject commit 4bc3388bc60fdb7b10494093d264c742aa1ccd42