Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-31 04:58:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_DAL: removed use of BUILD macros in headers

Browse Source 
fixes sempahore build
This commit is contained in:
Andrew Tridgell 2020-11-08 09:31:09 +11:00
parent 5be818f8a1
commit 7a8e8b8b51
9 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/AP_DAL/AP_DAL.h
View File

@ -17,10 +17,8 @@
#define DAL_CORE(c) AP::dal().logging_core(c) #define DAL_CORE(c) AP::dal().logging_core(c)
#if APM_BUILD_TYPE(APM_BUILD_Replay)
class NavEKF2; class NavEKF2;
class NavEKF3; class NavEKF3;
#endif
class AP_DAL { class AP_DAL {
public: public:
@ -222,7 +220,6 @@ public:
void writeBodyFrameOdom(float quality, const Vector3f &delPos, const Vector3f &delAng, float delTime, uint32_t timeStamp_ms, uint16_t delay_ms, const Vector3f &posOffset); void writeBodyFrameOdom(float quality, const Vector3f &delPos, const Vector3f &delAng, float delTime, uint32_t timeStamp_ms, uint16_t delay_ms, const Vector3f &posOffset);
// Replay support: // Replay support:
#if APM_BUILD_TYPE(APM_BUILD_Replay)
void handle_message(const log_RFRH &msg) { void handle_message(const log_RFRH &msg) {
_RFRH = msg; _RFRH = msg;
_micros = _RFRH.time_us; _micros = _RFRH.time_us;
@ -297,7 +294,6 @@ public:
void handle_message(const log_REVH &msg, NavEKF2 &ekf2, NavEKF3 &ekf3); void handle_message(const log_REVH &msg, NavEKF2 &ekf2, NavEKF3 &ekf3);
void handle_message(const log_RWOH &msg, NavEKF2 &ekf2, NavEKF3 &ekf3); void handle_message(const log_RWOH &msg, NavEKF2 &ekf2, NavEKF3 &ekf3);
void handle_message(const log_RBOH &msg, NavEKF2 &ekf2, NavEKF3 &ekf3); void handle_message(const log_RBOH &msg, NavEKF2 &ekf2, NavEKF3 &ekf3);
#endif
// map core number for replay // map core number for replay
uint8_t logging_core(uint8_t c) const; uint8_t logging_core(uint8_t c) const;

2
libraries/AP_DAL/AP_DAL_Airspeed.h
View File

@ -47,14 +47,12 @@ public:
void start_frame(); void start_frame();
#if APM_BUILD_TYPE(APM_BUILD_Replay)
void handle_message(const log_RASH &msg) { void handle_message(const log_RASH &msg) {
_RASH = msg; _RASH = msg;
} }
void handle_message(const log_RASI &msg) { void handle_message(const log_RASI &msg) {
_RASI[msg.instance] = msg; _RASI[msg.instance] = msg;
} }
#endif
private: private:

2
libraries/AP_DAL/AP_DAL_Baro.h
View File

@ -40,14 +40,12 @@ public:
void start_frame(); void start_frame();
#if APM_BUILD_TYPE(APM_BUILD_Replay)
void handle_message(const log_RBRH &msg) { void handle_message(const log_RBRH &msg) {
_RBRH = msg; _RBRH = msg;
} }
void handle_message(const log_RBRI &msg) { void handle_message(const log_RBRI &msg) {
_RBRI[msg.instance] = msg; _RBRI[msg.instance] = msg;
} }
#endif
private: private:

4
libraries/AP_DAL/AP_DAL_Beacon.h
View File

@ -61,14 +61,12 @@ public:
void start_frame(); void start_frame();
#if APM_BUILD_TYPE(APM_BUILD_Replay)
void handle_message(const log_RBCH &msg) { void handle_message(const log_RBCH &msg) {
_RBCH = msg; _RBCH = msg;
} }
void handle_message(const log_RBCI &msg) { void handle_message(const log_RBCI &msg) {
_RBCI[msg.instance] = msg; _RBCI[msg.instance] = msg;
} }
#endif
private: private:

2
libraries/AP_DAL/AP_DAL_Compass.h
View File

@ -58,14 +58,12 @@ public:
void start_frame(); void start_frame();
#if APM_BUILD_TYPE(APM_BUILD_Replay)
void handle_message(const log_RMGH &msg) { void handle_message(const log_RMGH &msg) {
_RMGH = msg; _RMGH = msg;
} }
void handle_message(const log_RMGI &msg) { void handle_message(const log_RMGI &msg) {
_RMGI[msg.instance] = msg; _RMGI[msg.instance] = msg;
} }
#endif
private: private:

2
libraries/AP_DAL/AP_DAL_GPS.h
View File

@ -130,7 +130,6 @@ public:
void start_frame(); void start_frame();
#if APM_BUILD_TYPE(APM_BUILD_Replay)
void handle_message(const log_RGPH &msg) { void handle_message(const log_RGPH &msg) {
_RGPH = msg; _RGPH = msg;
} }
@ -140,7 +139,6 @@ public:
void handle_message(const log_RGPJ &msg) { void handle_message(const log_RGPJ &msg) {
_RGPJ[msg.instance] = msg; _RGPJ[msg.instance] = msg;
} }
#endif
private: private:

2
libraries/AP_DAL/AP_DAL_InertialSensor.h
View File

@ -53,7 +53,6 @@ public:
void start_frame(); void start_frame();
#if APM_BUILD_TYPE(APM_BUILD_Replay)
void handle_message(const log_RISH &msg) { void handle_message(const log_RISH &msg) {
_RISH = msg; _RISH = msg;
} }
@ -62,7 +61,6 @@ public:
pos[msg.instance] = AP::ins().get_imu_pos_offset(msg.instance); pos[msg.instance] = AP::ins().get_imu_pos_offset(msg.instance);
update_filtered(msg.instance); update_filtered(msg.instance);
} }
#endif
private: private:
// filter constant for deltas to gyro/accel // filter constant for deltas to gyro/accel

2
libraries/AP_DAL/AP_DAL_RangeFinder.h
View File

@ -30,14 +30,12 @@ public:
class AP_DAL_RangeFinder_Backend *get_backend(uint8_t id) const; class AP_DAL_RangeFinder_Backend *get_backend(uint8_t id) const;
#if APM_BUILD_TYPE(APM_BUILD_Replay)
void handle_message(const log_RRNH &msg) { void handle_message(const log_RRNH &msg) {
_RRNH = msg; _RRNH = msg;
} }
void handle_message(const log_RRNI &msg) { void handle_message(const log_RRNI &msg) {
_RRNI[msg.instance] = msg; _RRNI[msg.instance] = msg;
} }
#endif
private: private:

2
libraries/AP_DAL/AP_DAL_VisualOdom.h
View File

@ -38,11 +38,9 @@ public:
void start_frame(); void start_frame();
#if APM_BUILD_TYPE(APM_BUILD_Replay)
void handle_message(const log_RVOH &msg) { void handle_message(const log_RVOH &msg) {
RVOH = msg; RVOH = msg;
} }
#endif
private: private: