OBD error renames

This commit is contained in:
rusefillc 2021-10-03 01:30:42 -04:00
parent 58f80b7066
commit b4884498cb
9 changed files with 29 additions and 29 deletions

View File

@ -135,7 +135,7 @@ angle_t getAdvance(int rpm, float engineLoad DECLARE_ENGINE_PARAMETER_SUFFIX) {
bool isCranking = ENGINE(rpmCalculator).isCranking();
if (isCranking) {
angle = getCrankingAdvance(rpm, engineLoad PASS_ENGINE_PARAMETER_SUFFIX);
assertAngleRange(angle, "crAngle", CUSTOM_ERR_6680);
assertAngleRange(angle, "crAngle", CUSTOM_ERR_ANGLE_CR);
efiAssert(CUSTOM_ERR_ASSERT, !cisnan(angle), "cr_AngleN", 0);
} else {
angle = getRunningAdvance(rpm, engineLoad PASS_ENGINE_PARAMETER_SUFFIX);

View File

@ -1,6 +1,6 @@
#include "global.h"
#include "obd_error_codes.h"
// was generated automatically by rusEFI tool from obd_error_codes.h // by enum2string.jar tool on Thu Sep 09 00:35:46 UTC 2021
// was generated automatically by rusEFI tool from obd_error_codes.h // by enum2string.jar tool on Sun Oct 03 01:28:41 EDT 2021
// see also gen_config_and_enums.bat
@ -15,6 +15,8 @@ case CUSTOM_6051:
return "CUSTOM_6051";
case CUSTOM_ADD_BASE:
return "CUSTOM_ADD_BASE";
case CUSTOM_ADVANCE_SPARK:
return "CUSTOM_ADVANCE_SPARK";
case CUSTOM_ANGLE_NAN:
return "CUSTOM_ANGLE_NAN";
case CUSTOM_APPEND_NULL:
@ -57,6 +59,8 @@ case CUSTOM_EMPTY_FSIO_STACK:
return "CUSTOM_EMPTY_FSIO_STACK";
case CUSTOM_ENGINE_REF:
return "CUSTOM_ENGINE_REF";
case CUSTOM_ERROR_ICU:
return "CUSTOM_ERROR_ICU";
case CUSTOM_ERR_2ND_WATCHDOG:
return "CUSTOM_ERR_2ND_WATCHDOG";
case CUSTOM_ERR_6030:
@ -267,26 +271,12 @@ case CUSTOM_ERR_6670:
return "CUSTOM_ERR_6670";
case CUSTOM_ERR_6675:
return "CUSTOM_ERR_6675";
case CUSTOM_ERR_6676:
return "CUSTOM_ERR_6676";
case CUSTOM_ERR_6679:
return "CUSTOM_ERR_6679";
case CUSTOM_ERR_6680:
return "CUSTOM_ERR_6680";
case CUSTOM_ERR_6682:
return "CUSTOM_ERR_6682";
case CUSTOM_ERR_6684:
return "CUSTOM_ERR_6684";
case CUSTOM_ERR_6685:
return "CUSTOM_ERR_6685";
case CUSTOM_ERR_6686:
return "CUSTOM_ERR_6686";
case CUSTOM_ERR_6687:
return "CUSTOM_ERR_6687";
case CUSTOM_ERR_6688:
return "CUSTOM_ERR_6688";
case CUSTOM_ERR_6703:
return "CUSTOM_ERR_6703";
case CUSTOM_ERR_6709:
return "CUSTOM_ERR_6709";
case CUSTOM_ERR_6728:
@ -305,6 +295,8 @@ case CUSTOM_ERR_ADC_USED:
return "CUSTOM_ERR_ADC_USED";
case CUSTOM_ERR_ANGLE:
return "CUSTOM_ERR_ANGLE";
case CUSTOM_ERR_ANGLE_CR:
return "CUSTOM_ERR_ANGLE_CR";
case CUSTOM_ERR_ARRAY_IS_FULL:
return "CUSTOM_ERR_ARRAY_IS_FULL";
case CUSTOM_ERR_ARRAY_REMOVE:
@ -317,6 +309,8 @@ case CUSTOM_ERR_ASSERT_VOID:
return "CUSTOM_ERR_ASSERT_VOID";
case CUSTOM_ERR_AXIS_ORDER:
return "CUSTOM_ERR_AXIS_ORDER";
case CUSTOM_ERR_BENCH_PARAM:
return "CUSTOM_ERR_BENCH_PARAM";
case CUSTOM_ERR_BOTH_FRONTS_REQUIRED:
return "CUSTOM_ERR_BOTH_FRONTS_REQUIRED";
case CUSTOM_ERR_BUFF_INIT_ERROR:
@ -473,6 +467,8 @@ case CUSTOM_ERR_ZERO_CRANKING_FUEL:
return "CUSTOM_ERR_ZERO_CRANKING_FUEL";
case CUSTOM_EVENT_6626:
return "CUSTOM_EVENT_6626";
case CUSTOM_FIRING_LENGTH:
return "CUSTOM_FIRING_LENGTH";
case CUSTOM_FLSTACK:
return "CUSTOM_FLSTACK";
case CUSTOM_FSIO_INVALID_EXPRESSION:
@ -705,6 +701,8 @@ case CUSTOM_STACK_6627:
return "CUSTOM_STACK_6627";
case CUSTOM_STACK_6629:
return "CUSTOM_STACK_6629";
case CUSTOM_STACK_ADC:
return "CUSTOM_STACK_ADC";
case CUSTOM_STACK_ADC_6671:
return "CUSTOM_STACK_ADC_6671";
case CUSTOM_STACK_SPI:
@ -713,6 +711,8 @@ case CUSTOM_SYNC_COUNT_MISMATCH:
return "CUSTOM_SYNC_COUNT_MISMATCH";
case CUSTOM_SYNC_ERROR:
return "CUSTOM_SYNC_ERROR";
case CUSTOM_TIMER_WATCHDOG:
return "CUSTOM_TIMER_WATCHDOG";
case CUSTOM_TLE8888:
return "CUSTOM_TLE8888";
case CUSTOM_TOO_LONG_CRANKING_FUEL_INJECTION:

View File

@ -2033,20 +2033,20 @@ typedef enum {
CUSTOM_ICU_DRIVER_STATE = 6673,
CUSTOM_STACK_SPI = 6674,
CUSTOM_ERR_6675 = 6675,
CUSTOM_ERR_6676 = 6676,
CUSTOM_STACK_ADC = 6676,
CUSTOM_IH_STACK = 6677,
CUSTOM_EC_NULL = 6678,
CUSTOM_ERR_6679 = 6679,
CUSTOM_ERROR_ICU = 6679,
CUSTOM_ERR_6680 = 6680,
CUSTOM_ERR_ANGLE_CR = 6680,
CUSTOM_DELTA_NOT_POSITIVE = 6681,
CUSTOM_ERR_6682 = 6682,
CUSTOM_TIMER_WATCHDOG = 6682,
CUSTOM_SAME_TWICE = 6683,
CUSTOM_ERR_6684 = 6684,
CUSTOM_ERR_6685 = 6685,
CUSTOM_ERR_6686 = 6686,
CUSTOM_ERR_6687 = 6687,
CUSTOM_ERR_6688 = 6688,
CUSTOM_FIRING_LENGTH = 6687,
CUSTOM_ADVANCE_SPARK = 6688,
CUSTOM_SPARK_ANGLE_9 = 6689,
CUSTOM_ERR_MAP_START_ASSERT = 6690,
@ -2064,7 +2064,7 @@ typedef enum {
CUSTOM_CJ125_0 = 6700,
CUSTOM_CJ125_1 = 6701,
CUSTOM_CJ125_2 = 6702,
CUSTOM_ERR_6703 = 6703,
CUSTOM_ERR_BENCH_PARAM = 6703,
CUSTOM_ERR_BOTH_FRONTS_REQUIRED = 6704,
CUSTOM_TLE8888 = 6705,
CUSTOM_KNOCK_WINDOW = 6706,

View File

@ -75,7 +75,7 @@ static void runBench(brain_pin_e brainPin, OutputPin *output, float delayMs, flo
int offTimeUs = MS2US(maxF(0.1, offTimeMs));
if (onTimeUs > TOO_FAR_INTO_FUTURE_US) {
firmwareError(CUSTOM_ERR_6703, "onTime above limit %dus", TOO_FAR_INTO_FUTURE_US);
firmwareError(CUSTOM_ERR_BENCH_PARAM, "onTime above limit %dus", TOO_FAR_INTO_FUTURE_US);
return;
}

View File

@ -372,7 +372,7 @@ static void handleSparkEvent(bool limitedSpark, uint32_t trgEventIndex, Ignition
return;
}
if (cisnan(sparkAngle)) {
warning(CUSTOM_ERR_6688, "NaN advance");
warning(CUSTOM_ADVANCE_SPARK, "NaN advance");
return;
}

View File

@ -328,7 +328,7 @@ int getCylinderId(int index DECLARE_ENGINE_PARAMETER_SUFFIX) {
const int firingOrderLength = getFiringOrderLength(PASS_ENGINE_PARAMETER_SIGNATURE);
if (firingOrderLength < 1 || firingOrderLength > MAX_CYLINDER_COUNT) {
firmwareError(CUSTOM_ERR_6687, "fol %d", firingOrderLength);
firmwareError(CUSTOM_FIRING_LENGTH, "fol %d", firingOrderLength);
return 1;
}
if (engineConfiguration->specs.cylindersCount != firingOrderLength) {

View File

@ -202,7 +202,7 @@ void onFastAdcComplete(adcsample_t* buffer) {
/**
* this callback is executed 10 000 times a second, it needs to be as fast as possible
*/
efiAssertVoid(CUSTOM_ERR_6676, getCurrentRemainingStack() > 128, "lowstck#9b");
efiAssertVoid(CUSTOM_STACK_ADC, getCurrentRemainingStack() > 128, "lowstck#9b");
#if EFI_SENSOR_CHART && EFI_SHAFT_POSITION_INPUT
if (ENGINE(sensorChartMode) == SC_AUX_FAST1) {

View File

@ -118,7 +118,7 @@ static char icuError[30];
void efiIcuStart(const char *msg, ICUDriver *icup, const ICUConfig *config) {
if (icup->state != ICU_STOP && icup->state != ICU_READY) {
chsnprintf(icuError, sizeof(icuError), "ICU already used %s", msg);
firmwareError(CUSTOM_ERR_6679, icuError);
firmwareError(CUSTOM_ERROR_ICU, icuError);
return;
}
icuStart(icup, config);

View File

@ -114,7 +114,7 @@ class MicrosecondTimerWatchdogController : public PeriodicTimerController {
msg = isTimerPending ? "No_cb too long" : "Timer not awhile";
// 2 seconds of inactivity would not look right
efiAssertVoid(CUSTOM_ERR_6682, nowNt < lastSetTimerTimeNt + 2 * CORE_CLOCK, msg);
efiAssertVoid(CUSTOM_TIMER_WATCHDOG, nowNt < lastSetTimerTimeNt + 2 * CORE_CLOCK, msg);
}
int getPeriodMs() override {