From 2c8e8532941e405a751cb6e056dcca99df0138c1 Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Mon, 19 Oct 2015 13:25:10 +0200 Subject: [PATCH] Drivers: fix formatting --- src/drivers/boards/px4io-v1/board_config.h | 12 ++++++------ src/drivers/drv_device.h | 2 +- src/drivers/drv_pwm_output.h | 2 +- src/drivers/roboclaw/RoboClaw.hpp | 16 ++++++++-------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/drivers/boards/px4io-v1/board_config.h b/src/drivers/boards/px4io-v1/board_config.h index 59c17431c7..e05e030713 100644 --- a/src/drivers/boards/px4io-v1/board_config.h +++ b/src/drivers/boards/px4io-v1/board_config.h @@ -30,10 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. * ****************************************************************************/ - + /** * @file board_config.h - * + * * PX4IO hardware definitions. */ @@ -59,11 +59,11 @@ /* LEDs */ #define GPIO_LED1 (GPIO_OUTPUT|GPIO_CNF_OUTOD|GPIO_MODE_50MHz|\ - GPIO_OUTPUT_CLEAR|GPIO_PORTB|GPIO_PIN14) + GPIO_OUTPUT_CLEAR|GPIO_PORTB|GPIO_PIN14) #define GPIO_LED2 (GPIO_OUTPUT|GPIO_CNF_OUTOD|GPIO_MODE_50MHz|\ - GPIO_OUTPUT_CLEAR|GPIO_PORTB|GPIO_PIN15) + GPIO_OUTPUT_CLEAR|GPIO_PORTB|GPIO_PIN15) #define GPIO_LED3 (GPIO_OUTPUT|GPIO_CNF_OUTOD|GPIO_MODE_50MHz|\ - GPIO_OUTPUT_CLEAR|GPIO_PORTB|GPIO_PIN10) + GPIO_OUTPUT_CLEAR|GPIO_PORTB|GPIO_PIN10) /* Safety switch button *************************************************************/ @@ -86,7 +86,7 @@ #define GPIO_ADC_VBATT (GPIO_INPUT|GPIO_CNF_ANALOGIN|GPIO_MODE_INPUT|GPIO_PORTA|GPIO_PIN4) #define GPIO_ADC_IN5 (GPIO_INPUT|GPIO_CNF_ANALOGIN|GPIO_MODE_INPUT|GPIO_PORTA|GPIO_PIN5) -/* +/* * High-resolution timer */ #define HRT_TIMER 1 /* use timer1 for the HRT */ diff --git a/src/drivers/drv_device.h b/src/drivers/drv_device.h index e0226590bc..02dbe7af67 100644 --- a/src/drivers/drv_device.h +++ b/src/drivers/drv_device.h @@ -68,7 +68,7 @@ #ifdef __PX4_POSIX #ifndef SIOCDEVPRIVATE - #define SIOCDEVPRIVATE 1 +#define SIOCDEVPRIVATE 1 #endif #define DIOC_GETPRIV SIOCDEVPRIVATE diff --git a/src/drivers/drv_pwm_output.h b/src/drivers/drv_pwm_output.h index fc619866be..bb04245333 100644 --- a/src/drivers/drv_pwm_output.h +++ b/src/drivers/drv_pwm_output.h @@ -65,7 +65,7 @@ __BEGIN_DECLS #define pwm_output_values output_pwm_s #ifndef PWM_OUTPUT_MAX_CHANNELS - #define PWM_OUTPUT_MAX_CHANNELS output_pwm_s::PWM_OUTPUT_MAX_CHANNELS +#define PWM_OUTPUT_MAX_CHANNELS output_pwm_s::PWM_OUTPUT_MAX_CHANNELS #endif /** diff --git a/src/drivers/roboclaw/RoboClaw.hpp b/src/drivers/roboclaw/RoboClaw.hpp index 58994d6fa6..f2096088b9 100644 --- a/src/drivers/roboclaw/RoboClaw.hpp +++ b/src/drivers/roboclaw/RoboClaw.hpp @@ -61,7 +61,7 @@ public: CH_VOLTAGE_LEFT = 0, CH_VOLTAGE_RIGHT }; - + /** motors */ enum e_motor { MOTOR_1 = 0, @@ -70,15 +70,15 @@ public: /** * constructor - * @param deviceName the name of the + * @param deviceName the name of the * serial port e.g. "/dev/ttyS2" * @param address the adddress of the motor * (selectable on roboclaw) * @param pulsesPerRev # of encoder * pulses per revolution of wheel */ - RoboClaw(const char *deviceName, uint16_t address, - uint16_t pulsesPerRev); + RoboClaw(const char *deviceName, uint16_t address, + uint16_t pulsesPerRev); /** * deconstructor @@ -153,7 +153,7 @@ private: // advanced motor control CMD_READ_SPEED_HIRES_1 = 30, - CMD_READ_SPEED_HIRES_2 = 31, + CMD_READ_SPEED_HIRES_2 = 31, CMD_SIGNED_DUTYCYCLE_1 = 32, CMD_SIGNED_DUTYCYCLE_2 = 33, }; @@ -181,12 +181,12 @@ private: int16_t _motor2Overflow; // private methods - uint16_t _sumBytes(uint8_t * buf, size_t n); - int _sendCommand(e_command cmd, uint8_t * data, size_t n_data, uint16_t & prev_sum); + uint16_t _sumBytes(uint8_t *buf, size_t n); + int _sendCommand(e_command cmd, uint8_t *data, size_t n_data, uint16_t &prev_sum); }; // unit testing int roboclawTest(const char *deviceName, uint8_t address, - uint16_t pulsesPerRev); + uint16_t pulsesPerRev); // vi:noet:smarttab:autoindent:ts=4:sw=4:tw=78