Updated sinqMotor version
This commit is contained in:
Submodule sinqMotor updated: 603b3e77af...2f8ae23d57
@ -1,15 +1,11 @@
|
|||||||
#ifndef turboPmacAXIS_H
|
#ifndef turboPmacAXIS_H
|
||||||
#define turboPmacAXIS_H
|
#define turboPmacAXIS_H
|
||||||
#include "sinqAxis.h"
|
#include "sinqController.h"
|
||||||
|
#include "turboPmacController.h"
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
|
||||||
struct turboPmacAxisImpl;
|
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 {
|
class turboPmacAxis : public sinqAxis {
|
||||||
public:
|
public:
|
||||||
/**
|
/**
|
||||||
@ -145,7 +141,7 @@ class turboPmacAxis : public sinqAxis {
|
|||||||
/**
|
/**
|
||||||
* @brief Return a pointer to the axis controller
|
* @brief Return a pointer to the axis controller
|
||||||
*/
|
*/
|
||||||
turboPmacController *pController() override { return pC_; };
|
virtual turboPmacController *pController() override { return pC_; };
|
||||||
|
|
||||||
private:
|
private:
|
||||||
turboPmacController *pC_;
|
turboPmacController *pC_;
|
||||||
|
@ -10,9 +10,13 @@
|
|||||||
#define turboPmacController_H
|
#define turboPmacController_H
|
||||||
#include "sinqAxis.h"
|
#include "sinqAxis.h"
|
||||||
#include "sinqController.h"
|
#include "sinqController.h"
|
||||||
#include "turboPmacAxis.h"
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
|
||||||
|
// 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;
|
struct turboPmacControllerImpl;
|
||||||
|
|
||||||
class turboPmacController : public sinqController {
|
class turboPmacController : public sinqController {
|
||||||
|
Reference in New Issue
Block a user