From 12a828b391ff30c027b2b2d5a134a4b451559bee Mon Sep 17 00:00:00 2001 From: rusefi Date: Mon, 2 Dec 2019 20:16:41 -0500 Subject: [PATCH] codes clean-up --- firmware/controllers/algo/engine2.cpp | 2 +- firmware/controllers/algo/obd_error_codes.h | 21 ++++++++++++++----- .../scheduling/pwm_generator_logic.cpp | 2 +- .../trigger/decoders/trigger_universal.cpp | 2 +- firmware/controllers/trigger/spark_logic.cpp | 4 ++-- 5 files changed, 21 insertions(+), 10 deletions(-) diff --git a/firmware/controllers/algo/engine2.cpp b/firmware/controllers/algo/engine2.cpp index 3e9bf728a9..8ef3bcd6bf 100644 --- a/firmware/controllers/algo/engine2.cpp +++ b/firmware/controllers/algo/engine2.cpp @@ -145,7 +145,7 @@ void EngineState::periodicFastCallback(DECLARE_ENGINE_PARAMETER_SIGNATURE) { #if EFI_ENGINE_CONTROL if (!engine->slowCallBackWasInvoked) { - warning(CUSTOM_ERR_6696, "Slow not invoked yet"); + warning(CUSTOM_SLOW_NOT_INVOKED, "Slow not invoked yet"); } efitick_t nowNt = getTimeNowNt(); if (ENGINE(rpmCalculator).isCranking(PASS_ENGINE_PARAMETER_SIGNATURE)) { diff --git a/firmware/controllers/algo/obd_error_codes.h b/firmware/controllers/algo/obd_error_codes.h index e5ade9f1ab..1a9d9a5bd5 100644 --- a/firmware/controllers/algo/obd_error_codes.h +++ b/firmware/controllers/algo/obd_error_codes.h @@ -1938,8 +1938,8 @@ typedef enum { CUSTOM_ERR_6585 = 6585, CUSTOM_ERR_6586 = 6586, CUSTOM_ERR_6587 = 6587, - CUSTOM_ERR_6588 = 6588, - CUSTOM_ERR_6589 = 6589, + CUSTOM_NULL_SHAPE = 6588, + CUSTOM_SPARK_ANGLE_1 = 6589, CUSTOM_ERR_6590 = 6590, CUSTOM_ERR_6591 = 6591, @@ -2049,15 +2049,26 @@ typedef enum { CUSTOM_ERR_6686 = 6686, CUSTOM_ERR_6687 = 6687, CUSTOM_ERR_6688 = 6688, - CUSTOM_ERR_6689 = 6689, + CUSTOM_SPARK_ANGLE_9 = 6689, + + CUSTOM_INVALID_ADC = 6690, + CUSTOM_ERR_6691 = 6691, + CUSTOM_ERR_6692 = 6692, + CUSTOM_ERR_6693 = 6693, + CUSTOM_ERR_6694 = 6694, + CUSTOM_ERR_6695 = 6695, + CUSTOM_ERR_6696 = 6696, + CUSTOM_ERR_6697 = 6697, + CUSTOM_ERR_6698 = 6698, + CUSTOM_ERR_6699 = 6699, CUSTOM_ERR_MAP_START_ASSERT = 6690, CUSTOM_ERR_MAP_AVG_OFFSET = 6691, CUSTOM_ERR_MAP_CYL_OFFSET = 6692, CUSTOM_ERR_PWM_DUTY_ASSERT = 6693, CUSTOM_ERR_ZERO_CRANKING_FUEL = 6694, - CUSTOM_ERR_6695 = 6695, - CUSTOM_ERR_6696 = 6696, + CUSTOM_NULL_EXECUTOR = 6695, + CUSTOM_SLOW_NOT_INVOKED = 6696, CUSTOM_PWM_CYCLE_START = 6697, CUSTOM_ERR_ARRAY_IS_FULL = 6698, CUSTOM_ERR_ARRAY_REMOVE_ERROR = 6699, diff --git a/firmware/controllers/scheduling/pwm_generator_logic.cpp b/firmware/controllers/scheduling/pwm_generator_logic.cpp index b0c6ed99bc..8d27dfb42a 100644 --- a/firmware/controllers/scheduling/pwm_generator_logic.cpp +++ b/firmware/controllers/scheduling/pwm_generator_logic.cpp @@ -258,7 +258,7 @@ static void timerCallback(PwmConfig *state) { return; } if (state->executor == NULL) { - firmwareError(CUSTOM_ERR_6695, "exec on %s", state->name); + firmwareError(CUSTOM_NULL_EXECUTOR, "exec on %s", state->name); return; } diff --git a/firmware/controllers/trigger/decoders/trigger_universal.cpp b/firmware/controllers/trigger/decoders/trigger_universal.cpp index 4459eb2d72..952e243506 100644 --- a/firmware/controllers/trigger/decoders/trigger_universal.cpp +++ b/firmware/controllers/trigger/decoders/trigger_universal.cpp @@ -35,7 +35,7 @@ void initializeSkippedToothTriggerShapeExt(TriggerShape *s, int totalTeethCount, s->setShapeDefinitionError(true); return; } - efiAssertVoid(CUSTOM_ERR_6588, s != NULL, "TriggerShape is NULL"); + efiAssertVoid(CUSTOM_NULL_SHAPE, s != NULL, "TriggerShape is NULL"); s->initialize(operationMode, false); s->setTriggerSynchronizationGap(skippedCount + 1); diff --git a/firmware/controllers/trigger/spark_logic.cpp b/firmware/controllers/trigger/spark_logic.cpp index c8f4e3c2af..08c2336722 100644 --- a/firmware/controllers/trigger/spark_logic.cpp +++ b/firmware/controllers/trigger/spark_logic.cpp @@ -87,9 +87,9 @@ static void prepareCylinderIgnitionSchedule(angle_t dwellAngleDuration, floatms_ // this correction is usually zero (not used) cfg_float_t_1f perCylinderCorrection = CONFIG(timing_offset_cylinder[event->cylinderIndex]); const angle_t sparkAngle = -ENGINE(engineState.timingAdvance) + ignitionPositionWithinEngineCycle + perCylinderCorrection; - efiAssertVoid(CUSTOM_ERR_6689, !cisnan(sparkAngle), "findAngle#9"); + efiAssertVoid(CUSTOM_SPARK_ANGLE_9, !cisnan(sparkAngle), "findAngle#9"); - efiAssertVoid(CUSTOM_ERR_6589, !cisnan(sparkAngle), "sparkAngle#1"); + efiAssertVoid(CUSTOM_SPARK_ANGLE_1, !cisnan(sparkAngle), "sparkAngle#1"); const int index = ENGINE(ignitionPin[event->cylinderIndex]); const int coilIndex = ID2INDEX(getCylinderId(index PASS_ENGINE_PARAMETER_SUFFIX)); IgnitionOutputPin *output = &enginePins.coils[coilIndex];