Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-11 10:28:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_HAL_F4light: fixes OSD compilation issue

Browse Source
This commit is contained in:
night-ghost 2018-02-26 13:43:53 +05:00 committed by Andrew Tridgell
parent 6241ca4527
commit 75180c3c08
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/AP_HAL_F4Light/hardware/osd/osd.cpp
View File

@ -44,6 +44,8 @@ using namespace F4Light;
namespace OSDns { namespace OSDns {
class BetterStream : AP_HAL::BetterStream {};
#include "osd_core/GCS_MAVLink.h" #include "osd_core/GCS_MAVLink.h"
#include "osd_core/OSD_Max7456.h" #include "osd_core/OSD_Max7456.h"

3
libraries/AP_HAL_F4Light/hardware/osd/osd.h
View File

@ -16,7 +16,6 @@ extern const AP_HAL::HAL& hal;
#include "osd_core/compat.h" #include "osd_core/compat.h"
#include "osd_core/Defs.h" #include "osd_core/Defs.h"
#define OSD_LOW_PRIORITY 115 // 15 less than main task so runs almost only in delay() time - 1/16 of main thread #define OSD_LOW_PRIORITY 115 // 15 less than main task so runs almost only in delay() time - 1/16 of main thread
#define OSD_HIGH_PRIORITY 99 // 1 more than main so uses 2/3 of CPU #define OSD_HIGH_PRIORITY 99 // 1 more than main so uses 2/3 of CPU
@ -37,5 +36,7 @@ namespace OSDns {// OSD interface emulates UART
void update_max_buffer(const uint8_t *buffer, uint16_t len); void update_max_buffer(const uint8_t *buffer, uint16_t len);
inline uint32_t millis(){ return AP_HAL::millis(); } inline uint32_t millis(){ return AP_HAL::millis(); }
class BetterStream;
} }
#endif #endif

2
libraries/AP_HAL_F4Light/hardware/osd/osd_core/Params.h
View File

@ -1 +1 @@
/mnt/disk_d/src/quad-copter/minimosd-extra/MinimOsd_Extra/Params.h ../../../support/minimosd-extra/MinimOsd_Extra/Params.h

1
libraries/AP_HAL_F4Light/hardware/osd/osd_core/compat.h
View File

@ -31,6 +31,7 @@ typedef const char * PGM_P;
#define TO_STRING2(x) #x #define TO_STRING2(x) #x
#define TO_STRING(x) TO_STRING2(x) #define TO_STRING(x) TO_STRING2(x)
static inline int max(int a, int b){ static inline int max(int a, int b){
if(a>b) return a; if(a>b) return a;
return b; return b;