From c1cb407ea3222b297badc3714d073be948e654ea Mon Sep 17 00:00:00 2001 From: smathis Date: Mon, 16 Jun 2025 16:18:06 +0200 Subject: [PATCH] Updated sinqMotor version --- src/turboPmacAxis.h | 10 +++------- src/turboPmacController.h | 6 +++++- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/turboPmacAxis.h b/src/turboPmacAxis.h index 38bb445..5a98ab2 100644 --- a/src/turboPmacAxis.h +++ b/src/turboPmacAxis.h @@ -1,15 +1,11 @@ #ifndef turboPmacAXIS_H #define turboPmacAXIS_H -#include "sinqAxis.h" +#include "sinqController.h" +#include "turboPmacController.h" #include struct turboPmacAxisImpl; -// Forward declaration of the controller class to resolve the cyclic dependency -// between the controller and the axis .h-file. See -// https://en.cppreference.com/w/cpp/language/class. -class turboPmacController; - class turboPmacAxis : public sinqAxis { public: /** @@ -145,7 +141,7 @@ class turboPmacAxis : public sinqAxis { /** * @brief Return a pointer to the axis controller */ - turboPmacController *pController() override { return pC_; }; + virtual turboPmacController *pController() override { return pC_; }; private: turboPmacController *pC_; diff --git a/src/turboPmacController.h b/src/turboPmacController.h index a886539..f9a8915 100644 --- a/src/turboPmacController.h +++ b/src/turboPmacController.h @@ -10,9 +10,13 @@ #define turboPmacController_H #include "sinqAxis.h" #include "sinqController.h" -#include "turboPmacAxis.h" #include +// Forward declaration of the controller class to resolve the cyclic dependency +// between the controller and the axis .h-file. See +// https://en.cppreference.com/w/cpp/language/class. +class turboPmacAxis; + struct turboPmacControllerImpl; class turboPmacController : public sinqController {