diff --git a/src/main/flight/mixer.c b/src/main/flight/mixer.c index 06b014c035..6938c35aa9 100755 --- a/src/main/flight/mixer.c +++ b/src/main/flight/mixer.c @@ -444,7 +444,7 @@ void mixerInit(mixerMode_e mixerMode, motorMixer_t *initialCustomMixers) #endif #ifdef USE_SERVOS -void mixerUsePWMIOConfiguration(pwmIOConfiguration_t *pwmIOConfiguration) +void mixerUsePWMIOConfiguration(void) { int i; @@ -482,9 +482,8 @@ void mixerUsePWMIOConfiguration(pwmIOConfiguration_t *pwmIOConfiguration) mixerResetDisarmedMotors(); } #else -void mixerUsePWMIOConfiguration(pwmIOConfiguration_t *pwmIOConfiguration) +void mixerUsePWMIOConfiguration(void) { - UNUSED(pwmIOConfiguration); motorCount = 4; uint8_t i; for (i = 0; i < motorCount; i++) { diff --git a/src/main/main.c b/src/main/main.c index a056393fc1..3999685d8c 100644 --- a/src/main/main.c +++ b/src/main/main.c @@ -114,7 +114,7 @@ void mixerInit(mixerMode_e mixerMode, motorMixer_t *customMotorMixers, servoMixe #else void mixerInit(mixerMode_e mixerMode, motorMixer_t *customMotorMixers); #endif -void mixerUsePWMIOConfiguration(pwmIOConfiguration_t *pwmIOConfiguration); +void mixerUsePWMIOConfiguration(void); void rxInit(rxConfig_t *rxConfig, modeActivationCondition_t *modeActivationConditions); void gpsPreInit(gpsConfig_t *initialGpsConfig); void gpsInit(serialConfig_t *serialConfig, gpsConfig_t *initialGpsConfig); @@ -282,9 +282,9 @@ void init(void) pwmRxInit(masterConfig.inputFilteringMode); // pwmInit() needs to be called as soon as possible for ESC compatibility reasons - pwmIOConfiguration_t *pwmIOConfiguration = pwmInit(&pwm_params); + pwmInit(&pwm_params); - mixerUsePWMIOConfiguration(pwmIOConfiguration); + mixerUsePWMIOConfiguration(); if (!feature(FEATURE_ONESHOT125)) motorControlEnable = true; diff --git a/src/main/telemetry/telemetry.c b/src/main/telemetry/telemetry.c index 137e7b1e75..f8f0824ccb 100644 --- a/src/main/telemetry/telemetry.c +++ b/src/main/telemetry/telemetry.c @@ -23,6 +23,8 @@ #ifdef TELEMETRY +#include "common/utils.h" + #include "drivers/gpio.h" #include "drivers/timer.h" #include "drivers/serial.h" @@ -106,6 +108,9 @@ void telemetryProcess(rxConfig_t *rxConfig, uint16_t deadband3d_throttle) { #if defined(TELEMETRY_FRSKY) handleFrSkyTelemetry(rxConfig, deadband3d_throttle); +#else + UNUSED(rxConfig); + UNUSED(deadband3d_throttle); #endif #if defined(TELEMETRY_HOTT)