From 7192e9de19d0796d0965d80473cd892f1d0cdc66 Mon Sep 17 00:00:00 2001 From: mikeller Date: Tue, 13 Feb 2018 19:08:55 +1300 Subject: [PATCH] Fixed parameter group violations in `motorDevConfig_t`, incremented EEPROM config version before 3.3.0 release. --- src/main/config/config_eeprom.h | 2 +- src/main/drivers/pwm_output.h | 3 +-- src/main/flight/mixer.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/config/config_eeprom.h b/src/main/config/config_eeprom.h index 40c9b8a4e..55499f8bd 100644 --- a/src/main/config/config_eeprom.h +++ b/src/main/config/config_eeprom.h @@ -20,7 +20,7 @@ #include #include -#define EEPROM_CONF_VERSION 167 +#define EEPROM_CONF_VERSION 168 bool isEEPROMContentValid(void); bool loadEEPROM(void); diff --git a/src/main/drivers/pwm_output.h b/src/main/drivers/pwm_output.h index 52de887fe..d6d3cca14 100644 --- a/src/main/drivers/pwm_output.h +++ b/src/main/drivers/pwm_output.h @@ -165,14 +165,13 @@ typedef struct { IO_t io; } pwmOutputPort_t; +//CAVEAT: This is used in the `motorConfig_t` parameter group, so the parameter group constraints apply typedef struct motorDevConfig_s { uint16_t motorPwmRate; // The update rate of motor outputs (50-498Hz) uint8_t motorPwmProtocol; // Pwm Protocol uint8_t motorPwmInversion; // Active-High vs Active-Low. Useful for brushed FCs converted for brushless operation uint8_t useUnsyncedPwm; -#ifdef USE_DSHOT_DMAR uint8_t useBurstDshot; -#endif ioTag_t ioTags[MAX_SUPPORTED_MOTORS]; } motorDevConfig_t; diff --git a/src/main/flight/mixer.c b/src/main/flight/mixer.c index 8f9351227..16c83b4b1 100644 --- a/src/main/flight/mixer.c +++ b/src/main/flight/mixer.c @@ -66,7 +66,7 @@ PG_RESET_TEMPLATE(mixerConfig_t, mixerConfig, .yaw_motors_reversed = false, ); -PG_REGISTER_WITH_RESET_FN(motorConfig_t, motorConfig, PG_MOTOR_CONFIG, 0); +PG_REGISTER_WITH_RESET_FN(motorConfig_t, motorConfig, PG_MOTOR_CONFIG, 1); void pgResetFn_motorConfig(motorConfig_t *motorConfig) {