diff --git a/src/main/config/config.c b/src/main/config/config.c index 9489760cf1..b4baeb24df 100755 --- a/src/main/config/config.c +++ b/src/main/config/config.c @@ -399,7 +399,7 @@ uint8_t getCurrentControlRateProfile(void) static void setControlRateProfile(uint8_t profileIndex) { currentControlRateProfileIndex = profileIndex; - masterConfig.profile[getCurrentProfile()].activeRateProfile = profileIndex; + masterConfig.profile[getCurrentProfile()].activeRateProfile = profileIndex; currentControlRateProfile = &masterConfig.profile[getCurrentProfile()].controlRateProfile[profileIndex]; } @@ -538,10 +538,10 @@ static void resetConf(void) #ifdef GPS // gps/nav stuff - masterConfig.gpsConfig.provider = GPS_NMEA; - masterConfig.gpsConfig.sbasMode = SBAS_AUTO; + masterConfig.gpsConfig.provider = GPS_NMEA; + masterConfig.gpsConfig.sbasMode = SBAS_AUTO; masterConfig.gpsConfig.autoConfig = GPS_AUTOCONFIG_ON; - masterConfig.gpsConfig.autoBaud = GPS_AUTOBAUD_OFF; + masterConfig.gpsConfig.autoBaud = GPS_AUTOBAUD_OFF; #endif resetSerialConfig(&masterConfig.serialConfig); diff --git a/src/main/drivers/bus_spi.h b/src/main/drivers/bus_spi.h index 5acf9150e1..d408eac2f7 100644 --- a/src/main/drivers/bus_spi.h +++ b/src/main/drivers/bus_spi.h @@ -17,13 +17,6 @@ #pragma once -/* -#define SPI_0_28125MHZ_CLOCK_DIVIDER 256 -#define SPI_0_5625MHZ_CLOCK_DIVIDER 128 -#define SPI_18MHZ_CLOCK_DIVIDER 2 -#define SPI_9MHZ_CLOCK_DIVIDER 4 -*/ - #include #include "io.h" #include "rcc.h" diff --git a/src/main/io/serial_cli.c b/src/main/io/serial_cli.c index 36782a2d67..eaabecb370 100644 --- a/src/main/io/serial_cli.c +++ b/src/main/io/serial_cli.c @@ -463,7 +463,7 @@ static const char * const lookupTableSuperExpoYaw[] = { "OFF", "ON", "ALWAYS" }; -static const char * const lookupTableFastPwm[] = { +static const char * const lookupTablePwmProtocol[] = { "OFF", "ONESHOT125", "ONESHOT42", "MULTISHOT", "BRUSHED" }; @@ -525,7 +525,7 @@ static const lookupTableEntry_t lookupTables[] = { { lookupTableMagHardware, sizeof(lookupTableMagHardware) / sizeof(char *) }, { lookupTableDebug, sizeof(lookupTableDebug) / sizeof(char *) }, { lookupTableSuperExpoYaw, sizeof(lookupTableSuperExpoYaw) / sizeof(char *) }, - { lookupTableFastPwm, sizeof(lookupTableFastPwm) / sizeof(char *) }, + { lookupTablePwmProtocol, sizeof(lookupTablePwmProtocol) / sizeof(char *) }, { lookupDeltaMethod, sizeof(lookupDeltaMethod) / sizeof(char *) }, #ifdef OSD { lookupTableOsdType, sizeof(lookupTableOsdType) / sizeof(char *) }, diff --git a/src/main/main.c b/src/main/main.c index 59dc9e8295..16c581c598 100644 --- a/src/main/main.c +++ b/src/main/main.c @@ -322,6 +322,7 @@ void init(void) pwm_params.idlePulse = masterConfig.escAndServoConfig.mincommand; if (feature(FEATURE_3D)) pwm_params.idlePulse = masterConfig.flight3DConfig.neutral3d; + if (masterConfig.motor_pwm_protocol == PWM_TYPE_BRUSHED) { pwm_params.idlePulse = 0; // brushed motors use_unsyncedPwm = false;