diff --git a/firmware/controllers/core/fl_stack.h b/firmware/controllers/core/fl_stack.h index 4ccb82a477..7d881a6dc3 100644 --- a/firmware/controllers/core/fl_stack.h +++ b/firmware/controllers/core/fl_stack.h @@ -59,7 +59,7 @@ bool FLStack::remove(T value) { template void FLStack::push(T value) { if (currentSize >= MAXSIZE) { - firmwareError(OBD_PCM_Processor_Fault, "FLstack overflow"); + firmwareError(CUSTOM_ERR_6502, "FLstack overflow"); return; //warning() } @@ -69,7 +69,7 @@ void FLStack::push(T value) { template T FLStack::pop() { if (currentSize == 0) { - firmwareError(OBD_PCM_Processor_Fault, "FLStack is empty"); + firmwareError(CUSTOM_ERR_6504, "FLStack is empty"); } return values[--currentSize]; } diff --git a/firmware/controllers/core/fsio_core.cpp b/firmware/controllers/core/fsio_core.cpp index 6d1f7b9768..53ca358f3a 100644 --- a/firmware/controllers/core/fsio_core.cpp +++ b/firmware/controllers/core/fsio_core.cpp @@ -357,7 +357,7 @@ int LEElementPool::getSize() { LEElement *LEElementPool::next() { if (index >= size) { // todo: this should not be a fatal error, just an error - firmwareError(OBD_PCM_Processor_Fault, "LE_ELEMENT_POOL_SIZE overflow"); + firmwareError(CUSTOM_ERR_6503, "LE_ELEMENT_POOL_SIZE overflow"); return NULL; } LEElement *result = &pool[index++]; diff --git a/firmware/controllers/map_averaging.cpp b/firmware/controllers/map_averaging.cpp index 26fbaa3ad0..a5fe5fa98e 100644 --- a/firmware/controllers/map_averaging.cpp +++ b/firmware/controllers/map_averaging.cpp @@ -193,7 +193,7 @@ static void mapAveragingCallback(trigger_event_e ckpEventType, angle_t samplingDuration = ENGINE(engineState.mapAveragingDuration); if (samplingDuration <= 0) { - firmwareError(OBD_PCM_Processor_Fault, "map sampling angle should be positive"); + firmwareError(CUSTOM_ERR_6514, "map sampling angle should be positive"); return; } diff --git a/firmware/controllers/math/engine_math.h b/firmware/controllers/math/engine_math.h index df91a9457e..da05b1511b 100644 --- a/firmware/controllers/math/engine_math.h +++ b/firmware/controllers/math/engine_math.h @@ -18,7 +18,7 @@ void setAlgorithm(engine_load_mode_e algo DECLARE_ENGINE_PARAMETER_S); #if EFI_ENABLE_ASSERTS -#define assertAngleRange(angle, msg) if(angle > 10000000 || angle < -10000000) { firmwareError(OBD_PCM_Processor_Fault, "angle range %s %f", msg, angle);angle = 0;} +#define assertAngleRange(angle, msg) if(angle > 10000000 || angle < -10000000) { firmwareError(CUSTOM_ERR_6505, "angle range %s %f", msg, angle);angle = 0;} #else #define assertAngleRange(angle, msg) {} #endif diff --git a/firmware/controllers/sensors/ego.cpp b/firmware/controllers/sensors/ego.cpp index 12f07ed9be..90b5e38f06 100644 --- a/firmware/controllers/sensors/ego.cpp +++ b/firmware/controllers/sensors/ego.cpp @@ -60,7 +60,7 @@ static void initEgoSensor(afr_sensor_s *sensor, ego_sensor_e type) { sensor->value2 = 14; break; default: - firmwareError(OBD_PCM_Processor_Fault, "Unexpected EGO %d", type); + firmwareError(CUSTOM_ERR_6506, "Unexpected EGO %d", type); break; } } diff --git a/firmware/controllers/system/SingleTimerExecutor.cpp b/firmware/controllers/system/SingleTimerExecutor.cpp index 7641a3c51b..c828f6598b 100644 --- a/firmware/controllers/system/SingleTimerExecutor.cpp +++ b/firmware/controllers/system/SingleTimerExecutor.cpp @@ -117,7 +117,7 @@ void Executor::doExecute() { } lastExecutionCount = totalExecuted; if (!isLocked()) { - firmwareError(OBD_PCM_Processor_Fault, "Someone has stolen my lock"); + firmwareError(CUSTOM_ERR_6508, "Someone has stolen my lock"); return; } reentrantFlag = false; diff --git a/firmware/controllers/system/event_queue.cpp b/firmware/controllers/system/event_queue.cpp index 36fd7ba887..8f4bc61362 100644 --- a/firmware/controllers/system/event_queue.cpp +++ b/firmware/controllers/system/event_queue.cpp @@ -133,7 +133,7 @@ int EventQueue::executeAll(efitime_t now) { { efiAssert(current->callback != NULL, "callback==null1", 0); if (++listIterationCounter > QUEUE_LENGTH_LIMIT) { - firmwareError(OBD_PCM_Processor_Fault, "Is this list looped?"); + firmwareError(CUSTOM_ERR_6507, "Is this list looped?"); return false; } if (current->momentX <= now) { diff --git a/firmware/controllers/trigger/trigger_structure.cpp b/firmware/controllers/trigger/trigger_structure.cpp index 8bbec23bcb..87ab229c0b 100644 --- a/firmware/controllers/trigger/trigger_structure.cpp +++ b/firmware/controllers/trigger/trigger_structure.cpp @@ -316,7 +316,7 @@ void TriggerShape::addEvent2(angle_t angle, trigger_wheel_e const waveIndex, tri efiAssertVoid(angle > 0, "angle should be positive"); if (size > 0) { if (angle <= previousAngle) { - firmwareError(OBD_PCM_Processor_Fault, "invalid angle order: %f and %f, size=%d", angle, previousAngle, size); + firmwareError(CUSTOM_ERR_6510, "invalid angle order: %f and %f, size=%d", angle, previousAngle, size); return; } } @@ -327,7 +327,7 @@ void TriggerShape::addEvent2(angle_t angle, trigger_wheel_e const waveIndex, tri single_wave_s *wave = &this->wave.waves[i]; if (wave->pinStates == NULL) { - firmwareError(OBD_PCM_Processor_Fault, "wave pinStates is NULL"); + firmwareError(CUSTOM_ERR_6511, "wave pinStates is NULL"); return; } wave->pinStates[0] = initialState[i]; @@ -341,7 +341,7 @@ void TriggerShape::addEvent2(angle_t angle, trigger_wheel_e const waveIndex, tri int exactMatch = wave.findAngleMatch(angle, size); if (exactMatch != EFI_ERROR_CODE) { - firmwareError(OBD_PCM_Processor_Fault, "same angle: not supported"); + firmwareError(CUSTOM_ERR_6512, "same angle: not supported"); return; } @@ -359,7 +359,7 @@ void TriggerShape::addEvent2(angle_t angle, trigger_wheel_e const waveIndex, tri isFrontEvent[index] = TV_RISE == stateParam; if (index != size) { - firmwareError(OBD_PCM_Processor_Fault, "are we ever here?"); + firmwareError(CUSTOM_ERR_6513, "are we ever here?"); } // int index = size; diff --git a/firmware/hw_layer/adc_inputs.cpp b/firmware/hw_layer/adc_inputs.cpp index 3f925555bf..f1ac1fa839 100644 --- a/firmware/hw_layer/adc_inputs.cpp +++ b/firmware/hw_layer/adc_inputs.cpp @@ -333,7 +333,7 @@ ioportid_t getAdcChannelPort(const char *msg, adc_channel_e hwChannel) { case ADC_CHANNEL_IN15: return GPIOC; default: - firmwareError(OBD_PCM_Processor_Fault, "Unknown hw channel %d [%s]", hwChannel, msg); + firmwareError(CUSTOM_ERR_6516, "Unknown hw channel %d [%s]", hwChannel, msg); return NULL; } } @@ -384,7 +384,7 @@ int getAdcChannelPin(adc_channel_e hwChannel) { case ADC_CHANNEL_IN15: return 5; default: - firmwareError(OBD_PCM_Processor_Fault, "Unknown hw channel %d", hwChannel); + firmwareError(CUSTOM_ERR_6535, "Unknown hw channel %d", hwChannel); return -1; } } @@ -512,7 +512,7 @@ static void addChannel(const char *name, adc_channel_e setting, adc_channel_mode } if (adcHwChannelEnabled[setting] != ADC_OFF) { getPinNameByAdcChannel(name, setting, errorMsgBuff); - firmwareError(OBD_PCM_Processor_Fault, "ADC mapping error: input %s for %s already used by %s?", errorMsgBuff, name, adcHwChannelUsage[setting]); + firmwareError(CUSTOM_ERR_6517, "ADC mapping error: input %s for %s already used by %s?", errorMsgBuff, name, adcHwChannelUsage[setting]); } adcHwChannelUsage[setting] = name; @@ -547,9 +547,9 @@ static void configureInputs(void) { void initAdcInputs(bool boardTestMode) { printMsg(&logger, "initAdcInputs()"); if (ADC_BUF_DEPTH_FAST > MAX_ADC_GRP_BUF_DEPTH) - firmwareError(OBD_PCM_Processor_Fault, "ADC_BUF_DEPTH_FAST too high"); + firmwareError(CUSTOM_ERR_6519, "ADC_BUF_DEPTH_FAST too high"); if (ADC_BUF_DEPTH_SLOW > MAX_ADC_GRP_BUF_DEPTH) - firmwareError(OBD_PCM_Processor_Fault, "ADC_BUF_DEPTH_SLOW too high"); + firmwareError(CUSTOM_ERR_6518, "ADC_BUF_DEPTH_SLOW too high"); configureInputs();