Move changes to templates

mavlink · Oct 14, 2020 · 98e2f48 · 98e2f48
1 parent 91262a0
commit 98e2f48
Show file tree

Hide file tree

Showing 76 changed files with 525 additions and 101 deletions.
diff --git a/src/plugins/action/action.cpp b/src/plugins/action/action.cpp
@@ -11,8 +11,7 @@ namespace mavsdk {
 
 Action::Action(System& system) : PluginBase(), _impl{new ActionImpl(system)} {}
 
-Action::Action(std::shared_ptr<System> system_ptr) : PluginBase(), _impl{new ActionImpl(system_ptr)}
-{}
+Action::Action(std::shared_ptr<System> system) : PluginBase(), _impl{new ActionImpl(system)} {}
 
 Action::~Action() {}
 

diff --git a/src/plugins/action/include/plugins/action/action.h b/src/plugins/action/include/plugins/action/action.h
@@ -31,14 +31,25 @@ class Action : public PluginBase {
      * The plugin is typically created as shown below:
      *
      *     ```cpp
-     *     auto action = std::make_shared<Action>(system);
+     *     auto action = Action(system);
      *     ```
      *
      * @param system The specific system associated with this plugin.
      */
-    explicit Action(System& system);
+    explicit Action(System& system); // deprecated
 
-    explicit Action(std::shared_ptr<System> system);
+    /**
+     * @brief Constructor. Creates the plugin for a specific System.
+     *
+     * The plugin is typically created as shown below:
+     *
+     *     ```cpp
+     *     auto action = Action(system);
+     *     ```
+     *
+     * @param system The specific system associated with this plugin.
+     */
+    explicit Action(std::shared_ptr<System> system); // new
 
     /**
      * @brief Destructor (internal use only).
@@ -479,9 +490,9 @@ class Action : public PluginBase {
     Result set_return_to_launch_altitude(float relative_altitude_m) const;
 
     /**
-     * @brief Copy constructor (object is not copyable).
+     * @brief Copy constructor.
      */
-    Action(const Action&) = delete;
+    Action(const Action& other);
 
     /**
      * @brief Equality operator (object is not copyable).

diff --git a/src/plugins/calibration/calibration.cpp b/src/plugins/calibration/calibration.cpp
@@ -13,6 +13,11 @@ using ProgressData = Calibration::ProgressData;
 
 Calibration::Calibration(System& system) : PluginBase(), _impl{new CalibrationImpl(system)} {}
 
+Calibration::Calibration(std::shared_ptr<System> system) :
+    PluginBase(),
+    _impl{new CalibrationImpl(system)}
+{}
+
 Calibration::~Calibration() {}
 
 void Calibration::calibrate_gyro_async(CalibrateGyroCallback callback)

diff --git a/src/plugins/calibration/calibration_impl.cpp b/src/plugins/calibration/calibration_impl.cpp
@@ -16,6 +16,11 @@ CalibrationImpl::CalibrationImpl(System& system) : PluginImplBase(system)
     _parent->register_plugin(this);
 }
 
+CalibrationImpl::CalibrationImpl(std::shared_ptr<System> system) : PluginImplBase(system)
+{
+    _parent->register_plugin(this);
+}
+
 CalibrationImpl::~CalibrationImpl()
 {
     _parent->unregister_plugin(this);

diff --git a/src/plugins/calibration/calibration_impl.h b/src/plugins/calibration/calibration_impl.h
@@ -10,7 +10,8 @@ namespace mavsdk {
 
 class CalibrationImpl : public PluginImplBase {
 public:
-    CalibrationImpl(System& system);
+    explicit CalibrationImpl(System& system);
+    explicit CalibrationImpl(std::shared_ptr<System> system);
     ~CalibrationImpl();
 
     void init() override;

diff --git a/src/plugins/calibration/include/plugins/calibration/calibration.h b/src/plugins/calibration/include/plugins/calibration/calibration.h
@@ -31,12 +31,25 @@ class Calibration : public PluginBase {
      * The plugin is typically created as shown below:
      *
      *     ```cpp
-     *     auto calibration = std::make_shared<Calibration>(system);
+     *     auto calibration = Calibration(system);
      *     ```
      *
      * @param system The specific system associated with this plugin.
      */
-    explicit Calibration(System& system);
+    explicit Calibration(System& system); // deprecated
+
+    /**
+     * @brief Constructor. Creates the plugin for a specific System.
+     *
+     * The plugin is typically created as shown below:
+     *
+     *     ```cpp
+     *     auto calibration = Calibration(system);
+     *     ```
+     *
+     * @param system The specific system associated with this plugin.
+     */
+    explicit Calibration(std::shared_ptr<System> system); // new
 
     /**
      * @brief Destructor (internal use only).
@@ -169,9 +182,9 @@ class Calibration : public PluginBase {
     void cancel() const;
 
     /**
-     * @brief Copy constructor (object is not copyable).
+     * @brief Copy constructor.
      */
-    Calibration(const Calibration&) = delete;
+    Calibration(const Calibration& other);
 
     /**
      * @brief Equality operator (object is not copyable).

diff --git a/src/plugins/camera/camera.cpp b/src/plugins/camera/camera.cpp
@@ -23,6 +23,8 @@ using Information = Camera::Information;
 
 Camera::Camera(System& system) : PluginBase(), _impl{new CameraImpl(system)} {}
 
+Camera::Camera(std::shared_ptr<System> system) : PluginBase(), _impl{new CameraImpl(system)} {}
+
 Camera::~Camera() {}
 
 void Camera::take_photo_async(const ResultCallback callback)

diff --git a/src/plugins/camera/camera_impl.cpp b/src/plugins/camera/camera_impl.cpp
@@ -17,6 +17,11 @@ CameraImpl::CameraImpl(System& system) : PluginImplBase(system)
     _parent->register_plugin(this);
 }
 
+CameraImpl::CameraImpl(std::shared_ptr<System> system) : PluginImplBase(system)
+{
+    _parent->register_plugin(this);
+}
+
 CameraImpl::~CameraImpl()
 {
     _parent->unregister_plugin(this);

diff --git a/src/plugins/camera/camera_impl.h b/src/plugins/camera/camera_impl.h
@@ -10,7 +10,8 @@ namespace mavsdk {
 
 class CameraImpl : public PluginImplBase {
 public:
-    CameraImpl(System& system);
+    explicit CameraImpl(System& system);
+    explicit CameraImpl(std::shared_ptr<System> system);
     ~CameraImpl();
 
     void init() override;

diff --git a/src/plugins/camera/include/plugins/camera/camera.h b/src/plugins/camera/include/plugins/camera/camera.h
@@ -37,12 +37,25 @@ class Camera : public PluginBase {
      * The plugin is typically created as shown below:
      *
      *     ```cpp
-     *     auto camera = std::make_shared<Camera>(system);
+     *     auto camera = Camera(system);
      *     ```
      *
      * @param system The specific system associated with this plugin.
      */
-    explicit Camera(System& system);
+    explicit Camera(System& system); // deprecated
+
+    /**
+     * @brief Constructor. Creates the plugin for a specific System.
+     *
+     * The plugin is typically created as shown below:
+     *
+     *     ```cpp
+     *     auto camera = Camera(system);
+     *     ```
+     *
+     * @param system The specific system associated with this plugin.
+     */
+    explicit Camera(std::shared_ptr<System> system); // new
 
     /**
      * @brief Destructor (internal use only).
@@ -707,9 +720,9 @@ class Camera : public PluginBase {
     Result format_storage() const;
 
     /**
-     * @brief Copy constructor (object is not copyable).
+     * @brief Copy constructor.
      */
-    Camera(const Camera&) = delete;
+    Camera(const Camera& other);
 
     /**
      * @brief Equality operator (object is not copyable).

diff --git a/src/plugins/failure/failure.cpp b/src/plugins/failure/failure.cpp
@@ -11,6 +11,8 @@ namespace mavsdk {
 
 Failure::Failure(System& system) : PluginBase(), _impl{new FailureImpl(system)} {}
 
+Failure::Failure(std::shared_ptr<System> system) : PluginBase(), _impl{new FailureImpl(system)} {}
+
 Failure::~Failure() {}
 
 Failure::Result

diff --git a/src/plugins/failure/failure_impl.cpp b/src/plugins/failure/failure_impl.cpp
@@ -7,6 +7,11 @@ FailureImpl::FailureImpl(System& system) : PluginImplBase(system)
     _parent->register_plugin(this);
 }
 
+FailureImpl::FailureImpl(std::shared_ptr<System> system) : PluginImplBase(system)
+{
+    _parent->register_plugin(this);
+}
+
 FailureImpl::~FailureImpl()
 {
     _parent->unregister_plugin(this);

diff --git a/src/plugins/failure/failure_impl.h b/src/plugins/failure/failure_impl.h
@@ -7,7 +7,8 @@ namespace mavsdk {
 
 class FailureImpl : public PluginImplBase {
 public:
-    FailureImpl(System& system);
+    explicit FailureImpl(System& system);
+    explicit FailureImpl(std::shared_ptr<System> system);
     ~FailureImpl();
 
     void init() override;

diff --git a/src/plugins/failure/include/plugins/failure/failure.h b/src/plugins/failure/include/plugins/failure/failure.h
@@ -31,12 +31,25 @@ class Failure : public PluginBase {
      * The plugin is typically created as shown below:
      *
      *     ```cpp
-     *     auto failure = std::make_shared<Failure>(system);
+     *     auto failure = Failure(system);
      *     ```
      *
      * @param system The specific system associated with this plugin.
      */
-    explicit Failure(System& system);
+    explicit Failure(System& system); // deprecated
+
+    /**
+     * @brief Constructor. Creates the plugin for a specific System.
+     *
+     * The plugin is typically created as shown below:
+     *
+     *     ```cpp
+     *     auto failure = Failure(system);
+     *     ```
+     *
+     * @param system The specific system associated with this plugin.
+     */
+    explicit Failure(std::shared_ptr<System> system); // new
 
     /**
      * @brief Destructor (internal use only).
@@ -128,9 +141,9 @@ class Failure : public PluginBase {
     Result inject(FailureUnit failure_unit, FailureType failure_type, int32_t instance) const;
 
     /**
-     * @brief Copy constructor (object is not copyable).
+     * @brief Copy constructor.
      */
-    Failure(const Failure&) = delete;
+    Failure(const Failure& other);
 
     /**
      * @brief Equality operator (object is not copyable).

diff --git a/src/plugins/follow_me/follow_me.cpp b/src/plugins/follow_me/follow_me.cpp
@@ -14,6 +14,9 @@ using TargetLocation = FollowMe::TargetLocation;
 
 FollowMe::FollowMe(System& system) : PluginBase(), _impl{new FollowMeImpl(system)} {}
 
+FollowMe::FollowMe(std::shared_ptr<System> system) : PluginBase(), _impl{new FollowMeImpl(system)}
+{}
+
 FollowMe::~FollowMe() {}
 
 FollowMe::Config FollowMe::get_config() const

diff --git a/src/plugins/follow_me/follow_me_impl.cpp b/src/plugins/follow_me/follow_me_impl.cpp
@@ -13,6 +13,13 @@ FollowMeImpl::FollowMeImpl(System& system) : PluginImplBase(system)
     _parent->register_plugin(this);
 }
 
+FollowMeImpl::FollowMeImpl(std::shared_ptr<System> system) : PluginImplBase(system)
+{
+    // (Lat, Lon, Alt) => double, (vx, vy, vz) => float
+    _last_location = _target_location = FollowMe::TargetLocation{};
+    _parent->register_plugin(this);
+}
+
 FollowMeImpl::~FollowMeImpl()
 {
     if (_target_location_cookie) {

diff --git a/src/plugins/follow_me/follow_me_impl.h b/src/plugins/follow_me/follow_me_impl.h
@@ -12,7 +12,8 @@ namespace mavsdk {
 
 class FollowMeImpl : public PluginImplBase {
 public:
-    FollowMeImpl(System& system);
+    explicit FollowMeImpl(System& system);
+    explicit FollowMeImpl(std::shared_ptr<System> system);
     ~FollowMeImpl();
 
     void init() override;

diff --git a/src/plugins/follow_me/include/plugins/follow_me/follow_me.h b/src/plugins/follow_me/include/plugins/follow_me/follow_me.h
@@ -32,12 +32,25 @@ class FollowMe : public PluginBase {
      * The plugin is typically created as shown below:
      *
      *     ```cpp
-     *     auto follow_me = std::make_shared<FollowMe>(system);
+     *     auto follow_me = FollowMe(system);
      *     ```
      *
      * @param system The specific system associated with this plugin.
      */
-    explicit FollowMe(System& system);
+    explicit FollowMe(System& system); // deprecated
+
+    /**
+     * @brief Constructor. Creates the plugin for a specific System.
+     *
+     * The plugin is typically created as shown below:
+     *
+     *     ```cpp
+     *     auto follow_me = FollowMe(system);
+     *     ```
+     *
+     * @param system The specific system associated with this plugin.
+     */
+    explicit FollowMe(std::shared_ptr<System> system); // new
 
     /**
      * @brief Destructor (internal use only).
@@ -212,9 +225,9 @@ class FollowMe : public PluginBase {
     Result stop() const;
 
     /**
-     * @brief Copy constructor (object is not copyable).
+     * @brief Copy constructor.
      */
-    FollowMe(const FollowMe&) = delete;
+    FollowMe(const FollowMe& other);
 
     /**
      * @brief Equality operator (object is not copyable).

diff --git a/src/plugins/ftp/ftp.cpp b/src/plugins/ftp/ftp.cpp
@@ -13,6 +13,8 @@ using ProgressData = Ftp::ProgressData;
 
 Ftp::Ftp(System& system) : PluginBase(), _impl{new FtpImpl(system)} {}
 
+Ftp::Ftp(std::shared_ptr<System> system) : PluginBase(), _impl{new FtpImpl(system)} {}
+
 Ftp::~Ftp() {}
 
 void Ftp::reset_async(const ResultCallback callback)

diff --git a/src/plugins/ftp/ftp_impl.cpp b/src/plugins/ftp/ftp_impl.cpp
@@ -26,6 +26,11 @@ FtpImpl::FtpImpl(System& system) : PluginImplBase(system)
     _parent->register_plugin(this);
 }
 
+FtpImpl::FtpImpl(std::shared_ptr<System> system) : PluginImplBase(system)
+{
+    _parent->register_plugin(this);
+}
+
 FtpImpl::~FtpImpl()
 {
     _parent->unregister_plugin(this);

diff --git a/src/plugins/ftp/ftp_impl.h b/src/plugins/ftp/ftp_impl.h
@@ -20,7 +20,8 @@ namespace mavsdk {
 
 class FtpImpl : public PluginImplBase {
 public:
-    FtpImpl(System& system);
+    explicit FtpImpl(System& system);
+    explicit FtpImpl(std::shared_ptr<System> system);
     FtpImpl(const FtpImpl&) = delete;
     const FtpImpl& operator=(const FtpImpl&) = delete;