mirror of https://github.com/ArduPilot/ardupilot
AP_HAL_F4light: fixes OSD compilation issue
This commit is contained in:
parent
6241ca4527
commit
75180c3c08
|
@ -44,6 +44,8 @@ using namespace F4Light;
|
|||
|
||||
namespace OSDns {
|
||||
|
||||
class BetterStream : AP_HAL::BetterStream {};
|
||||
|
||||
#include "osd_core/GCS_MAVLink.h"
|
||||
|
||||
#include "osd_core/OSD_Max7456.h"
|
||||
|
|
|
@ -16,7 +16,6 @@ extern const AP_HAL::HAL& hal;
|
|||
#include "osd_core/compat.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_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);
|
||||
|
||||
inline uint32_t millis(){ return AP_HAL::millis(); }
|
||||
|
||||
class BetterStream;
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -1 +1 @@
|
|||
/mnt/disk_d/src/quad-copter/minimosd-extra/MinimOsd_Extra/Params.h
|
||||
../../../support/minimosd-extra/MinimOsd_Extra/Params.h
|
|
@ -31,6 +31,7 @@ typedef const char * PGM_P;
|
|||
#define TO_STRING2(x) #x
|
||||
#define TO_STRING(x) TO_STRING2(x)
|
||||
|
||||
|
||||
static inline int max(int a, int b){
|
||||
if(a>b) return a;
|
||||
return b;
|
||||
|
|
Loading…
Reference in New Issue