diff --git a/firmware/controllers/algo/auto_generated_enginetypes.cpp b/firmware/controllers/algo/auto_generated_enginetypes.cpp index a14c77109c..098a1aac46 100644 --- a/firmware/controllers/algo/auto_generated_enginetypes.cpp +++ b/firmware/controllers/algo/auto_generated_enginetypes.cpp @@ -1,6 +1,6 @@ #include "global.h" #include "engine_types.h" -// was generated automatically by rusEFI tool from engine_types.h // by enum2string.jar tool on Mon Dec 06 17:02:13 EST 2021 +// was generated automatically by rusEFI tool from engine_types.h // by enum2string.jar tool on Mon Dec 06 21:27:50 EST 2021 // see also gen_config_and_enums.bat @@ -52,6 +52,8 @@ case DBG_16: return "DBG_16"; case DBG_20: return "DBG_20"; +case DBG_26: + return "DBG_26"; case DBG_29: return "DBG_29"; case DBG_34: @@ -74,8 +76,6 @@ case DBG_BENCH_TEST: return "DBG_BENCH_TEST"; case DBG_BOOST: return "DBG_BOOST"; -case DBG_CAN: - return "DBG_CAN"; case DBG_CJ125: return "DBG_CJ125"; case DBG_COMPOSITE_LOG: diff --git a/firmware/controllers/algo/engine_types.h b/firmware/controllers/algo/engine_types.h index 9ad5142400..0b08617122 100644 --- a/firmware/controllers/algo/engine_types.h +++ b/firmware/controllers/algo/engine_types.h @@ -287,7 +287,7 @@ typedef enum { UNUSED23 = 23, DBG_STATUS = 24, DBG_CJ125 = 25, - DBG_CAN = 26, + DBG_26 = 26, DBG_MAP = 27, DBG_METRICS = 28, DBG_29 = 29, diff --git a/firmware/controllers/can/can_rx.cpp b/firmware/controllers/can/can_rx.cpp index 2467a90b6e..59168f0c02 100644 --- a/firmware/controllers/can/can_rx.cpp +++ b/firmware/controllers/can/can_rx.cpp @@ -159,7 +159,7 @@ static void processCanRxImu(const CANRxFrame& frame, efitick_t nowNt) { } void processCanRxMessage(const CANRxFrame &frame, efitick_t nowNt) { - if (engineConfiguration->debugMode == DBG_CAN) { + if (engineConfiguration->verboseCan) { printPacket(frame); } diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp index bdc12178db..31cb8f5a43 100644 --- a/firmware/controllers/settings.cpp +++ b/firmware/controllers/settings.cpp @@ -732,6 +732,8 @@ static void enableOrDisable(const char *param, bool isEnabled) { engineConfiguration->useTLE8888_cranking_hack = isEnabled; } else if (strEqualCaseInsensitive(param, "verboseTLE8888")) { engineConfiguration->verboseTLE8888 = isEnabled; + } else if (strEqualCaseInsensitive(param, "verboseCan")) { + engineConfiguration->verboseCan = isEnabled; } else if (strEqualCaseInsensitive(param, "artificialMisfire")) { engineConfiguration->artificialTestMisfire = isEnabled; } else if (strEqualCaseInsensitive(param, "logic_level_trigger")) { diff --git a/firmware/hw_layer/drivers/can/can_msg_tx.cpp b/firmware/hw_layer/drivers/can/can_msg_tx.cpp index f73218e6f5..dad0e61bfd 100644 --- a/firmware/hw_layer/drivers/can/can_msg_tx.cpp +++ b/firmware/hw_layer/drivers/can/can_msg_tx.cpp @@ -53,7 +53,7 @@ CanTxMessage::~CanTxMessage() { return; } - if (engineConfiguration->debugMode == DBG_CAN) { + if (engineConfiguration->verboseCan) { efiPrintf("Sending CAN message: SID %x/%x %x %x %x %x %x %x %x %x", CAN_SID(m_frame), m_frame.DLC, m_frame.data8[0], m_frame.data8[1], m_frame.data8[2], m_frame.data8[3], diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 98120dc187..edb2e504af 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -450,7 +450,7 @@ bit displayLogicLevelsInEngineSniffer;+Shall we display real life signal or just bit useTLE8888_stepper bit enableMapEstimationTableFallback;+If enabled, the MAP estimate table will be used if the MAP sensor fails to estimate manifold pressure based on RPM and TPS. bit usescriptTableForCanSniffingFiltering -bit verboseCanRx,"Print all","Do not print";Print incoming CAN messages in rusEFI console +bit verboseCan,"Print all","Do not print";Print incoming and outgoing CAN messages in rusEFI console bit artificialTestMisfire,"Danger Mode","No thank you";Experimental setting that will cause a misfire\nDO NOT ENABLE. bit issue_294_31,"si_example","nada_example" diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index d4ad174b82..102ceeb486 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -2849,7 +2849,7 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00" field = "CAN write enabled", canWriteEnabled field = "CAN bitrate", canBaudRate field = "CAN dash type", canNbcType - field = "Verbose Can Rx", verboseCanRx + field = "Verbose Can", verboseCan field = "inertia measurement unit", imuType field = "Enable rusEFI CAN broadcast", enableVerboseCanTx field = "rusEFI CAN data base address", verboseCanBaseAddress diff --git a/java_console/io/src/main/java/com/rusefi/enums/debug_mode_e.java b/java_console/io/src/main/java/com/rusefi/enums/debug_mode_e.java index 26952fc2bc..dbe313bd54 100644 --- a/java_console/io/src/main/java/com/rusefi/enums/debug_mode_e.java +++ b/java_console/io/src/main/java/com/rusefi/enums/debug_mode_e.java @@ -30,7 +30,7 @@ public enum debug_mode_e { UNUSED23, DBG_STATUS, DBG_CJ125, - DBG_CAN, + DBG_26, DBG_MAP, DBG_METRICS, DBG_29,