From 2349d74f0b6e2431f3f2138142c51d7bee8fd715 Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Wed, 25 Mar 2020 15:14:09 -0700 Subject: [PATCH] Default to applyPinState (#1219) * make applyPinState default * consumers * format --- firmware/controllers/actuators/aux_pid.cpp | 2 +- firmware/controllers/actuators/boost_control.cpp | 3 +-- firmware/controllers/actuators/dc_motors.cpp | 9 +++------ firmware/controllers/actuators/pwm_tester.cpp | 10 +++++----- firmware/controllers/core/fsio_impl.cpp | 2 +- .../controllers/system/timer/pwm_generator_logic.cpp | 1 - .../controllers/system/timer/pwm_generator_logic.h | 10 ++++++++-- firmware/hw_layer/pwm_generator.h | 7 ------- 8 files changed, 19 insertions(+), 25 deletions(-) diff --git a/firmware/controllers/actuators/aux_pid.cpp b/firmware/controllers/actuators/aux_pid.cpp index 0d8d6d381d..7a71fdcfc9 100644 --- a/firmware/controllers/actuators/aux_pid.cpp +++ b/firmware/controllers/actuators/aux_pid.cpp @@ -123,7 +123,7 @@ static void turnAuxPidOn(int index) { &engine->executor, engineConfiguration->auxPidPins[index], &instances[index].auxOutputPin, - engineConfiguration->auxPidFrequency[index], 0.1, (pwm_gen_callback*)applyPinState); + engineConfiguration->auxPidFrequency[index], 0.1); } void startAuxPins(void) { diff --git a/firmware/controllers/actuators/boost_control.cpp b/firmware/controllers/actuators/boost_control.cpp index d599695b41..14012d199e 100644 --- a/firmware/controllers/actuators/boost_control.cpp +++ b/firmware/controllers/actuators/boost_control.cpp @@ -160,8 +160,7 @@ static void turnBoostPidOn() { CONFIG(boostControlPin), &enginePins.boostPin, engineConfiguration->boostPwmFrequency, - 0.5f, - (pwm_gen_callback*) applyPinState + 0.5f ); #endif /* EFI_UNIT_TEST */ } diff --git a/firmware/controllers/actuators/dc_motors.cpp b/firmware/controllers/actuators/dc_motors.cpp index e5edd33863..86707311cd 100644 --- a/firmware/controllers/actuators/dc_motors.cpp +++ b/firmware/controllers/actuators/dc_motors.cpp @@ -65,24 +65,21 @@ public: executor, &m_pinEnable, clampedFrequency, - 0, - (pwm_gen_callback*)applyPinState + 0 ); startSimplePwm(&m_pwmDir1, "ETB Dir 1", executor, &m_pinDir1, clampedFrequency, - 0, - (pwm_gen_callback*)applyPinState + 0 ); startSimplePwm(&m_pwmDir2, "ETB Dir 2", executor, &m_pinDir2, clampedFrequency, - 0, - (pwm_gen_callback*)applyPinState + 0 ); #endif /* EFI_UNIT_TEST */ } diff --git a/firmware/controllers/actuators/pwm_tester.cpp b/firmware/controllers/actuators/pwm_tester.cpp index 5ce51f4bfd..aaa57bec03 100644 --- a/firmware/controllers/actuators/pwm_tester.cpp +++ b/firmware/controllers/actuators/pwm_tester.cpp @@ -31,18 +31,18 @@ static void startPwmTest(int freq) { engine->isRunningPwmTest = true; // PD13 pin is initialized elsewhere already - startSimplePwm(&pwmTest[0], "tester", &warningLedPin, 10, 0.5f, applyPinState); + startSimplePwm(&pwmTest[0], "tester", &warningLedPin, 10, 0.5f); /** * See custom_engine.cpp for pinout */ // currently this is PB9 by default - see CONFIG(injectionPins) - startSimplePwm(&pwmTest[1], "tester", &enginePins.injectors[0], freq / 1.3333333333, 0.5f, applyPinState); + startSimplePwm(&pwmTest[1], "tester", &enginePins.injectors[0], freq / 1.3333333333, 0.5f); // currently this is PE2 by default - startSimplePwm(&pwmTest[2], "tester", &enginePins.injectors[1], freq / 1000, 0.5f, applyPinState); + startSimplePwm(&pwmTest[2], "tester", &enginePins.injectors[1], freq / 1000, 0.5f); // currently this is PB8 by default - startSimplePwm(&pwmTest[3], "tester", &enginePins.injectors[2], freq, 0.5, applyPinState); + startSimplePwm(&pwmTest[3], "tester", &enginePins.injectors[2], freq, 0.5); // currently this is PB7 by default - startSimplePwm(&pwmTest[4], "tester", &enginePins.injectors[3], freq / 33.33333333333, 0.5, applyPinState); + startSimplePwm(&pwmTest[4], "tester", &enginePins.injectors[3], freq / 33.33333333333, 0.5); } diff --git a/firmware/controllers/core/fsio_impl.cpp b/firmware/controllers/core/fsio_impl.cpp index c60b72c2c8..7ec68ee54e 100644 --- a/firmware/controllers/core/fsio_impl.cpp +++ b/firmware/controllers/core/fsio_impl.cpp @@ -693,7 +693,7 @@ void initFsioImpl(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX) { } else { startSimplePwmExt(&fsioPwm[i], "FSIOpwm", &engine->executor, - brainPin, &enginePins.fsioOutputs[i], frequency, 0.5f, (pwm_gen_callback*)applyPinState); + brainPin, &enginePins.fsioOutputs[i], frequency, 0.5f); } } } diff --git a/firmware/controllers/system/timer/pwm_generator_logic.cpp b/firmware/controllers/system/timer/pwm_generator_logic.cpp index 0208e8bb9e..68d5189990 100644 --- a/firmware/controllers/system/timer/pwm_generator_logic.cpp +++ b/firmware/controllers/system/timer/pwm_generator_logic.cpp @@ -373,4 +373,3 @@ void applyPinState(int stateIndex, PwmConfig *state) /* pwm_gen_callback */ { output->setValue(value); } } - diff --git a/firmware/controllers/system/timer/pwm_generator_logic.h b/firmware/controllers/system/timer/pwm_generator_logic.h index 182cc9d27b..5d93944e3d 100644 --- a/firmware/controllers/system/timer/pwm_generator_logic.h +++ b/firmware/controllers/system/timer/pwm_generator_logic.h @@ -125,6 +125,12 @@ private: SingleChannelStateSequence waveInstance; }; +/** + * default implementation of pwm_gen_callback which simply toggles the pins + * + */ +void applyPinState(int stateIndex, PwmConfig* state) /* pwm_gen_callback */; + /** * Start a one-channel software PWM driver. * @@ -133,7 +139,7 @@ private: void startSimplePwm(SimplePwm *state, const char *msg, ExecutorInterface *executor, OutputPin *output, - float frequency, float dutyCycle, pwm_gen_callback *stateChangeCallback); + float frequency, float dutyCycle, pwm_gen_callback *stateChangeCallback = (pwm_gen_callback*)applyPinState); /** * initialize GPIO pin and start a one-channel software PWM driver. @@ -144,7 +150,7 @@ void startSimplePwmExt(SimplePwm *state, const char *msg, ExecutorInterface *executor, brain_pin_e brainPin, OutputPin *output, - float frequency, float dutyCycle, pwm_gen_callback *stateChangeCallback); + float frequency, float dutyCycle, pwm_gen_callback *stateChangeCallback = (pwm_gen_callback*)applyPinState); void copyPwmParameters(PwmConfig *state, int phaseCount, float const *switchTimes, int waveCount, pin_state_t *const *pinStates); diff --git a/firmware/hw_layer/pwm_generator.h b/firmware/hw_layer/pwm_generator.h index 47c07129a0..06c0401cb7 100644 --- a/firmware/hw_layer/pwm_generator.h +++ b/firmware/hw_layer/pwm_generator.h @@ -15,10 +15,3 @@ #include "efi_gpio.h" void initPwmGenerator(void); - -/** - * default implementation of pwm_gen_callback which simply toggles the pins - * - */ -void applyPinState(int stateIndex, PwmConfig* state) /* pwm_gen_callback */; -