Commit 920cac52 authored by Michael Hope's avatar Michael Hope
Browse files

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: default avatarMichael Hope <mlhx@google.com>
parent c1d1ef0a
...@@ -315,102 +315,102 @@ static const adjustmentConfig_t defaultAdjustmentConfigs[ADJUSTMENT_FUNCTION_COU ...@@ -315,102 +315,102 @@ static const adjustmentConfig_t defaultAdjustmentConfigs[ADJUSTMENT_FUNCTION_COU
{ {
.adjustmentFunction = ADJUSTMENT_RC_RATE, .adjustmentFunction = ADJUSTMENT_RC_RATE,
.mode = ADJUSTMENT_MODE_STEP, .mode = ADJUSTMENT_MODE_STEP,
.data.stepConfig.step = 1 .data = { .stepConfig = { .step = 1 }}
}, },
{ {
.adjustmentFunction = ADJUSTMENT_RC_EXPO, .adjustmentFunction = ADJUSTMENT_RC_EXPO,
.mode = ADJUSTMENT_MODE_STEP, .mode = ADJUSTMENT_MODE_STEP,
.data.stepConfig.step = 1 .data = { .stepConfig = { .step = 1 }}
}, },
{ {
.adjustmentFunction = ADJUSTMENT_THROTTLE_EXPO, .adjustmentFunction = ADJUSTMENT_THROTTLE_EXPO,
.mode = ADJUSTMENT_MODE_STEP, .mode = ADJUSTMENT_MODE_STEP,
.data.stepConfig.step = 1 .data = { .stepConfig = { .step = 1 }}
}, },
{ {
.adjustmentFunction = ADJUSTMENT_PITCH_ROLL_RATE, .adjustmentFunction = ADJUSTMENT_PITCH_ROLL_RATE,
.mode = ADJUSTMENT_MODE_STEP, .mode = ADJUSTMENT_MODE_STEP,
.data.stepConfig.step = 1 .data = { .stepConfig = { .step = 1 }}
}, },
{ {
.adjustmentFunction = ADJUSTMENT_YAW_RATE, .adjustmentFunction = ADJUSTMENT_YAW_RATE,
.mode = ADJUSTMENT_MODE_STEP, .mode = ADJUSTMENT_MODE_STEP,
.data.stepConfig.step = 1 .data = { .stepConfig = { .step = 1 }}
}, },
{ {
.adjustmentFunction = ADJUSTMENT_PITCH_ROLL_P, .adjustmentFunction = ADJUSTMENT_PITCH_ROLL_P,
.mode = ADJUSTMENT_MODE_STEP, .mode = ADJUSTMENT_MODE_STEP,
.data.stepConfig.step = 1 .data = { .stepConfig = { .step = 1 }}
}, },
{ {
.adjustmentFunction = ADJUSTMENT_PITCH_ROLL_I, .adjustmentFunction = ADJUSTMENT_PITCH_ROLL_I,
.mode = ADJUSTMENT_MODE_STEP, .mode = ADJUSTMENT_MODE_STEP,
.data.stepConfig.step = 1 .data = { .stepConfig = { .step = 1 }}
}, },
{ {
.adjustmentFunction = ADJUSTMENT_PITCH_ROLL_D, .adjustmentFunction = ADJUSTMENT_PITCH_ROLL_D,
.mode = ADJUSTMENT_MODE_STEP, .mode = ADJUSTMENT_MODE_STEP,
.data.stepConfig.step = 1 .data = { .stepConfig = { .step = 1 }}
}, },
{ {
.adjustmentFunction = ADJUSTMENT_YAW_P, .adjustmentFunction = ADJUSTMENT_YAW_P,
.mode = ADJUSTMENT_MODE_STEP, .mode = ADJUSTMENT_MODE_STEP,
.data.stepConfig.step = 1 .data = { .stepConfig = { .step = 1 }}
}, },
{ {
.adjustmentFunction = ADJUSTMENT_YAW_I, .adjustmentFunction = ADJUSTMENT_YAW_I,
.mode = ADJUSTMENT_MODE_STEP, .mode = ADJUSTMENT_MODE_STEP,
.data.stepConfig.step = 1 .data = { .stepConfig = { .step = 1 }}
}, },
{ {
.adjustmentFunction = ADJUSTMENT_YAW_D, .adjustmentFunction = ADJUSTMENT_YAW_D,
.mode = ADJUSTMENT_MODE_STEP, .mode = ADJUSTMENT_MODE_STEP,
.data.stepConfig.step = 1 .data = { .stepConfig = { .step = 1 }}
}, },
{ {
.adjustmentFunction = ADJUSTMENT_RATE_PROFILE, .adjustmentFunction = ADJUSTMENT_RATE_PROFILE,
.mode = ADJUSTMENT_MODE_SELECT, .mode = ADJUSTMENT_MODE_SELECT,
.data.selectConfig.switchPositions = 3 .data = { .selectConfig = { .switchPositions = 3 }}
}, },
{ {
.adjustmentFunction = ADJUSTMENT_PITCH_RATE, .adjustmentFunction = ADJUSTMENT_PITCH_RATE,
.mode = ADJUSTMENT_MODE_STEP, .mode = ADJUSTMENT_MODE_STEP,
.data.stepConfig.step = 1 .data = { .stepConfig = { .step = 1 }}
}, },
{ {
.adjustmentFunction = ADJUSTMENT_ROLL_RATE, .adjustmentFunction = ADJUSTMENT_ROLL_RATE,
.mode = ADJUSTMENT_MODE_STEP, .mode = ADJUSTMENT_MODE_STEP,
.data.stepConfig.step = 1 .data = { .stepConfig = { .step = 1 }}
}, },
{ {
.adjustmentFunction = ADJUSTMENT_PITCH_P, .adjustmentFunction = ADJUSTMENT_PITCH_P,
.mode = ADJUSTMENT_MODE_STEP, .mode = ADJUSTMENT_MODE_STEP,
.data.stepConfig.step = 1 .data = { .stepConfig = { .step = 1 }}
}, },
{ {
.adjustmentFunction = ADJUSTMENT_PITCH_I, .adjustmentFunction = ADJUSTMENT_PITCH_I,
.mode = ADJUSTMENT_MODE_STEP, .mode = ADJUSTMENT_MODE_STEP,
.data.stepConfig.step = 1 .data = { .stepConfig = { .step = 1 }}
}, },
{ {
.adjustmentFunction = ADJUSTMENT_PITCH_D, .adjustmentFunction = ADJUSTMENT_PITCH_D,
.mode = ADJUSTMENT_MODE_STEP, .mode = ADJUSTMENT_MODE_STEP,
.data.stepConfig.step = 1 .data = { .stepConfig = { .step = 1 }}
}, },
{ {
.adjustmentFunction = ADJUSTMENT_ROLL_P, .adjustmentFunction = ADJUSTMENT_ROLL_P,
.mode = ADJUSTMENT_MODE_STEP, .mode = ADJUSTMENT_MODE_STEP,
.data.stepConfig.step = 1 .data = { .stepConfig = { .step = 1 }}
}, },
{ {
.adjustmentFunction = ADJUSTMENT_ROLL_I, .adjustmentFunction = ADJUSTMENT_ROLL_I,
.mode = ADJUSTMENT_MODE_STEP, .mode = ADJUSTMENT_MODE_STEP,
.data.stepConfig.step = 1 .data = { .stepConfig = { .step = 1 }}
}, },
{ {
.adjustmentFunction = ADJUSTMENT_ROLL_D, .adjustmentFunction = ADJUSTMENT_ROLL_D,
.mode = ADJUSTMENT_MODE_STEP, .mode = ADJUSTMENT_MODE_STEP,
.data.stepConfig.step = 1 .data = { .stepConfig = { .step = 1 }}
} }
}; };
......
...@@ -207,9 +207,9 @@ void init(void) ...@@ -207,9 +207,9 @@ void init(void)
if (feature(FEATURE_SONAR)) { if (feature(FEATURE_SONAR)) {
sonarHardware = sonarGetHardwareConfiguration(&masterConfig.batteryConfig); sonarHardware = sonarGetHardwareConfiguration(&masterConfig.batteryConfig);
sonarGPIOConfig_t sonarGPIOConfig = { sonarGPIOConfig_t sonarGPIOConfig = {
.echoPin = sonarHardware->trigger_pin, .gpio = SONAR_GPIO,
.triggerPin = sonarHardware->echo_pin, .triggerPin = sonarHardware->echo_pin,
.gpio = SONAR_GPIO .echoPin = sonarHardware->trigger_pin,
}; };
pwm_params.sonarGPIOConfig = &sonarGPIOConfig; pwm_params.sonarGPIOConfig = &sonarGPIOConfig;
} }
...@@ -267,9 +267,9 @@ void init(void) ...@@ -267,9 +267,9 @@ void init(void)
#ifdef BEEPER #ifdef BEEPER
beeperConfig_t beeperConfig = { beeperConfig_t beeperConfig = {
.gpioPeripheral = BEEP_PERIPHERAL,
.gpioPin = BEEP_PIN, .gpioPin = BEEP_PIN,
.gpioPort = BEEP_GPIO, .gpioPort = BEEP_GPIO,
.gpioPeripheral = BEEP_PERIPHERAL,
#ifdef BEEPER_INVERTED #ifdef BEEPER_INVERTED
.gpioMode = Mode_Out_PP, .gpioMode = Mode_Out_PP,
.isInverted = true .isInverted = true
......
...@@ -80,21 +80,21 @@ const mpu6050Config_t *selectMPU6050Config(void) ...@@ -80,21 +80,21 @@ const mpu6050Config_t *selectMPU6050Config(void)
// MPU_INT output on rev4 PB13 // MPU_INT output on rev4 PB13
static const mpu6050Config_t nazeRev4MPU6050Config = { static const mpu6050Config_t nazeRev4MPU6050Config = {
.gpioAPB2Peripherals = RCC_APB2Periph_GPIOB, .gpioAPB2Peripherals = RCC_APB2Periph_GPIOB,
.gpioPort = GPIOB,
.gpioPin = Pin_13, .gpioPin = Pin_13,
.gpioPort = GPIOB,
.exti_port_source = GPIO_PortSourceGPIOB, .exti_port_source = GPIO_PortSourceGPIOB,
.exti_pin_source = GPIO_PinSource13,
.exti_line = EXTI_Line13, .exti_line = EXTI_Line13,
.exti_pin_source = GPIO_PinSource13,
.exti_irqn = EXTI15_10_IRQn .exti_irqn = EXTI15_10_IRQn
}; };
// MPU_INT output on rev5 hardware PC13 // MPU_INT output on rev5 hardware PC13
static const mpu6050Config_t nazeRev5MPU6050Config = { static const mpu6050Config_t nazeRev5MPU6050Config = {
.gpioAPB2Peripherals = RCC_APB2Periph_GPIOC, .gpioAPB2Peripherals = RCC_APB2Periph_GPIOC,
.gpioPort = GPIOC,
.gpioPin = Pin_13, .gpioPin = Pin_13,
.gpioPort = GPIOC,
.exti_port_source = GPIO_PortSourceGPIOC, .exti_port_source = GPIO_PortSourceGPIOC,
.exti_pin_source = GPIO_PinSource13,
.exti_line = EXTI_Line13, .exti_line = EXTI_Line13,
.exti_pin_source = GPIO_PinSource13,
.exti_irqn = EXTI15_10_IRQn .exti_irqn = EXTI15_10_IRQn
}; };
...@@ -479,9 +479,6 @@ static void detectMag(magSensor_e magHardwareToUse) ...@@ -479,9 +479,6 @@ static void detectMag(magSensor_e magHardwareToUse)
.gpioPin = Pin_12, .gpioPin = Pin_12,
.gpioPort = GPIOB, .gpioPort = GPIOB,
.exti_port_source = 0,
.exti_pin_source = 0
/* Disabled for v4 needs more work. /* Disabled for v4 needs more work.
.exti_port_source = GPIO_PortSourceGPIOB, .exti_port_source = GPIO_PortSourceGPIOB,
.exti_pin_source = GPIO_PinSource12, .exti_pin_source = GPIO_PinSource12,
...@@ -494,8 +491,8 @@ static void detectMag(magSensor_e magHardwareToUse) ...@@ -494,8 +491,8 @@ static void detectMag(magSensor_e magHardwareToUse)
.gpioPin = Pin_14, .gpioPin = Pin_14,
.gpioPort = GPIOC, .gpioPort = GPIOC,
.exti_port_source = GPIO_PortSourceGPIOC, .exti_port_source = GPIO_PortSourceGPIOC,
.exti_pin_source = GPIO_PinSource14,
.exti_line = EXTI_Line14, .exti_line = EXTI_Line14,
.exti_pin_source = GPIO_PinSource14,
.exti_irqn = EXTI15_10_IRQn .exti_irqn = EXTI15_10_IRQn
}; };
if (hardwareRevision < NAZE32_REV5) { if (hardwareRevision < NAZE32_REV5) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment