diff --git a/firmware/controllers/can/can_rx.cpp b/firmware/controllers/can/can_rx.cpp index 939e55514f..21868caedd 100644 --- a/firmware/controllers/can/can_rx.cpp +++ b/firmware/controllers/can/can_rx.cpp @@ -189,10 +189,13 @@ static void processCanRxImu(const CANRxFrame& frame) { } void processCanRxMessage(const size_t busIndex, const CANRxFrame &frame, efitick_t nowNt) { - if (engineConfiguration->verboseCan) { + if (engineConfiguration->verboseCan && busIndex == 0) { + printPacket(busIndex, frame); + } else if (engineConfiguration->verboseCan2 && busIndex == 1) { printPacket(busIndex, frame); } + serviceCanSubscribers(frame, nowNt); // todo: convert to CanListener or not? diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 32fad0d171..74d390514d 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -466,7 +466,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 verboseCan,"Print all","Do not print";Print incoming and outgoing CAN messages in rusEFI console +bit verboseCan,"Print all","Do not print";Print incoming and outgoing first bus 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" @@ -925,7 +925,8 @@ custom maf_sensor_type_e 4 bits, S32, @OFFSET@, [0:1], @@maf_sensor_type_e_enum@ bit tcuEnabled bit canBroadcastUseChannelTwo,"second","first" bit useRawOutputToDriveIdleStepper;+If enabled we use four Push-Pull outputs to directly drive stepper idle air valve coilss -bit unusedBit_310_31 +bit verboseCan2,"Print all","Do not print";Print incoming and outgoing second bus CAN messages in rusEFI console + dc_io[ETB_COUNT iterate] etbIo diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index d504085820..aa600cb1d8 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -3126,12 +3126,14 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00" field = "RX pin", binarySerialRxPin, {useSerialPort == 1} dialog = canHw1, "Primary CAN" + field = "Verbose Can", verboseCan field = "Bitrate", canBaudRate field = "RX pin", canRxPin @@if_ts_show_can_pins field = "TX pin", canTxPin @@if_ts_show_can_pins dialog = canHw2, "Secondary CAN" - field = "Bitrate", can2BaudRate + field = "Verbose Can2", verboseCan2 + field = "Bitrate", can2BaudRate field = "RX pin", can2RxPin @@if_ts_show_can_pins field = "TX pin", can2TxPin @@if_ts_show_can_pins @@ -3139,7 +3141,6 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00" field = "CAN read enabled", canReadEnabled field = "CAN write enabled", canWriteEnabled field = "CAN dash type", canNbcType - field = "Verbose Can", verboseCan field = "inertia measurement unit", imuType field = "Enable rusEFI CAN broadcast", enableVerboseCanTx field = "rusEFI CAN data bus", canBroadcastUseChannelTwo