Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-23 08:13:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Logger: remove requirement to know storage type of fence item in headers

Browse Source
This commit is contained in:
Peter Barker 2023-06-24 10:03:25 +10:00 committed by Peter Barker
parent 023316b269
commit e5dda42056
5 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/AP_Logger/AP_Logger.cpp
View File

@ -15,6 +15,10 @@
#include <AP_Rally/AP_Rally.h> #include <AP_Rally/AP_Rally.h>
#include <AP_Vehicle/AP_Vehicle_Type.h> #include <AP_Vehicle/AP_Vehicle_Type.h>
#if HAL_LOGGER_FENCE_ENABLED
#include <AC_Fence/AC_Fence.h>
#endif
AP_Logger *AP_Logger::_singleton; AP_Logger *AP_Logger::_singleton;
extern const AP_HAL::HAL& hal; extern const AP_HAL::HAL& hal;

4
libraries/AP_Logger/AP_Logger.h
View File

@ -12,10 +12,6 @@
#include <AP_Logger/LogStructure.h> #include <AP_Logger/LogStructure.h>
#include <AP_Vehicle/ModeReason.h> #include <AP_Vehicle/ModeReason.h>
#if HAL_LOGGER_FENCE_ENABLED
#include <AC_Fence/AC_Fence.h>
#endif
#include <stdint.h> #include <stdint.h>
#include "LoggerMessageWriter.h" #include "LoggerMessageWriter.h"

4
libraries/AP_Logger/AP_Logger_Backend.cpp
View File

@ -8,6 +8,10 @@
#include <AP_Rally/AP_Rally.h> #include <AP_Rally/AP_Rally.h>
#include <AP_Vehicle/AP_Vehicle_Type.h> #include <AP_Vehicle/AP_Vehicle_Type.h>
#if HAL_LOGGER_FENCE_ENABLED
#include <AC_Fence/AC_Fence.h>
#endif
extern const AP_HAL::HAL& hal; extern const AP_HAL::HAL& hal;
AP_Logger_Backend::AP_Logger_Backend(AP_Logger &front, AP_Logger_Backend::AP_Logger_Backend(AP_Logger &front,

2
libraries/AP_Logger/AP_Logger_Backend.h
View File

@ -124,7 +124,7 @@ public:
const class RallyLocation &rally_point); const class RallyLocation &rally_point);
bool Write_Rally(); bool Write_Rally();
#if HAL_LOGGER_FENCE_ENABLED #if HAL_LOGGER_FENCE_ENABLED
bool Write_FencePoint(uint8_t total, uint8_t sequence, const AC_PolyFenceItem &fence_point); bool Write_FencePoint(uint8_t total, uint8_t sequence, const class AC_PolyFenceItem &fence_point);
bool Write_Fence(); bool Write_Fence();
#endif #endif
bool Write_Format(const struct LogStructure *structure); bool Write_Format(const struct LogStructure *structure);

4
libraries/AP_Logger/LoggerMessageWriter.cpp
View File

@ -3,6 +3,10 @@
#include <AP_Scheduler/AP_Scheduler.h> #include <AP_Scheduler/AP_Scheduler.h>
#include <AP_Vehicle/AP_Vehicle_Type.h> #include <AP_Vehicle/AP_Vehicle_Type.h>
#if HAL_LOGGER_FENCE_ENABLED
#include <AC_Fence/AC_Fence.h>
#endif
#define FORCE_VERSION_H_INCLUDE #define FORCE_VERSION_H_INCLUDE
#include "ap_version.h" #include "ap_version.h"
#undef FORCE_VERSION_H_INCLUDE #undef FORCE_VERSION_H_INCLUDE