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

GCS_MAVLink: allow to use functor

This commit is contained in:
Lucas De Marchi 2015-05-24 18:55:06 -03:00 committed by Andrew Tridgell
parent cd308b5e2f
commit 58847bffd6
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/GCS_MAVLink/GCS.h
View File

@ -70,7 +70,9 @@ class GCS_MAVLINK
{
public:
GCS_MAVLINK();
#if APM_BUILD_DELEGATES
#if APM_BUILD_FUNCTOR
FUNCTOR_TYPEDEF(run_cli_fn, void, AP_HAL::UARTDriver*);
#elif APM_BUILD_DELEGATES
typedef DELEGATE_FUNCTION1(void, AP_HAL::UARTDriver*) run_cli_fn;
#else
typedef void (*run_cli_fn)(AP_HAL::UARTDriver *);
@ -299,7 +301,9 @@ private:
void handle_radio_status(mavlink_message_t *msg, DataFlash_Class &dataflash, bool log_radio);
void handle_serial_control(mavlink_message_t *msg, AP_GPS &gps);
void lock_channel(mavlink_channel_t chan, bool lock);
#if APM_BUILD_DELEGATES
#if APM_BUILD_FUNCTOR
FUNCTOR_TYPEDEF(set_mode_fn, bool, uint8_t);
#elif APM_BUILD_DELEGATES
typedef DELEGATE_FUNCTION1(bool, uint8_t) set_mode_fn;
#else
typedef bool (*set_mode_fn)(uint8_t);