aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AP_Menu: all vehicles now use functors

Browse Source
This commit is contained in:
Andrew Tridgell 2015-06-01 15:15:54 +10:00
parent 4dd47ead0e
commit bd5a58e4c4
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libraries/AP_Menu/AP_Menu.h
View File

@ -56,11 +56,7 @@ public:
/// command, so that the same function can be used /// command, so that the same function can be used
/// to handle more than one command. /// to handle more than one command.
/// ///
#if APM_BUILD_FUNCTOR
FUNCTOR_TYPEDEF(func, int8_t, uint8_t, const struct arg *); FUNCTOR_TYPEDEF(func, int8_t, uint8_t, const struct arg *);
#else
typedef int8_t (*func)(uint8_t argc, const struct arg *argv);
#endif
static void set_port(AP_HAL::BetterStream *port) { static void set_port(AP_HAL::BetterStream *port) {
_port = port; _port = port;
@ -73,11 +69,7 @@ public:
/// ///
/// If this function returns false, the menu exits. /// If this function returns false, the menu exits.
/// ///
#if APM_BUILD_FUNCTOR
FUNCTOR_TYPEDEF(preprompt, bool); FUNCTOR_TYPEDEF(preprompt, bool);
#else
typedef bool (*preprompt)(void);
#endif
/// menu command description /// menu command description
/// ///
@ -98,11 +90,7 @@ public:
/// The "?", "help" and "exit" commands are always defined, but /// The "?", "help" and "exit" commands are always defined, but
/// can be overridden by explicit entries in the command array. /// can be overridden by explicit entries in the command array.
/// ///
#if APM_BUILD_FUNCTOR
FUNCTOR_DECLARE(func, int8_t, uint8_t, const struct arg *); FUNCTOR_DECLARE(func, int8_t, uint8_t, const struct arg *);
#else
int8_t (*func)(uint8_t argc, const struct arg *argv);
#endif
}; };
/// constructor /// constructor