From c8302be4aeac0e879bb5fc51d9df9e4c11c4f1e2 Mon Sep 17 00:00:00 2001 From: Andrey Date: Tue, 5 Sep 2023 15:33:05 -0400 Subject: [PATCH] type clean-up to avoid nasty cast --- firmware/controllers/system/timer/pwm_generator_logic.cpp | 2 +- firmware/controllers/system/timer/pwm_generator_logic.h | 2 +- firmware/controllers/trigger/trigger_emulator_algo.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/firmware/controllers/system/timer/pwm_generator_logic.cpp b/firmware/controllers/system/timer/pwm_generator_logic.cpp index 4b1886d83b..5d4d8962e0 100644 --- a/firmware/controllers/system/timer/pwm_generator_logic.cpp +++ b/firmware/controllers/system/timer/pwm_generator_logic.cpp @@ -330,7 +330,7 @@ void startSimplePwm(SimplePwm *state, const char *msg, ExecutorInterface *execut state->setFrequency(frequency); state->setSimplePwmDutyCycle(dutyCycle); - state->weComplexInit(msg, executor, &state->seq, NULL, (pwm_gen_callback*)applyPinState); + state->weComplexInit(msg, executor, &state->seq, NULL, applyPinState); } void startSimplePwmExt(SimplePwm *state, const char *msg, diff --git a/firmware/controllers/system/timer/pwm_generator_logic.h b/firmware/controllers/system/timer/pwm_generator_logic.h index 8f20e982e0..1eb314a97a 100644 --- a/firmware/controllers/system/timer/pwm_generator_logic.h +++ b/firmware/controllers/system/timer/pwm_generator_logic.h @@ -39,7 +39,7 @@ typedef struct { class PwmConfig; typedef void (pwm_cycle_callback)(PwmConfig *state); -typedef void (pwm_gen_callback)(int stateIndex, void *arg); +typedef void (pwm_gen_callback)(int stateIndex, PwmConfig *arg); typedef enum { PM_ZERO, diff --git a/firmware/controllers/trigger/trigger_emulator_algo.cpp b/firmware/controllers/trigger/trigger_emulator_algo.cpp index 085fca13e8..fc7643d638 100644 --- a/firmware/controllers/trigger/trigger_emulator_algo.cpp +++ b/firmware/controllers/trigger/trigger_emulator_algo.cpp @@ -170,7 +170,7 @@ static void startSimulatedTriggerSignal() { triggerEmulatorSignal.weComplexInit("position sensor", &engine->executor, &s->wave, - updateTriggerWaveformIfNeeded, (pwm_gen_callback*)emulatorApplyPinState); + updateTriggerWaveformIfNeeded, emulatorApplyPinState); hasInitTriggerEmulator = true; }