From 8ecd6c4dc1f4cb9de46a1a3fa237ab53b8e2584c Mon Sep 17 00:00:00 2001 From: uncrustify Date: Thu, 16 Aug 2012 17:50:16 -0700 Subject: [PATCH] uncrustify ArduPlane/defines.h --- ArduPlane/defines.h | 153 ++++++++++++++++++++++++++------------------ 1 file changed, 89 insertions(+), 64 deletions(-) diff --git a/ArduPlane/defines.h b/ArduPlane/defines.h index 5b52b37e1f..d914dcdcc2 100644 --- a/ArduPlane/defines.h +++ b/ArduPlane/defines.h @@ -8,21 +8,22 @@ #define TRUE 1 #define FALSE 0 -#define ToRad(x) (x*0.01745329252) // *pi/180 -#define ToDeg(x) (x*57.2957795131) // *180/pi +#define ToRad(x) (x*0.01745329252) // *pi/180 +#define ToDeg(x) (x*57.2957795131) // *180/pi #define DEBUG 0 #define LOITER_RANGE 60 // for calculating power outside of loiter radius -#define SERVO_MAX 4500 // This value represents 45 degrees and is just an arbitrary representation of servo max travel. +#define SERVO_MAX 4500 // This value represents 45 degrees and is just an + // arbitrary representation of servo max travel. // failsafe // ---------------------- -#define FAILSAFE_NONE 0 -#define FAILSAFE_SHORT 1 -#define FAILSAFE_LONG 2 -#define FAILSAFE_GCS 3 -#define FAILSAFE_SHORT_TIME 1500 // Miliiseconds -#define FAILSAFE_LONG_TIME 20000 // Miliiseconds +#define FAILSAFE_NONE 0 +#define FAILSAFE_SHORT 1 +#define FAILSAFE_LONG 2 +#define FAILSAFE_GCS 3 +#define FAILSAFE_SHORT_TIME 1500 // Miliiseconds +#define FAILSAFE_LONG_TIME 20000 // Miliiseconds // active altitude sensor @@ -37,15 +38,15 @@ #define T7 10000000 // GPS type codes - use the names, not the numbers -#define GPS_PROTOCOL_NONE -1 -#define GPS_PROTOCOL_NMEA 0 -#define GPS_PROTOCOL_SIRF 1 -#define GPS_PROTOCOL_UBLOX 2 -#define GPS_PROTOCOL_IMU 3 -#define GPS_PROTOCOL_MTK 4 -#define GPS_PROTOCOL_HIL 5 -#define GPS_PROTOCOL_MTK16 6 -#define GPS_PROTOCOL_AUTO 7 +#define GPS_PROTOCOL_NONE -1 +#define GPS_PROTOCOL_NMEA 0 +#define GPS_PROTOCOL_SIRF 1 +#define GPS_PROTOCOL_UBLOX 2 +#define GPS_PROTOCOL_IMU 3 +#define GPS_PROTOCOL_MTK 4 +#define GPS_PROTOCOL_HIL 5 +#define GPS_PROTOCOL_MTK16 6 +#define GPS_PROTOCOL_AUTO 7 #define CH_ROLL CH_1 #define CH_PITCH CH_2 @@ -54,37 +55,52 @@ #define CH_YAW CH_4 // HIL enumerations -#define HIL_MODE_DISABLED 0 -#define HIL_MODE_ATTITUDE 1 -#define HIL_MODE_SENSORS 2 +#define HIL_MODE_DISABLED 0 +#define HIL_MODE_ATTITUDE 1 +#define HIL_MODE_SENSORS 2 // Auto Pilot modes // ---------------- #define MANUAL 0 -#define CIRCLE 1 // When flying sans GPS, and we loose the radio, just circle +#define CIRCLE 1 // When flying sans GPS, and we loose + // the radio, just circle #define STABILIZE 2 -#define FLY_BY_WIRE_A 5 // Fly By Wire A has left stick horizontal => desired roll angle, left stick vertical => desired pitch angle, right stick vertical = manual throttle -#define FLY_BY_WIRE_B 6 // Fly By Wire B has left stick horizontal => desired roll angle, left stick vertical => desired pitch angle, right stick vertical => desired airspeed -#define FLY_BY_WIRE_C 7 // Fly By Wire C has left stick horizontal => desired roll angle, left stick vertical => desired climb rate, right stick vertical => desired airspeed - // Fly By Wire B and Fly By Wire C require airspeed sensor +#define FLY_BY_WIRE_A 5 // Fly By Wire A has left stick horizontal => + // desired roll angle, left stick vertical => + // desired pitch angle, right stick vertical = + // manual throttle +#define FLY_BY_WIRE_B 6 // Fly By Wire B has left stick horizontal => + // desired roll angle, left stick vertical => + // desired pitch angle, right stick vertical + // => desired airspeed +#define FLY_BY_WIRE_C 7 // Fly By Wire C has left stick horizontal => + // desired roll angle, left stick vertical => + // desired climb rate, right stick vertical => + // desired airspeed +// Fly By Wire B and Fly By Wire C require airspeed sensor #define AUTO 10 #define RTL 11 #define LOITER 12 -//#define TAKEOFF 13 // This is not used by APM. It appears here for consistency with ACM -//#define LAND 14 // This is not used by APM. It appears here for consistency with ACM +//#define TAKEOFF 13 // This is not used by APM. It appears here +// for consistency with ACM +//#define LAND 14 // This is not used by APM. It appears here for +// consistency with ACM #define GUIDED 15 #define INITIALISING 16 // in startup routines -// Commands - Note that APM now uses a subset of the MAVLink protocol commands. See enum MAV_CMD in the GCS_Mavlink library -#define CMD_BLANK 0 // there is no command stored in the mem location requested +// Commands - Note that APM now uses a subset of the MAVLink protocol +// commands. See enum MAV_CMD in the GCS_Mavlink library +#define CMD_BLANK 0 // there is no command stored in the mem location + // requested #define NO_COMMAND 0 #define WAIT_COMMAND 255 // Command/Waypoint/Location Options Bitmask //-------------------- -#define MASK_OPTIONS_RELATIVE_ALT (1<<0) // 1 = Relative altitude +#define MASK_OPTIONS_RELATIVE_ALT (1<<0) // 1 = Relative + // altitude //repeating events #define NO_REPEAT 0 @@ -136,31 +152,31 @@ enum gcs_severity { }; // Logging parameters -#define LOG_INDEX_MSG 0xF0 -#define LOG_ATTITUDE_MSG 0x01 -#define LOG_GPS_MSG 0x02 -#define LOG_MODE_MSG 0X03 -#define LOG_CONTROL_TUNING_MSG 0X04 -#define LOG_NAV_TUNING_MSG 0X05 -#define LOG_PERFORMANCE_MSG 0X06 -#define LOG_RAW_MSG 0x07 -#define LOG_CMD_MSG 0x08 -#define LOG_CURRENT_MSG 0x09 -#define LOG_STARTUP_MSG 0x0A -#define TYPE_AIRSTART_MSG 0x00 -#define TYPE_GROUNDSTART_MSG 0x01 -#define MAX_NUM_LOGS 100 +#define LOG_INDEX_MSG 0xF0 +#define LOG_ATTITUDE_MSG 0x01 +#define LOG_GPS_MSG 0x02 +#define LOG_MODE_MSG 0X03 +#define LOG_CONTROL_TUNING_MSG 0X04 +#define LOG_NAV_TUNING_MSG 0X05 +#define LOG_PERFORMANCE_MSG 0X06 +#define LOG_RAW_MSG 0x07 +#define LOG_CMD_MSG 0x08 +#define LOG_CURRENT_MSG 0x09 +#define LOG_STARTUP_MSG 0x0A +#define TYPE_AIRSTART_MSG 0x00 +#define TYPE_GROUNDSTART_MSG 0x01 +#define MAX_NUM_LOGS 100 -#define MASK_LOG_ATTITUDE_FAST (1<<0) -#define MASK_LOG_ATTITUDE_MED (1<<1) -#define MASK_LOG_GPS (1<<2) -#define MASK_LOG_PM (1<<3) -#define MASK_LOG_CTUN (1<<4) -#define MASK_LOG_NTUN (1<<5) -#define MASK_LOG_MODE (1<<6) -#define MASK_LOG_RAW (1<<7) -#define MASK_LOG_CMD (1<<8) -#define MASK_LOG_CUR (1<<9) +#define MASK_LOG_ATTITUDE_FAST (1<<0) +#define MASK_LOG_ATTITUDE_MED (1<<1) +#define MASK_LOG_GPS (1<<2) +#define MASK_LOG_PM (1<<3) +#define MASK_LOG_CTUN (1<<4) +#define MASK_LOG_NTUN (1<<5) +#define MASK_LOG_MODE (1<<6) +#define MASK_LOG_RAW (1<<7) +#define MASK_LOG_CMD (1<<8) +#define MASK_LOG_CUR (1<<9) // Waypoint Modes // ---------------- @@ -181,7 +197,8 @@ enum gcs_severity { #define EVENT_LOOP 4 // Climb rate calculations -#define ALTITUDE_HISTORY_LENGTH 8 //Number of (time,altitude) points to regress a climb rate from +#define ALTITUDE_HISTORY_LENGTH 8 //Number of (time,altitude) points to + // regress a climb rate from #define BATTERY_VOLTAGE(x) (x*(g.input_voltage/1024.0))*g.volt_div_ratio @@ -194,16 +211,19 @@ enum gcs_severity { #define MAX_SONAR_XL 0 #define MAX_SONAR_LV 1 #define SonarToCm(x) (x*1.26) // Sonar raw value to centimeters -#define AN4 4 -#define AN5 5 +#define AN4 4 +#define AN5 5 -#define SPEEDFILT 400 // centimeters/second; the speed below which a groundstart will be triggered +#define SPEEDFILT 400 // centimeters/second; the speed below + // which a groundstart will be + // triggered // EEPROM addresses -#define EEPROM_MAX_ADDR 4096 +#define EEPROM_MAX_ADDR 4096 // parameters get the first 1280 bytes of EEPROM, remainder is for waypoints -#define WP_START_BYTE 0x500 // where in memory home WP is stored + all other WP +#define WP_START_BYTE 0x500 // where in memory home WP is stored + all other + // WP #define WP_SIZE 15 // fence points are stored at the end of the EEPROM @@ -211,12 +231,17 @@ enum gcs_severity { #define FENCE_WP_SIZE sizeof(Vector2l) #define FENCE_START_BYTE (EEPROM_MAX_ADDR-(MAX_FENCEPOINTS*FENCE_WP_SIZE)) -#define MAX_WAYPOINTS ((FENCE_START_BYTE - WP_START_BYTE) / WP_SIZE) - 1 // - 1 to be safe +#define MAX_WAYPOINTS ((FENCE_START_BYTE - WP_START_BYTE) / WP_SIZE) - 1 // - + // 1 + // to + // be + // safe #define ONBOARD_PARAM_NAME_LENGTH 15 -// convert a boolean (0 or 1) to a sign for multiplying (0 maps to 1, 1 maps to -1) -#define BOOL_TO_SIGN(bvalue) ((bvalue)?-1:1) +// convert a boolean (0 or 1) to a sign for multiplying (0 maps to 1, 1 maps +// to -1) +#define BOOL_TO_SIGN(bvalue) ((bvalue) ? -1 : 1) // mark a function as not to be inlined #define NOINLINE __attribute__((noinline))