ACM: config.h cleanup

Added LOG_ITERM default to enabled
This commit is contained in:
Jason Short 2012-10-27 09:59:57 -07:00
parent cebcc226ee
commit 73bc90f9b8

View File

@ -533,85 +533,85 @@
// Alt Hold Mode // Alt Hold Mode
#ifndef ALT_HOLD_YAW #ifndef ALT_HOLD_YAW
# define ALT_HOLD_YAW YAW_HOLD # define ALT_HOLD_YAW YAW_HOLD
#endif #endif
#ifndef ALT_HOLD_RP #ifndef ALT_HOLD_RP
# define ALT_HOLD_RP ROLL_PITCH_STABLE # define ALT_HOLD_RP ROLL_PITCH_STABLE
#endif #endif
#ifndef ALT_HOLD_THR #ifndef ALT_HOLD_THR
# define ALT_HOLD_THR THROTTLE_HOLD # define ALT_HOLD_THR THROTTLE_HOLD
#endif #endif
// AUTO Mode // AUTO Mode
#ifndef AUTO_YAW #ifndef AUTO_YAW
# define AUTO_YAW YAW_AUTO # define AUTO_YAW YAW_AUTO
#endif #endif
#ifndef AUTO_RP #ifndef AUTO_RP
# define AUTO_RP ROLL_PITCH_AUTO # define AUTO_RP ROLL_PITCH_AUTO
#endif #endif
#ifndef AUTO_THR #ifndef AUTO_THR
# define AUTO_THR THROTTLE_AUTO # define AUTO_THR THROTTLE_AUTO
#endif #endif
// CIRCLE Mode // CIRCLE Mode
#ifndef CIRCLE_YAW #ifndef CIRCLE_YAW
# define CIRCLE_YAW YAW_AUTO # define CIRCLE_YAW YAW_AUTO
#endif #endif
#ifndef CIRCLE_RP #ifndef CIRCLE_RP
# define CIRCLE_RP ROLL_PITCH_AUTO # define CIRCLE_RP ROLL_PITCH_AUTO
#endif #endif
#ifndef CIRCLE_THR #ifndef CIRCLE_THR
# define CIRCLE_THR THROTTLE_HOLD # define CIRCLE_THR THROTTLE_HOLD
#endif #endif
// LOITER Mode // LOITER Mode
#ifndef LOITER_YAW #ifndef LOITER_YAW
# define LOITER_YAW YAW_HOLD # define LOITER_YAW YAW_HOLD
#endif #endif
#ifndef LOITER_RP #ifndef LOITER_RP
# define LOITER_RP ROLL_PITCH_AUTO # define LOITER_RP ROLL_PITCH_AUTO
#endif #endif
#ifndef LOITER_THR #ifndef LOITER_THR
# define LOITER_THR THROTTLE_HOLD # define LOITER_THR THROTTLE_HOLD
#endif #endif
// RTL Mode // RTL Mode
#ifndef RTL_YAW #ifndef RTL_YAW
#if FRAME_CONFIG == HELI_FRAME #if FRAME_CONFIG == HELI_FRAME
# define RTL_YAW YAW_LOOK_AT_HOME # define RTL_YAW YAW_LOOK_AT_HOME
#else #else
# define RTL_YAW YAW_HOLD # define RTL_YAW YAW_HOLD
#endif #endif
#endif #endif
#ifndef RTL_RP #ifndef RTL_RP
# define RTL_RP ROLL_PITCH_AUTO # define RTL_RP ROLL_PITCH_AUTO
#endif #endif
#ifndef RTL_THR #ifndef RTL_THR
# define RTL_THR THROTTLE_HOLD # define RTL_THR THROTTLE_HOLD
#endif #endif
#ifndef SUPER_SIMPLE #ifndef SUPER_SIMPLE
# define SUPER_SIMPLE DISABLED # define SUPER_SIMPLE DISABLED
#endif #endif
#ifndef SUPER_SIMPLE_RADIUS #ifndef SUPER_SIMPLE_RADIUS
# define SUPER_SIMPLE_RADIUS 1000 # define SUPER_SIMPLE_RADIUS 1000
#endif #endif
// RTL Mode // RTL Mode
#ifndef RTL_APPROACH_ALT #ifndef RTL_APPROACH_ALT
# define RTL_APPROACH_ALT 200 // cm!!! # define RTL_APPROACH_ALT 200 // cm!!!
#endif #endif
#ifndef RTL_HOLD_ALT #ifndef RTL_HOLD_ALT
@ -621,15 +621,15 @@
// LOITER Mode // LOITER Mode
#ifndef OF_LOITER_YAW #ifndef OF_LOITER_YAW
# define OF_LOITER_YAW YAW_HOLD # define OF_LOITER_YAW YAW_HOLD
#endif #endif
#ifndef OF_LOITER_RP #ifndef OF_LOITER_RP
# define OF_LOITER_RP ROLL_PITCH_STABLE_OF # define OF_LOITER_RP ROLL_PITCH_STABLE_OF
#endif #endif
#ifndef OF_LOITER_THR #ifndef OF_LOITER_THR
# define OF_LOITER_THR THROTTLE_HOLD # define OF_LOITER_THR THROTTLE_HOLD
#endif #endif
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
@ -639,21 +639,21 @@
// Extra motor values that are changed from time to time by jani @ jDrones as software // Extra motor values that are changed from time to time by jani @ jDrones as software
// and charachteristics changes. // and charachteristics changes.
#ifdef MOTORS_JD880 #ifdef MOTORS_JD880
# define STABILIZE_ROLL_P 3.7 # define STABILIZE_ROLL_P 3.7
# define STABILIZE_ROLL_I 0.0 # define STABILIZE_ROLL_I 0.0
# define STABILIZE_ROLL_IMAX 8.0 // degrees # define STABILIZE_ROLL_IMAX 8.0 // degrees
# define STABILIZE_PITCH_P 3.7 # define STABILIZE_PITCH_P 3.7
# define STABILIZE_PITCH_I 0.0 # define STABILIZE_PITCH_I 0.0
# define STABILIZE_PITCH_IMAX 8.0 // degrees # define STABILIZE_PITCH_IMAX 8.0 // degrees
#endif #endif
#ifdef MOTORS_JD850 #ifdef MOTORS_JD850
# define STABILIZE_ROLL_P 4.2 # define STABILIZE_ROLL_P 4.2
# define STABILIZE_ROLL_I 0.0 # define STABILIZE_ROLL_I 0.0
# define STABILIZE_ROLL_IMAX 8.0 // degrees # define STABILIZE_ROLL_IMAX 8.0 // degrees
# define STABILIZE_PITCH_P 4.2 # define STABILIZE_PITCH_P 4.2
# define STABILIZE_PITCH_I 0.0 # define STABILIZE_PITCH_I 0.0
# define STABILIZE_PITCH_IMAX 8.0 // degrees # define STABILIZE_PITCH_IMAX 8.0 // degrees
#endif #endif
@ -673,33 +673,33 @@
// Good for smaller payload motors. // Good for smaller payload motors.
#ifndef STABILIZE_ROLL_P #ifndef STABILIZE_ROLL_P
# define STABILIZE_ROLL_P 4.5 # define STABILIZE_ROLL_P 4.5
#endif #endif
#ifndef STABILIZE_ROLL_I #ifndef STABILIZE_ROLL_I
# define STABILIZE_ROLL_I 0.0 # define STABILIZE_ROLL_I 0.0
#endif #endif
#ifndef STABILIZE_ROLL_IMAX #ifndef STABILIZE_ROLL_IMAX
# define STABILIZE_ROLL_IMAX 8.0 // degrees # define STABILIZE_ROLL_IMAX 8.0 // degrees
#endif #endif
#ifndef STABILIZE_PITCH_P #ifndef STABILIZE_PITCH_P
# define STABILIZE_PITCH_P 4.5 # define STABILIZE_PITCH_P 4.5
#endif #endif
#ifndef STABILIZE_PITCH_I #ifndef STABILIZE_PITCH_I
# define STABILIZE_PITCH_I 0.0 # define STABILIZE_PITCH_I 0.0
#endif #endif
#ifndef STABILIZE_PITCH_IMAX #ifndef STABILIZE_PITCH_IMAX
# define STABILIZE_PITCH_IMAX 8.0 // degrees # define STABILIZE_PITCH_IMAX 8.0 // degrees
#endif #endif
#ifndef STABILIZE_YAW_P #ifndef STABILIZE_YAW_P
# define STABILIZE_YAW_P 4.5 // increase for more aggressive Yaw Hold, decrease if it's bouncy # define STABILIZE_YAW_P 4.5 // increase for more aggressive Yaw Hold, decrease if it's bouncy
#endif #endif
#ifndef STABILIZE_YAW_I #ifndef STABILIZE_YAW_I
# define STABILIZE_YAW_I 0.0 # define STABILIZE_YAW_I 0.0
#endif #endif
#ifndef STABILIZE_YAW_IMAX #ifndef STABILIZE_YAW_IMAX
# define STABILIZE_YAW_IMAX 8.0 // degrees * 100 # define STABILIZE_YAW_IMAX 8.0 // degrees * 100
#endif #endif
@ -707,51 +707,51 @@
// Stabilize Rate Control // Stabilize Rate Control
// //
#ifndef RATE_ROLL_P #ifndef RATE_ROLL_P
# define RATE_ROLL_P 0.175 # define RATE_ROLL_P 0.175
#endif #endif
#ifndef RATE_ROLL_I #ifndef RATE_ROLL_I
# define RATE_ROLL_I 0.010 # define RATE_ROLL_I 0.010
#endif #endif
#ifndef RATE_ROLL_D #ifndef RATE_ROLL_D
# define RATE_ROLL_D 0.004 # define RATE_ROLL_D 0.004
#endif #endif
#ifndef RATE_ROLL_IMAX #ifndef RATE_ROLL_IMAX
# define RATE_ROLL_IMAX 5.0 // degrees # define RATE_ROLL_IMAX 5.0 // degrees
#endif #endif
#ifndef RATE_PITCH_P #ifndef RATE_PITCH_P
# define RATE_PITCH_P 0.175 # define RATE_PITCH_P 0.175
#endif #endif
#ifndef RATE_PITCH_I #ifndef RATE_PITCH_I
# define RATE_PITCH_I 0.010 # define RATE_PITCH_I 0.010
#endif #endif
#ifndef RATE_PITCH_D #ifndef RATE_PITCH_D
# define RATE_PITCH_D 0.004 # define RATE_PITCH_D 0.004
#endif #endif
#ifndef RATE_PITCH_IMAX #ifndef RATE_PITCH_IMAX
# define RATE_PITCH_IMAX 5.0 // degrees # define RATE_PITCH_IMAX 5.0 // degrees
#endif #endif
#ifndef RATE_YAW_P #ifndef RATE_YAW_P
# define RATE_YAW_P .25 # define RATE_YAW_P 0.25
#endif #endif
#ifndef RATE_YAW_I #ifndef RATE_YAW_I
# define RATE_YAW_I 0.015 # define RATE_YAW_I 0.015
#endif #endif
#ifndef RATE_YAW_D #ifndef RATE_YAW_D
# define RATE_YAW_D 0.000 # define RATE_YAW_D 0.000
#endif #endif
#ifndef RATE_YAW_IMAX #ifndef RATE_YAW_IMAX
# define RATE_YAW_IMAX 8.0 // degrees # define RATE_YAW_IMAX 8.0 // degrees
#endif #endif
#ifndef STABILIZE_D #ifndef STABILIZE_D
# define STABILIZE_D 0.00 # define STABILIZE_D 0.00
#endif #endif
#ifndef STABILIZE_D_SCHEDULE #ifndef STABILIZE_D_SCHEDULE
# define STABILIZE_D_SCHEDULE 0.5 # define STABILIZE_D_SCHEDULE 0.5
#endif #endif
@ -760,81 +760,81 @@
// //
#ifndef MAX_ROLL_OVERSHOOT #ifndef MAX_ROLL_OVERSHOOT
#define MAX_ROLL_OVERSHOOT 3000 #define MAX_ROLL_OVERSHOOT 3000
#endif #endif
#ifndef MAX_PITCH_OVERSHOOT #ifndef MAX_PITCH_OVERSHOOT
#define MAX_PITCH_OVERSHOOT 3000 #define MAX_PITCH_OVERSHOOT 3000
#endif #endif
#ifndef MAX_YAW_OVERSHOOT #ifndef MAX_YAW_OVERSHOOT
#define MAX_YAW_OVERSHOOT 1000 #define MAX_YAW_OVERSHOOT 1000
#endif #endif
#ifndef ACRO_BALANCE_ROLL #ifndef ACRO_BALANCE_ROLL
#define ACRO_BALANCE_ROLL 200 #define ACRO_BALANCE_ROLL 200
#endif #endif
#ifndef ACRO_BALANCE_PITCH #ifndef ACRO_BALANCE_PITCH
#define ACRO_BALANCE_PITCH 200 #define ACRO_BALANCE_PITCH 200
#endif #endif
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
// Loiter control gains // Loiter control gains
// //
#ifndef LOITER_P #ifndef LOITER_P
# define LOITER_P .20 # define LOITER_P .20
#endif #endif
#ifndef LOITER_I #ifndef LOITER_I
# define LOITER_I 0.0 # define LOITER_I 0.0
#endif #endif
#ifndef LOITER_IMAX #ifndef LOITER_IMAX
# define LOITER_IMAX 30 // degrees # define LOITER_IMAX 30 // degrees
#endif #endif
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
// Loiter Navigation control gains // Loiter Navigation control gains
// //
#ifndef LOITER_RATE_P #ifndef LOITER_RATE_P
# define LOITER_RATE_P 5.0 // # define LOITER_RATE_P 5.0 //
#endif #endif
#ifndef LOITER_RATE_I #ifndef LOITER_RATE_I
# define LOITER_RATE_I 0.04 // Wind control # define LOITER_RATE_I 0.04 // Wind control
#endif #endif
#ifndef LOITER_RATE_D #ifndef LOITER_RATE_D
# define LOITER_RATE_D 0.40 // try 2 or 3 for LOITER_RATE 1 # define LOITER_RATE_D 0.40 // try 2 or 3 for LOITER_RATE 1
#endif #endif
#ifndef LOITER_RATE_IMAX #ifndef LOITER_RATE_IMAX
# define LOITER_RATE_IMAX 30 // degrees # define LOITER_RATE_IMAX 30 // degrees
#endif #endif
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
// WP Navigation control gains // WP Navigation control gains
// //
#ifndef NAV_P #ifndef NAV_P
# define NAV_P 2.4 // # define NAV_P 2.4 //
#endif #endif
#ifndef NAV_I #ifndef NAV_I
# define NAV_I 0.17 // Wind control # define NAV_I 0.17 // Wind control
#endif #endif
#ifndef NAV_D #ifndef NAV_D
# define NAV_D 0.00 // .95 # define NAV_D 0.00 // .95
#endif #endif
#ifndef NAV_IMAX #ifndef NAV_IMAX
# define NAV_IMAX 18 // degrees # define NAV_IMAX 18 // degrees
#endif #endif
#ifndef AUTO_SLEW_RATE #ifndef AUTO_SLEW_RATE
# define AUTO_SLEW_RATE 30 // degrees # define AUTO_SLEW_RATE 30 // degrees
#endif #endif
#ifndef WAYPOINT_SPEED_MAX #ifndef WAYPOINT_SPEED_MAX
# define WAYPOINT_SPEED_MAX 500 // 6m/s error = 13mph # define WAYPOINT_SPEED_MAX 500 // 6m/s error = 13mph
#endif #endif
#ifndef WAYPOINT_SPEED_MIN #ifndef WAYPOINT_SPEED_MIN
# define WAYPOINT_SPEED_MIN 150 // 1m/s # define WAYPOINT_SPEED_MIN 150 // 1m/s
#endif #endif
#ifndef TILT_COMPENSATION #ifndef TILT_COMPENSATION
@ -855,31 +855,31 @@
#endif #endif
#ifndef THROTTLE_CRUISE #ifndef THROTTLE_CRUISE
# define THROTTLE_CRUISE 450 // # define THROTTLE_CRUISE 450 //
#endif #endif
#ifndef ALT_HOLD_P #ifndef ALT_HOLD_P
# define ALT_HOLD_P 0.3 // .5 # define ALT_HOLD_P 0.3 // .5
#endif #endif
#ifndef ALT_HOLD_I #ifndef ALT_HOLD_I
# define ALT_HOLD_I 0.04 # define ALT_HOLD_I 0.04
#endif #endif
#ifndef ALT_HOLD_IMAX #ifndef ALT_HOLD_IMAX
# define ALT_HOLD_IMAX 300 # define ALT_HOLD_IMAX 300
#endif #endif
// RATE control // RATE control
#ifndef THROTTLE_P #ifndef THROTTLE_P
# define THROTTLE_P 0.3 // .25 # define THROTTLE_P 0.3 // .25
#endif #endif
#ifndef THROTTLE_I #ifndef THROTTLE_I
# define THROTTLE_I 0.03 # define THROTTLE_I 0.03
#endif #endif
#ifndef THROTTLE_D #ifndef THROTTLE_D
# define THROTTLE_D 0.0 # define THROTTLE_D 0.0
#endif #endif
#ifndef THROTTLE_IMAX #ifndef THROTTLE_IMAX
# define THROTTLE_IMAX 300 # define THROTTLE_IMAX 300
#endif #endif
@ -887,7 +887,7 @@
// Crosstrack compensation // Crosstrack compensation
// //
#ifndef CROSSTRACK_GAIN #ifndef CROSSTRACK_GAIN
# define CROSSTRACK_GAIN .2 # define CROSSTRACK_GAIN .2
#endif #endif
@ -924,46 +924,49 @@
#ifndef LOG_ATTITUDE_FAST #ifndef LOG_ATTITUDE_FAST
# define LOG_ATTITUDE_FAST DISABLED # define LOG_ATTITUDE_FAST DISABLED
#endif #endif
#ifndef LOG_ATTITUDE_MED #ifndef LOG_ATTITUDE_MED
# define LOG_ATTITUDE_MED ENABLED # define LOG_ATTITUDE_MED ENABLED
#endif #endif
#ifndef LOG_GPS #ifndef LOG_GPS
# define LOG_GPS ENABLED # define LOG_GPS ENABLED
#endif #endif
#ifndef LOG_PM #ifndef LOG_PM
# define LOG_PM ENABLED # define LOG_PM ENABLED
#endif #endif
#ifndef LOG_CTUN #ifndef LOG_CTUN
# define LOG_CTUN ENABLED # define LOG_CTUN ENABLED
#endif #endif
#ifndef LOG_NTUN #ifndef LOG_NTUN
# define LOG_NTUN ENABLED # define LOG_NTUN ENABLED
#endif #endif
#ifndef LOG_MODE #ifndef LOG_MODE
# define LOG_MODE ENABLED # define LOG_MODE ENABLED
#endif #endif
#ifndef LOG_RAW #ifndef LOG_RAW
# define LOG_RAW DISABLED # define LOG_RAW DISABLED
#endif #endif
#ifndef LOG_CMD #ifndef LOG_CMD
# define LOG_CMD ENABLED # define LOG_CMD ENABLED
#endif #endif
// current // current
#ifndef LOG_CUR #ifndef LOG_CUR
# define LOG_CUR DISABLED # define LOG_CUR DISABLED
#endif #endif
// quad motor PWMs // quad motor PWMs
#ifndef LOG_MOTORS #ifndef LOG_MOTORS
# define LOG_MOTORS DISABLED # define LOG_MOTORS DISABLED
#endif #endif
// optical flow // optical flow
#ifndef LOG_OPTFLOW #ifndef LOG_OPTFLOW
# define LOG_OPTFLOW DISABLED # define LOG_OPTFLOW DISABLED
#endif #endif
#ifndef LOG_PID #ifndef LOG_PID
# define LOG_PID DISABLED # define LOG_PID DISABLED
#endif
#ifndef LOG_ITERM
# define LOG_ITERM ENABLED
#endif #endif
// calculate the default log_bitmask // calculate the default log_bitmask