diff --git a/src/detectorTowerController.cpp b/src/detectorTowerController.cpp index 3d6fbb1..4efa924 100644 --- a/src/detectorTowerController.cpp +++ b/src/detectorTowerController.cpp @@ -106,6 +106,8 @@ detectorTowerController::detectorTowerController( } } +detectorTowerController::~detectorTowerController() {} + asynStatus detectorTowerController::readInt32(asynUser *pasynUser, epicsInt32 *value) { diff --git a/src/detectorTowerController.h b/src/detectorTowerController.h index 7dfc931..73bf130 100644 --- a/src/detectorTowerController.h +++ b/src/detectorTowerController.h @@ -35,6 +35,8 @@ class detectorTowerController : public turboPmacController { int numAxes, double movingPollPeriod, double idlePollPeriod, double comTimeout); + virtual ~detectorTowerController(); + /** * @brief Overloaded function of turboPmacController * diff --git a/src/detectorTowerLiftAxis.h b/src/detectorTowerLiftAxis.h index 7f933f5..a9c331a 100644 --- a/src/detectorTowerLiftAxis.h +++ b/src/detectorTowerLiftAxis.h @@ -19,10 +19,6 @@ class detectorTowerLiftAxis : public turboPmacAxis { detectorTowerLiftAxis(detectorTowerController *pController, int axisNo, detectorTowerAngleAxis *angleAxis); - /** - * @brief Destroy the turboPmacAxis - * - */ virtual ~detectorTowerLiftAxis(); /** diff --git a/src/detectorTowerSupportAxis.cpp b/src/detectorTowerSupportAxis.cpp index ef9e17b..a0a2742 100644 --- a/src/detectorTowerSupportAxis.cpp +++ b/src/detectorTowerSupportAxis.cpp @@ -155,7 +155,7 @@ asynStatus detectorTowerSupportAxis::poll(bool *moving) { __LINE__); } } - wasMoving_ = *moving; + setWasMoving(*moving); return status; } diff --git a/src/detectorTowerSupportAxis.h b/src/detectorTowerSupportAxis.h index 8be316d..62a9c54 100644 --- a/src/detectorTowerSupportAxis.h +++ b/src/detectorTowerSupportAxis.h @@ -24,10 +24,6 @@ class detectorTowerSupportAxis : public turboPmacAxis { detectorTowerSupportAxis(detectorTowerController *pController, int axisNo, detectorTowerAngleAxis *angleAxis); - /** - * @brief Destroy the detectorTowerSupportAxis - * - */ virtual ~detectorTowerSupportAxis(); /**