Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_Airspeed: reuse airspeed backend contructor in more backends 

... and clean out some unused includes
This commit is contained in:
Peter Barker 2022-08-01 11:02:23 +10:00 committed by Peter Barker
parent 4f355f7c8b
commit 89a1330801
9 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libraries/AP_Airspeed/AP_Airspeed_DroneCAN.cpp
View File

@ -13,11 +13,6 @@ extern const AP_HAL::HAL& hal;
AP_Airspeed_DroneCAN::DetectedModules AP_Airspeed_DroneCAN::_detected_modules[]; AP_Airspeed_DroneCAN::DetectedModules AP_Airspeed_DroneCAN::_detected_modules[];
HAL_Semaphore AP_Airspeed_DroneCAN::_sem_registry; HAL_Semaphore AP_Airspeed_DroneCAN::_sem_registry;
// constructor
AP_Airspeed_DroneCAN::AP_Airspeed_DroneCAN(AP_Airspeed &_frontend, uint8_t _instance) :
AP_Airspeed_Backend(_frontend, _instance)
{}
void AP_Airspeed_DroneCAN::subscribe_msgs(AP_DroneCAN* ap_dronecan) void AP_Airspeed_DroneCAN::subscribe_msgs(AP_DroneCAN* ap_dronecan)
{ {
if (ap_dronecan == nullptr) { if (ap_dronecan == nullptr) {

3
libraries/AP_Airspeed/AP_Airspeed_DroneCAN.h
View File

@ -14,7 +14,8 @@
class AP_Airspeed_DroneCAN : public AP_Airspeed_Backend { class AP_Airspeed_DroneCAN : public AP_Airspeed_Backend {
public: public:
AP_Airspeed_DroneCAN(AP_Airspeed &_frontend, uint8_t _instance);
using AP_Airspeed_Backend::AP_Airspeed_Backend;
bool init(void) override; bool init(void) override;

1
libraries/AP_Airspeed/AP_Airspeed_MS4525.h
View File

@ -27,7 +27,6 @@
*/ */
#include <AP_HAL/AP_HAL.h> #include <AP_HAL/AP_HAL.h>
#include <AP_Param/AP_Param.h>
#include <AP_HAL/utility/OwnPtr.h> #include <AP_HAL/utility/OwnPtr.h>
#include <AP_HAL/I2CDevice.h> #include <AP_HAL/I2CDevice.h>
#include <utility> #include <utility>

1
libraries/AP_Airspeed/AP_Airspeed_MS5525.h
View File

@ -27,7 +27,6 @@
#if AP_AIRSPEED_MS5525_ENABLED #if AP_AIRSPEED_MS5525_ENABLED
#include <AP_HAL/AP_HAL.h> #include <AP_HAL/AP_HAL.h>
#include <AP_Param/AP_Param.h>
#include <AP_HAL/utility/OwnPtr.h> #include <AP_HAL/utility/OwnPtr.h>
#include <AP_HAL/I2CDevice.h> #include <AP_HAL/I2CDevice.h>
#include <utility> #include <utility>

7
libraries/AP_Airspeed/AP_Airspeed_NMEA.cpp
View File

@ -30,13 +30,6 @@
#define TIMEOUT_MS 2000 #define TIMEOUT_MS 2000
extern const AP_HAL::HAL &hal;
AP_Airspeed_NMEA::AP_Airspeed_NMEA(AP_Airspeed &_frontend, uint8_t _instance) :
AP_Airspeed_Backend(_frontend, _instance)
{
}
bool AP_Airspeed_NMEA::init() bool AP_Airspeed_NMEA::init()
{ {
const AP_SerialManager& serial_manager = AP::serialmanager(); const AP_SerialManager& serial_manager = AP::serialmanager();

3
libraries/AP_Airspeed/AP_Airspeed_NMEA.h
View File

@ -15,7 +15,8 @@
class AP_Airspeed_NMEA : public AP_Airspeed_Backend class AP_Airspeed_NMEA : public AP_Airspeed_Backend
{ {
public: public:
AP_Airspeed_NMEA(AP_Airspeed &frontend, uint8_t _instance);
using AP_Airspeed_Backend::AP_Airspeed_Backend;
// probe and initialise the sensor // probe and initialise the sensor
bool init(void) override; bool init(void) override;

5
libraries/AP_Airspeed/AP_Airspeed_SDP3X.cpp
View File

@ -42,11 +42,6 @@
extern const AP_HAL::HAL &hal; extern const AP_HAL::HAL &hal;
AP_Airspeed_SDP3X::AP_Airspeed_SDP3X(AP_Airspeed &_frontend, uint8_t _instance) :
AP_Airspeed_Backend(_frontend, _instance)
{
}
/* /*
send a 16 bit command code send a 16 bit command code
*/ */

5
libraries/AP_Airspeed/AP_Airspeed_SDP3X.h
View File

@ -27,7 +27,6 @@
*/ */
#include <AP_HAL/AP_HAL.h> #include <AP_HAL/AP_HAL.h>
#include <AP_Param/AP_Param.h>
#include <AP_HAL/utility/OwnPtr.h> #include <AP_HAL/utility/OwnPtr.h>
#include <AP_HAL/I2CDevice.h> #include <AP_HAL/I2CDevice.h>
#include <utility> #include <utility>
@ -42,8 +41,8 @@
class AP_Airspeed_SDP3X : public AP_Airspeed_Backend class AP_Airspeed_SDP3X : public AP_Airspeed_Backend
{ {
public: public:
AP_Airspeed_SDP3X(AP_Airspeed &frontend, uint8_t _instance);
~AP_Airspeed_SDP3X(void) {} using AP_Airspeed_Backend::AP_Airspeed_Backend;
// probe and initialise the sensor // probe and initialise the sensor
bool init() override; bool init() override;

1
libraries/AP_Airspeed/AP_Airspeed_analog.h
View File

@ -9,7 +9,6 @@
#if AP_AIRSPEED_ANALOG_ENABLED #if AP_AIRSPEED_ANALOG_ENABLED
#include <AP_HAL/AP_HAL.h> #include <AP_HAL/AP_HAL.h>
#include <AP_Param/AP_Param.h>
#include "AP_Airspeed_Backend.h" #include "AP_Airspeed_Backend.h"