From 0f0811d597ebddf26bad8418f7e5e6de9c09e1be Mon Sep 17 00:00:00 2001 From: uncrustify Date: Thu, 16 Aug 2012 23:22:48 -0700 Subject: [PATCH] uncrustify libraries/RC_Channel/RC_Channel_aux.h --- libraries/RC_Channel/RC_Channel_aux.h | 73 ++++++++++++++------------- 1 file changed, 37 insertions(+), 36 deletions(-) diff --git a/libraries/RC_Channel/RC_Channel_aux.h b/libraries/RC_Channel/RC_Channel_aux.h index d50c3f33ff..12ccefc3c9 100644 --- a/libraries/RC_Channel/RC_Channel_aux.h +++ b/libraries/RC_Channel/RC_Channel_aux.h @@ -14,49 +14,50 @@ /// @class RC_Channel_aux /// @brief Object managing one aux. RC channel (CH5-8), with information about its function -class RC_Channel_aux : public RC_Channel{ +class RC_Channel_aux : public RC_Channel { public: - /// Constructor - /// - /// @param key EEPROM storage key for the channel trim parameters. - /// @param name Optional name for the group. - /// - RC_Channel_aux(uint8_t ch_out) : - RC_Channel(ch_out) - {} + /// Constructor + /// + /// @param key EEPROM storage key for the channel trim parameters. + /// @param name Optional name for the group. + /// + RC_Channel_aux(uint8_t ch_out) : + RC_Channel(ch_out) + { + } - typedef enum - { - k_none = 0, ///< disabled - k_manual = 1, ///< manual, just pass-thru the RC in signal - k_flap = 2, ///< flap - k_flap_auto = 3, ///< flap automated - k_aileron = 4, ///< aileron - k_flaperon = 5, ///< flaperon (flaps and aileron combined, needs two independent servos one for each wing) - k_mount_pan = 6, ///< mount yaw (pan) - k_mount_tilt = 7, ///< mount pitch (tilt) - k_mount_roll = 8, ///< mount roll - k_mount_open = 9, ///< mount open (deploy) / close (retract) - k_cam_trigger = 10, ///< camera trigger - k_egg_drop = 11, ///< egg drop - k_mount2_pan = 12, ///< mount2 yaw (pan) - k_mount2_tilt = 13, ///< mount2 pitch (tilt) - k_mount2_roll = 14, ///< mount2 roll - k_mount2_open = 15, ///< mount2 open (deploy) / close (retract) - k_nr_aux_servo_functions ///< This must be the last enum value (only add new values _before_ this one) - } Aux_servo_function_t; + typedef enum + { + k_none = 0, ///< disabled + k_manual = 1, ///< manual, just pass-thru the RC in signal + k_flap = 2, ///< flap + k_flap_auto = 3, ///< flap automated + k_aileron = 4, ///< aileron + k_flaperon = 5, ///< flaperon (flaps and aileron combined, needs two independent servos one for each wing) + k_mount_pan = 6, ///< mount yaw (pan) + k_mount_tilt = 7, ///< mount pitch (tilt) + k_mount_roll = 8, ///< mount roll + k_mount_open = 9, ///< mount open (deploy) / close (retract) + k_cam_trigger = 10, ///< camera trigger + k_egg_drop = 11, ///< egg drop + k_mount2_pan = 12, ///< mount2 yaw (pan) + k_mount2_tilt = 13, ///< mount2 pitch (tilt) + k_mount2_roll = 14, ///< mount2 roll + k_mount2_open = 15, ///< mount2 open (deploy) / close (retract) + k_nr_aux_servo_functions ///< This must be the last enum value (only add new values _before_ this one) + } Aux_servo_function_t; - AP_Int8 function; ///< see Aux_servo_function_t enum + AP_Int8 function; ///< see Aux_servo_function_t enum - void enable_out_ch(unsigned char ch_nr); + void enable_out_ch(unsigned char ch_nr); - void output_ch(unsigned char ch_nr); + void output_ch(unsigned char ch_nr); - static const struct AP_Param::GroupInfo var_info[]; + static const struct AP_Param::GroupInfo var_info[]; }; -void update_aux_servo_function(RC_Channel_aux* rc_a = NULL, RC_Channel_aux* rc_b = NULL, RC_Channel_aux* rc_c = NULL, RC_Channel_aux* rc_d = NULL, RC_Channel_aux* rc_e = NULL, RC_Channel_aux* rc_f = NULL, RC_Channel_aux* rc_g = NULL); -void enable_aux_servos(); -extern RC_Channel_aux* g_rc_function[RC_Channel_aux::k_nr_aux_servo_functions]; // the aux. servo ch. assigned to each function +void update_aux_servo_function(RC_Channel_aux* rc_a = NULL, RC_Channel_aux* rc_b = NULL, RC_Channel_aux* rc_c = NULL, RC_Channel_aux* rc_d = NULL, RC_Channel_aux* rc_e = NULL, RC_Channel_aux* rc_f = NULL, RC_Channel_aux* rc_g = NULL); +void enable_aux_servos(); +extern RC_Channel_aux* g_rc_function[RC_Channel_aux::k_nr_aux_servo_functions]; // the aux. servo ch. assigned to each function #endif /* RC_CHANNEL_AUX_H_ */