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

Copter: constrain loiter so that it never commands more than 45 degrees of lean in lat or lon directions

Browse Source
This commit is contained in:
Randy Mackay 2013-01-14 13:30:25 +09:00 committed by rmackay9
parent fef7569dee
commit df2137ed72
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ArduCopter/navigation.pde
View File

@ -423,7 +423,7 @@ static void calc_loiter(int16_t x_error, int16_t y_error)
} }
output = p + i + d; output = p + i + d;
nav_lon = constrain(output, -32000, 32000); // constraint to remove chance of overflow when adding int32_t to int16_t nav_lon = constrain(output, -4500, 4500); // constrain max angle to 45 degrees
#if LOGGING_ENABLED == ENABLED #if LOGGING_ENABLED == ENABLED
// log output if PID logging is on and we are tuning the yaw // log output if PID logging is on and we are tuning the yaw
@ -456,7 +456,7 @@ static void calc_loiter(int16_t x_error, int16_t y_error)
} }
output = p + i + d; output = p + i + d;
nav_lat = constrain(output, -32000, 32000); // constraint to remove chance of overflow when adding int32_t to int16_t nav_lat = constrain(output, -4500, 4500); // constrain max angle to 45 degrees
#if LOGGING_ENABLED == ENABLED #if LOGGING_ENABLED == ENABLED
// log output if PID logging is on and we are tuning the yaw // log output if PID logging is on and we are tuning the yaw
@ -502,7 +502,7 @@ static void calc_loiter(int16_t x_error, int16_t y_error)
} }
output = p + i + d; output = p + i + d;
nav_lon = constrain(output, -32000, 32000); // constraint to remove chance of overflow when adding int32_t to int16_t nav_lon = constrain(output, -4500, 4500); // constrain max angle to 45 degrees
#if LOGGING_ENABLED == ENABLED #if LOGGING_ENABLED == ENABLED
// log output if PID logging is on and we are tuning the yaw // log output if PID logging is on and we are tuning the yaw
@ -535,7 +535,7 @@ static void calc_loiter(int16_t x_error, int16_t y_error)
} }
output = p + i + d; output = p + i + d;
nav_lat = constrain(output, -32000, 32000); // constraint to remove chance of overflow when adding int32_t to int16_t nav_lat = constrain(output, -4500, 4500); // constrain max angle to 45 degrees
#if LOGGING_ENABLED == ENABLED #if LOGGING_ENABLED == ENABLED
// log output if PID logging is on and we are tuning the yaw // log output if PID logging is on and we are tuning the yaw