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

AP_Menu: stop using Progmem.h

This commit is contained in:
Lucas De Marchi 2015-12-23 12:50:17 -02:00
parent 502077d763
commit 25c289b74c
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libraries/AP_Menu/AP_Menu.cpp
View File

@ -2,17 +2,14 @@
// //
// Simple commandline menu system. // Simple commandline menu system.
// #include "AP_Menu.h"
#include <AP_Common/AP_Common.h>
#include <AP_Progmem/AP_Progmem.h>
#include <AP_HAL/AP_HAL.h>
#include <stdlib.h>
#include <ctype.h> #include <ctype.h>
#include <stdlib.h>
#include <string.h> #include <string.h>
#include "AP_Menu.h" #include <AP_Common/AP_Common.h>
#include <AP_HAL/AP_HAL.h>
extern const AP_HAL::HAL& hal; extern const AP_HAL::HAL& hal;
@ -239,10 +236,7 @@ Menu::_help(void)
int8_t int8_t
Menu::_call(uint8_t n, uint8_t argc) Menu::_call(uint8_t n, uint8_t argc)
{ {
func fn; return _commands[n].func(argc, &_argv[0]);
pgm_read_block(&_commands[n].func, &fn, sizeof(fn));
return(fn(argc, &_argv[0]));
} }
/** /**