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

ArduCopter: remove check for AVR CPUs 

Remove the checks for HAL_CPU_CLASS > HAL_CPU_CLASS_16 and
HAL_CPU_CLASS >= HAL_CPU_CLASS_75. Corresponding dead code will be
removed on separate commits.
This commit is contained in:
Lucas De Marchi 2015-11-03 11:46:40 -02:00 committed by Andrew Tridgell
parent 1a084e5dcd
commit e0639ac029
2 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ArduCopter/GCS_Mavlink.cpp
View File

@ -1787,7 +1787,6 @@ void GCS_MAVLINK::handleMessage(mavlink_message_t* msg)
} }
break; break;
#if HAL_CPU_CLASS > HAL_CPU_CLASS_16
case MAVLINK_MSG_ID_SERIAL_CONTROL: case MAVLINK_MSG_ID_SERIAL_CONTROL:
handle_serial_control(msg, copter.gps); handle_serial_control(msg, copter.gps);
break; break;
@ -1797,8 +1796,6 @@ void GCS_MAVLINK::handleMessage(mavlink_message_t* msg)
result = MAV_RESULT_ACCEPTED; result = MAV_RESULT_ACCEPTED;
break; break;
#endif
#if PRECISION_LANDING == ENABLED #if PRECISION_LANDING == ENABLED
case MAVLINK_MSG_ID_LANDING_TARGET: case MAVLINK_MSG_ID_LANDING_TARGET:
// configure or release parachute // configure or release parachute

20
ArduCopter/setup.cpp
View File

@ -4,18 +4,19 @@
#if CLI_ENABLED == ENABLED #if CLI_ENABLED == ENABLED
#if HAL_CPU_CLASS >= HAL_CPU_CLASS_75 #define PWM_CALIB_MIN 1000
#define WITH_ESC_CALIB #define PWM_CALIB_MAX 2000
#endif #define PWM_HIGHEST_MAX 2200
#define PWM_LOWEST_MAX 1200
#define PWM_HIGHEST_MIN 1800
#define PWM_LOWEST_MIN 800
// Command/function table for the setup menu // Command/function table for the setup menu
static const struct Menu::command setup_menu_commands[] = { static const struct Menu::command setup_menu_commands[] = {
{"reset", MENU_FUNC(setup_factory)}, {"reset", MENU_FUNC(setup_factory)},
{"show", MENU_FUNC(setup_show)}, {"show", MENU_FUNC(setup_show)},
{"set", MENU_FUNC(setup_set)}, {"set", MENU_FUNC(setup_set)},
#ifdef WITH_ESC_CALIB
{"esc_calib", MENU_FUNC(esc_calib)}, {"esc_calib", MENU_FUNC(esc_calib)},
#endif
}; };
// Create the setup menu object. // Create the setup menu object.
@ -156,14 +157,6 @@ int8_t Copter::setup_show(uint8_t argc, const Menu::arg *argv)
return(0); return(0);
} }
#ifdef WITH_ESC_CALIB
#define PWM_CALIB_MIN 1000
#define PWM_CALIB_MAX 2000
#define PWM_HIGHEST_MAX 2200
#define PWM_LOWEST_MAX 1200
#define PWM_HIGHEST_MIN 1800
#define PWM_LOWEST_MIN 800
int8_t Copter::esc_calib(uint8_t argc,const Menu::arg *argv) int8_t Copter::esc_calib(uint8_t argc,const Menu::arg *argv)
{ {
@ -299,7 +292,6 @@ int8_t Copter::esc_calib(uint8_t argc,const Menu::arg *argv)
return(0); return(0);
} }
#endif // WITH_ESC_CALIB
/***************************************************************************/ /***************************************************************************/