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

Copter: rename ROLL_PITCH_LOITER

Browse Source 
new name ROLL_PITCH_LOITER_INAV makes it more clear that it should only
be used with the new inertial nav loiter controllers
This commit is contained in:
Randy Mackay 2013-01-25 23:25:31 +09:00
parent d7409b6a25
commit 0056bfadd7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ArduCopter/ArduCopter.pde
View File

@ -1601,7 +1601,7 @@ bool set_roll_pitch_mode(uint8_t new_roll_pitch_mode)
roll_pitch_initialised = true;
break;
case ROLL_PITCH_LOITER:
case ROLL_PITCH_LOITER_INAV:
// require gps lock
if( ap.home_is_set ) {
roll_pitch_initialised = true;
@ -1712,7 +1712,7 @@ void update_roll_pitch_mode(void)
roll_pitch_toy();
break;
case ROLL_PITCH_LOITER:
case ROLL_PITCH_LOITER_INAV:
// apply SIMPLE mode transform
if(ap.simple_mode && ap_system.new_radio_frame) {
update_simple_mode();

2
ArduCopter/defines.h
View File

@ -30,7 +30,7 @@
#define ROLL_PITCH_AUTO 2
#define ROLL_PITCH_STABLE_OF 3
#define ROLL_PITCH_TOY 4 // THOR This is the Roll and Pitch mode
#define ROLL_PITCH_LOITER 5 // pilot inputs the desired horizontal velocities
#define ROLL_PITCH_LOITER_INAV 5 // pilot inputs the desired horizontal velocities
#define THROTTLE_MANUAL 0 // manual throttle mode - pilot input goes directly to motors
#define THROTTLE_MANUAL_TILT_COMPENSATED 1 // mostly manual throttle but with some tilt compensation