From 98f56cc2a173bbe016fea7cd5dd914c6e388fc39 Mon Sep 17 00:00:00 2001 From: rusefi Date: Wed, 12 Apr 2017 09:26:22 -0400 Subject: [PATCH] better error code names --- firmware/controllers/algo/obd_error_codes.h | 6 +++--- firmware/controllers/math/engine_math.cpp | 2 +- firmware/controllers/trigger/spark_logic.cpp | 2 +- firmware/hw_layer/can_hw.cpp | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/firmware/controllers/algo/obd_error_codes.h b/firmware/controllers/algo/obd_error_codes.h index db714cff50..b17f7a9453 100644 --- a/firmware/controllers/algo/obd_error_codes.h +++ b/firmware/controllers/algo/obd_error_codes.h @@ -1806,11 +1806,11 @@ typedef enum { CUSTOM_ERR_WAVE_1 = 6105, CUSTOM_ERR_WAVE_2 = 6106, CUSTOM_ERR_TEST_ERROR = 6107, - CUSTOM_ERR_6108 = 6108, - CUSTOM_ERR_6109 = 6109, + CUSTOM_ERR_IGNITION_MODE = 6108, + CUSTOM_ERR_CAN_CONFIGURATION = 6109, CUSTOM_ERR_INTERPOLATE = 6110, - CUSTOM_ERR_6111 = 6111, + CUSTOM_ERR_NOT_INITIALIZED_TRIGGER = 6111, CUSTOM_ERR_MAP_TYPE = 6112, CUSTOM_ERR_THERM = 6113, CUSTOM_ERR_NATURAL_LOGARITHM_ERROR = 6114, diff --git a/firmware/controllers/math/engine_math.cpp b/firmware/controllers/math/engine_math.cpp index 9bce33da3e..0f10c2048a 100644 --- a/firmware/controllers/math/engine_math.cpp +++ b/firmware/controllers/math/engine_math.cpp @@ -187,7 +187,7 @@ bool FuelSchedule::addFuelEventsForCylinder(int i DECLARE_ENGINE_PARAMETER_S) { ev->isSimultanious = isSimultanious; if (TRIGGER_SHAPE(getSize()) < 1) { - warning(CUSTOM_ERR_6111, "uninitialized TriggerShape"); + warning(CUSTOM_ERR_NOT_INITIALIZED_TRIGGER, "uninitialized TriggerShape"); return false; } diff --git a/firmware/controllers/trigger/spark_logic.cpp b/firmware/controllers/trigger/spark_logic.cpp index 8f3d36a9b3..821aa74508 100644 --- a/firmware/controllers/trigger/spark_logic.cpp +++ b/firmware/controllers/trigger/spark_logic.cpp @@ -366,7 +366,7 @@ int getNumberOfSparks(ignition_mode_e mode DECLARE_ENGINE_PARAMETER_S) { case IM_WASTED_SPARK: return 2; default: - firmwareError(CUSTOM_ERR_6108, "Unexpected ignition_mode_e %d", mode); + firmwareError(CUSTOM_ERR_IGNITION_MODE, "Unexpected ignition_mode_e %d", mode); return 1; } } diff --git a/firmware/hw_layer/can_hw.cpp b/firmware/hw_layer/can_hw.cpp index 6bf0dc2ed5..315b8a0cf3 100644 --- a/firmware/hw_layer/can_hw.cpp +++ b/firmware/hw_layer/can_hw.cpp @@ -91,7 +91,7 @@ void sendMessage2(int size) { CANDriver *device = detectCanDevice(boardConfiguration->canRxPin, boardConfiguration->canTxPin); if (device == NULL) { - warning(CUSTOM_ERR_6109, "CAN configuration issue"); + warning(CUSTOM_ERR_CAN_CONFIGURATION, "CAN configuration issue"); return; } txmsg.DLC = size; @@ -205,7 +205,7 @@ static void canRead(void) { CANDriver *device = detectCanDevice(boardConfiguration->canRxPin, boardConfiguration->canTxPin); if (device == NULL) { - warning(CUSTOM_ERR_6109, "CAN configuration issue"); + warning(CUSTOM_ERR_CAN_CONFIGURATION, "CAN configuration issue"); return; } // scheduleMsg(&logger, "Waiting for CAN");