rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

codes clean-up

This commit is contained in:
rusefi 2019-12-02 20:16:41 -05:00
parent 3c9c9e028c
commit b415508c70
5 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/controllers/algo/engine2.cpp
View File

@ -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)) {

21
firmware/controllers/algo/obd_error_codes.h
View File

@ -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,

2
firmware/controllers/scheduling/pwm_generator_logic.cpp
View File

@ -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;
}

2
firmware/controllers/trigger/decoders/trigger_universal.cpp
View File

@ -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);

4
firmware/controllers/trigger/spark_logic.cpp
View File

@ -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];