From 920cac52532c7ae7a923577afafec6f79045771f Mon Sep 17 00:00:00 2001 From: Michael Hope Date: Thu, 4 Jun 2015 22:25:56 +0200 Subject: [PATCH] various: re-work designated initialisers to work with G++ G++ supports a more limited version of designated initialisers. Reorder fields to be in the right order. Make nested initialisers explicit. Signed-off-by: Michael Hope --- src/main/io/rc_controls.c | 40 +++++++++++++++---------------- src/main/main.c | 8 +++---- src/main/sensors/initialisation.c | 13 ++++------ 3 files changed, 29 insertions(+), 32 deletions(-) diff --git a/src/main/io/rc_controls.c b/src/main/io/rc_controls.c index 13eb0920b..4ac3b7f16 100644 --- a/src/main/io/rc_controls.c +++ b/src/main/io/rc_controls.c @@ -315,102 +315,102 @@ static const adjustmentConfig_t defaultAdjustmentConfigs[ADJUSTMENT_FUNCTION_COU { .adjustmentFunction = ADJUSTMENT_RC_RATE, .mode = ADJUSTMENT_MODE_STEP, - .data.stepConfig.step = 1 + .data = { .stepConfig = { .step = 1 }} }, { .adjustmentFunction = ADJUSTMENT_RC_EXPO, .mode = ADJUSTMENT_MODE_STEP, - .data.stepConfig.step = 1 + .data = { .stepConfig = { .step = 1 }} }, { .adjustmentFunction = ADJUSTMENT_THROTTLE_EXPO, .mode = ADJUSTMENT_MODE_STEP, - .data.stepConfig.step = 1 + .data = { .stepConfig = { .step = 1 }} }, { .adjustmentFunction = ADJUSTMENT_PITCH_ROLL_RATE, .mode = ADJUSTMENT_MODE_STEP, - .data.stepConfig.step = 1 + .data = { .stepConfig = { .step = 1 }} }, { .adjustmentFunction = ADJUSTMENT_YAW_RATE, .mode = ADJUSTMENT_MODE_STEP, - .data.stepConfig.step = 1 + .data = { .stepConfig = { .step = 1 }} }, { .adjustmentFunction = ADJUSTMENT_PITCH_ROLL_P, .mode = ADJUSTMENT_MODE_STEP, - .data.stepConfig.step = 1 + .data = { .stepConfig = { .step = 1 }} }, { .adjustmentFunction = ADJUSTMENT_PITCH_ROLL_I, .mode = ADJUSTMENT_MODE_STEP, - .data.stepConfig.step = 1 + .data = { .stepConfig = { .step = 1 }} }, { .adjustmentFunction = ADJUSTMENT_PITCH_ROLL_D, .mode = ADJUSTMENT_MODE_STEP, - .data.stepConfig.step = 1 + .data = { .stepConfig = { .step = 1 }} }, { .adjustmentFunction = ADJUSTMENT_YAW_P, .mode = ADJUSTMENT_MODE_STEP, - .data.stepConfig.step = 1 + .data = { .stepConfig = { .step = 1 }} }, { .adjustmentFunction = ADJUSTMENT_YAW_I, .mode = ADJUSTMENT_MODE_STEP, - .data.stepConfig.step = 1 + .data = { .stepConfig = { .step = 1 }} }, { .adjustmentFunction = ADJUSTMENT_YAW_D, .mode = ADJUSTMENT_MODE_STEP, - .data.stepConfig.step = 1 + .data = { .stepConfig = { .step = 1 }} }, { .adjustmentFunction = ADJUSTMENT_RATE_PROFILE, .mode = ADJUSTMENT_MODE_SELECT, - .data.selectConfig.switchPositions = 3 + .data = { .selectConfig = { .switchPositions = 3 }} }, { .adjustmentFunction = ADJUSTMENT_PITCH_RATE, .mode = ADJUSTMENT_MODE_STEP, - .data.stepConfig.step = 1 + .data = { .stepConfig = { .step = 1 }} }, { .adjustmentFunction = ADJUSTMENT_ROLL_RATE, .mode = ADJUSTMENT_MODE_STEP, - .data.stepConfig.step = 1 + .data = { .stepConfig = { .step = 1 }} }, { .adjustmentFunction = ADJUSTMENT_PITCH_P, .mode = ADJUSTMENT_MODE_STEP, - .data.stepConfig.step = 1 + .data = { .stepConfig = { .step = 1 }} }, { .adjustmentFunction = ADJUSTMENT_PITCH_I, .mode = ADJUSTMENT_MODE_STEP, - .data.stepConfig.step = 1 + .data = { .stepConfig = { .step = 1 }} }, { .adjustmentFunction = ADJUSTMENT_PITCH_D, .mode = ADJUSTMENT_MODE_STEP, - .data.stepConfig.step = 1 + .data = { .stepConfig = { .step = 1 }} }, { .adjustmentFunction = ADJUSTMENT_ROLL_P, .mode = ADJUSTMENT_MODE_STEP, - .data.stepConfig.step = 1 + .data = { .stepConfig = { .step = 1 }} }, { .adjustmentFunction = ADJUSTMENT_ROLL_I, .mode = ADJUSTMENT_MODE_STEP, - .data.stepConfig.step = 1 + .data = { .stepConfig = { .step = 1 }} }, { .adjustmentFunction = ADJUSTMENT_ROLL_D, .mode = ADJUSTMENT_MODE_STEP, - .data.stepConfig.step = 1 + .data = { .stepConfig = { .step = 1 }} } }; diff --git a/src/main/main.c b/src/main/main.c index f42d00d18..f245b13c3 100644 --- a/src/main/main.c +++ b/src/main/main.c @@ -207,9 +207,9 @@ void init(void) if (feature(FEATURE_SONAR)) { sonarHardware = sonarGetHardwareConfiguration(&masterConfig.batteryConfig); sonarGPIOConfig_t sonarGPIOConfig = { - .echoPin = sonarHardware->trigger_pin, - .triggerPin = sonarHardware->echo_pin, - .gpio = SONAR_GPIO + .gpio = SONAR_GPIO, + .triggerPin = sonarHardware->echo_pin, + .echoPin = sonarHardware->trigger_pin, }; pwm_params.sonarGPIOConfig = &sonarGPIOConfig; } @@ -267,9 +267,9 @@ void init(void) #ifdef BEEPER beeperConfig_t beeperConfig = { + .gpioPeripheral = BEEP_PERIPHERAL, .gpioPin = BEEP_PIN, .gpioPort = BEEP_GPIO, - .gpioPeripheral = BEEP_PERIPHERAL, #ifdef BEEPER_INVERTED .gpioMode = Mode_Out_PP, .isInverted = true diff --git a/src/main/sensors/initialisation.c b/src/main/sensors/initialisation.c index ad9e5f956..d51244709 100644 --- a/src/main/sensors/initialisation.c +++ b/src/main/sensors/initialisation.c @@ -80,21 +80,21 @@ const mpu6050Config_t *selectMPU6050Config(void) // MPU_INT output on rev4 PB13 static const mpu6050Config_t nazeRev4MPU6050Config = { .gpioAPB2Peripherals = RCC_APB2Periph_GPIOB, - .gpioPort = GPIOB, .gpioPin = Pin_13, + .gpioPort = GPIOB, .exti_port_source = GPIO_PortSourceGPIOB, - .exti_pin_source = GPIO_PinSource13, .exti_line = EXTI_Line13, + .exti_pin_source = GPIO_PinSource13, .exti_irqn = EXTI15_10_IRQn }; // MPU_INT output on rev5 hardware PC13 static const mpu6050Config_t nazeRev5MPU6050Config = { .gpioAPB2Peripherals = RCC_APB2Periph_GPIOC, - .gpioPort = GPIOC, .gpioPin = Pin_13, + .gpioPort = GPIOC, .exti_port_source = GPIO_PortSourceGPIOC, - .exti_pin_source = GPIO_PinSource13, .exti_line = EXTI_Line13, + .exti_pin_source = GPIO_PinSource13, .exti_irqn = EXTI15_10_IRQn }; @@ -479,9 +479,6 @@ static void detectMag(magSensor_e magHardwareToUse) .gpioPin = Pin_12, .gpioPort = GPIOB, - .exti_port_source = 0, - .exti_pin_source = 0 - /* Disabled for v4 needs more work. .exti_port_source = GPIO_PortSourceGPIOB, .exti_pin_source = GPIO_PinSource12, @@ -494,8 +491,8 @@ static void detectMag(magSensor_e magHardwareToUse) .gpioPin = Pin_14, .gpioPort = GPIOC, .exti_port_source = GPIO_PortSourceGPIOC, - .exti_pin_source = GPIO_PinSource14, .exti_line = EXTI_Line14, + .exti_pin_source = GPIO_PinSource14, .exti_irqn = EXTI15_10_IRQn }; if (hardwareRevision < NAZE32_REV5) {