From 4d368e0ca82d03fe2ce7d17e6d6033ac9c7843c9 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sun, 3 Feb 2019 01:04:24 -0500 Subject: [PATCH] Refactor Trigger System #635 --- firmware/controllers/system/pwm_generator_logic.cpp | 2 +- firmware/controllers/system/pwm_generator_logic.h | 2 +- firmware/controllers/trigger/decoders/trigger_structure.cpp | 2 +- firmware/controllers/trigger/decoders/trigger_structure.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/firmware/controllers/system/pwm_generator_logic.cpp b/firmware/controllers/system/pwm_generator_logic.cpp index 808e868cc9..2a545a93b9 100644 --- a/firmware/controllers/system/pwm_generator_logic.cpp +++ b/firmware/controllers/system/pwm_generator_logic.cpp @@ -245,7 +245,7 @@ static void timerCallback(PwmConfig *state) { * Incoming parameters are potentially just values on current stack, so we have to copy * into our own permanent storage, right? */ -void copyPwmParameters(PwmConfig *state, int phaseCount, float *switchTimes, int waveCount, pin_state_t **pinStates) { +void copyPwmParameters(PwmConfig *state, int phaseCount, float *switchTimes, int waveCount, pin_state_t *const *pinStates) { state->phaseCount = phaseCount; for (int phaseIndex = 0; phaseIndex < phaseCount; phaseIndex++) { diff --git a/firmware/controllers/system/pwm_generator_logic.h b/firmware/controllers/system/pwm_generator_logic.h index e8eb333a8b..e78eb13c7d 100644 --- a/firmware/controllers/system/pwm_generator_logic.h +++ b/firmware/controllers/system/pwm_generator_logic.h @@ -140,6 +140,6 @@ void startSimplePwmExt(SimplePwm *state, float frequency, float dutyCycle, pwm_gen_callback *stateChangeCallback); void copyPwmParameters(PwmConfig *state, int phaseCount, float *switchTimes, - int waveCount, pin_state_t **pinStates); + int waveCount, pin_state_t *const *pinStates); #endif /* PWM_GENERATOR_LOGIC_H_ */ diff --git a/firmware/controllers/trigger/decoders/trigger_structure.cpp b/firmware/controllers/trigger/decoders/trigger_structure.cpp index f3b4c35943..b403a3b845 100644 --- a/firmware/controllers/trigger/decoders/trigger_structure.cpp +++ b/firmware/controllers/trigger/decoders/trigger_structure.cpp @@ -225,7 +225,7 @@ void TriggerShape::addEvent(bool useOnlyRisingEdgeForTrigger, angle_t angle, tri shapeDefinitionError = true; return; } - wave->setState(/* channelIndex */ 0, /* value */ initialState[i]); + wave->setState(/* switchIndex */ 0, /* value */ initialState[i]); } isFrontEvent[0] = TV_RISE == stateParam; diff --git a/firmware/controllers/trigger/decoders/trigger_structure.h b/firmware/controllers/trigger/decoders/trigger_structure.h index 8128ff55a7..aaea4ad9a3 100644 --- a/firmware/controllers/trigger/decoders/trigger_structure.h +++ b/firmware/controllers/trigger/decoders/trigger_structure.h @@ -185,7 +185,7 @@ public: MultiWave wave; // todo: add a runtime validation which would verify that this field was set properly - // tood: maybe even automate this flag calculation? + // todo: maybe even automate this flag calculation? int initialState[PWM_PHASE_MAX_WAVE_PER_PWM]; int8_t isFrontEvent[PWM_PHASE_MAX_COUNT];