From eae44843b12a50aef4abb5b206d61917f6756383 Mon Sep 17 00:00:00 2001 From: rusefi Date: Mon, 4 Nov 2019 09:20:00 -0500 Subject: [PATCH] custom codes cleanup --- firmware/controllers/algo/obd_error_codes.h | 9 ++++++--- firmware/controllers/core/efi_wave.cpp | 2 +- firmware/controllers/map_averaging.cpp | 4 ++-- firmware/controllers/scheduling/pwm_generator_logic.cpp | 6 +++--- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/firmware/controllers/algo/obd_error_codes.h b/firmware/controllers/algo/obd_error_codes.h index 2f3c3fb41f..f38b27e818 100644 --- a/firmware/controllers/algo/obd_error_codes.h +++ b/firmware/controllers/algo/obd_error_codes.h @@ -2051,10 +2051,10 @@ typedef enum { CUSTOM_ERR_6688 = 6688, CUSTOM_ERR_6689 = 6689, - CUSTOM_ERR_6690 = 6690, + CUSTOM_ERR_MAP_START_ASSERT = 6690, CUSTOM_ERR_MAP_AVG_OFFSET = 6691, - CUSTOM_ERR_6692 = 6692, - CUSTOM_ERR_6693 = 6693, + 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, @@ -2075,6 +2075,9 @@ typedef enum { CUSTOM_ERR_PIN_COUNT_TOO_LARGE = 6709, CUSTOM_DUTY_INVALID = 6710, CUSTOM_DUTY_TOO_HIGH = 6711, + CUSTOM_ERR_PWM_STATE_ASSERT = 6712, + CUSTOM_ERR_PWM_CALLBACK_ASSERT = 6713, + CUSTOM_ERR_PWM_SWITCH_ASSERT = 6714, CUSTOM_ERR_TRIGGER_SYNC = 9000, diff --git a/firmware/controllers/core/efi_wave.cpp b/firmware/controllers/core/efi_wave.cpp index 7d54d76918..64ff58ac30 100644 --- a/firmware/controllers/core/efi_wave.cpp +++ b/firmware/controllers/core/efi_wave.cpp @@ -93,6 +93,6 @@ int MultiWave::findAngleMatch(const float angle, const int size) const { } void MultiWave::setSwitchTime(const int index, const float value) { - efiAssertVoid(CUSTOM_ERR_6690, switchTimes != NULL, "switchTimes"); + efiAssertVoid(CUSTOM_ERR_PWM_SWITCH_ASSERT, switchTimes != NULL, "switchTimes"); switchTimes[index] = value; } diff --git a/firmware/controllers/map_averaging.cpp b/firmware/controllers/map_averaging.cpp index 3367676809..71d6b12f73 100644 --- a/firmware/controllers/map_averaging.cpp +++ b/firmware/controllers/map_averaging.cpp @@ -233,14 +233,14 @@ void refreshMapAveragingPreCalc(DECLARE_ENGINE_PARAMETER_SIGNATURE) { if (isValidRpm(rpm)) { MAP_sensor_config_s * c = &engineConfiguration->map; angle_t start = interpolate2d("mapa", rpm, c->samplingAngleBins, c->samplingAngle); - efiAssertVoid(CUSTOM_ERR_6690, !cisnan(start), "start"); + efiAssertVoid(CUSTOM_ERR_MAP_START_ASSERT, !cisnan(start), "start"); angle_t offsetAngle = TRIGGER_SHAPE(eventAngles[CONFIG(mapAveragingSchedulingAtIndex)]); efiAssertVoid(CUSTOM_ERR_MAP_AVG_OFFSET, !cisnan(offsetAngle), "offsetAngle"); for (int i = 0; i < engineConfiguration->specs.cylindersCount; i++) { angle_t cylinderOffset = getEngineCycle(engine->getOperationMode(PASS_ENGINE_PARAMETER_SIGNATURE)) * i / engineConfiguration->specs.cylindersCount; - efiAssertVoid(CUSTOM_ERR_6692, !cisnan(cylinderOffset), "cylinderOffset"); + efiAssertVoid(CUSTOM_ERR_MAP_CYL_OFFSET, !cisnan(cylinderOffset), "cylinderOffset"); // part of this formula related to specific cylinder offset is never changing - we can // move the loop into start-up calculation and not have this loop as part of periodic calculation // todo: change the logic as described above in order to reduce periodic CPU usage? diff --git a/firmware/controllers/scheduling/pwm_generator_logic.cpp b/firmware/controllers/scheduling/pwm_generator_logic.cpp index 0ee572ac2d..537e83a8a5 100644 --- a/firmware/controllers/scheduling/pwm_generator_logic.cpp +++ b/firmware/controllers/scheduling/pwm_generator_logic.cpp @@ -316,9 +316,9 @@ void PwmConfig::weComplexInit(const char *msg, ExecutorInterface *executor, void startSimplePwm(SimplePwm *state, const char *msg, ExecutorInterface *executor, OutputPin *output, float frequency, float dutyCycle, pwm_gen_callback *stateChangeCallback) { - efiAssertVoid(CUSTOM_ERR_6692, state != NULL, "state"); - efiAssertVoid(CUSTOM_ERR_6665, dutyCycle >= 0 && dutyCycle <= 1, "dutyCycle"); - efiAssertVoid(CUSTOM_ERR_6693, stateChangeCallback != NULL, "listener"); + efiAssertVoid(CUSTOM_ERR_PWM_STATE_ASSERT, state != NULL, "state"); + efiAssertVoid(CUSTOM_ERR_PWM_DUTY_ASSERT, dutyCycle >= 0 && dutyCycle <= 1, "dutyCycle"); + efiAssertVoid(CUSTOM_ERR_PWM_CALLBACK_ASSERT, stateChangeCallback != NULL, "listener"); if (frequency < 1) { warning(CUSTOM_OBD_LOW_FREQUENCY, "low frequency %.2f", frequency); return;