diff --git a/libraries/AP_Compass/AP_Compass_RM3100.cpp b/libraries/AP_Compass/AP_Compass_RM3100.cpp index bfb2891cdd..137f15bde0 100644 --- a/libraries/AP_Compass/AP_Compass_RM3100.cpp +++ b/libraries/AP_Compass/AP_Compass_RM3100.cpp @@ -64,15 +64,14 @@ extern const AP_HAL::HAL &hal; -AP_Compass_Backend *AP_Compass_RM3100::probe(Compass &compass, - AP_HAL::OwnPtr dev, +AP_Compass_Backend *AP_Compass_RM3100::probe(AP_HAL::OwnPtr dev, bool force_external, enum Rotation rotation) { if (!dev) { return nullptr; } - AP_Compass_RM3100 *sensor = new AP_Compass_RM3100(compass, std::move(dev), force_external, rotation); + AP_Compass_RM3100 *sensor = new AP_Compass_RM3100(std::move(dev), force_external, rotation); if (!sensor || !sensor->init()) { delete sensor; return nullptr; @@ -81,12 +80,10 @@ AP_Compass_Backend *AP_Compass_RM3100::probe(Compass &compass, return sensor; } -AP_Compass_RM3100::AP_Compass_RM3100(Compass &compass, - AP_HAL::OwnPtr _dev, +AP_Compass_RM3100::AP_Compass_RM3100(AP_HAL::OwnPtr _dev, bool _force_external, enum Rotation _rotation) - : AP_Compass_Backend(compass) - , dev(std::move(_dev)) + : dev(std::move(_dev)) , force_external(_force_external) , rotation(_rotation) { diff --git a/libraries/AP_Compass/AP_Compass_RM3100.h b/libraries/AP_Compass/AP_Compass_RM3100.h index 23541fb1b6..0667a6d4f8 100644 --- a/libraries/AP_Compass/AP_Compass_RM3100.h +++ b/libraries/AP_Compass/AP_Compass_RM3100.h @@ -29,8 +29,7 @@ class AP_Compass_RM3100 : public AP_Compass_Backend { public: - static AP_Compass_Backend *probe(Compass &compass, - AP_HAL::OwnPtr dev, + static AP_Compass_Backend *probe(AP_HAL::OwnPtr dev, bool force_external = false, enum Rotation rotation = ROTATION_NONE); @@ -39,7 +38,7 @@ public: static constexpr const char *name = "RM3100"; private: - AP_Compass_RM3100(Compass &compass, AP_HAL::OwnPtr dev, + AP_Compass_RM3100(AP_HAL::OwnPtr dev, bool force_external, enum Rotation rotation);