From f4592541dd64b9c5dbdc1c7fdc1051eb59905414 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Fri, 5 Feb 2021 11:27:51 -0500 Subject: [PATCH] Gather Nissan CAN data #2278 --- firmware/controllers/can/can_rx.cpp | 7 +++++-- firmware/integration/rusefi_config.txt | 2 +- firmware/tunerstudio/rusefi.input | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/firmware/controllers/can/can_rx.cpp b/firmware/controllers/can/can_rx.cpp index 5a1bee5eb1..1eb44bd49f 100644 --- a/firmware/controllers/can/can_rx.cpp +++ b/firmware/controllers/can/can_rx.cpp @@ -19,12 +19,15 @@ EXTERN_ENGINE; +/** + * this build-in CAN sniffer is very basic but that's our CAN sniffer + */ static void printPacket(const CANRxFrame& rx, Logging* logger) { // only print info if we're in can debug mode - if (CONFIG(debugMode) == DBG_CAN) { + scheduleMsg(logger, "Got CAN message: SID %x/%x %x %x %x %x %x %x %x %x", rx.SID, rx.DLC, rx.data8[0], rx.data8[1], rx.data8[2], rx.data8[3], rx.data8[4], rx.data8[5], rx.data8[6], rx.data8[7]); - } + } volatile float canMap = 0; diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 125bd7bc8e..c55bc9e9db 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -524,7 +524,7 @@ bit useRunningMathForCranking,"Fuel Map","Fixed"; bit displayLogicLevelsInEngineSniffer; 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 issue_294_28; +bit useFSIOTableForCanSniffingFiltering; bit issue_294_29; bit issue_294_30; bit issue_294_31,"si_example","nada_example"; diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 646b0b78f1..de2c448fd8 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -2864,6 +2864,7 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00" field = "Can Nbc Type", canNbcType field = "Can Baud Rate", canBaudRate field = "Enable rusEFI CAN broadcast", enableVerboseCanTx + field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering field = "rusEFI CAN data base address", verboseCanBaseAddress field = "Can Sleep Period", canSleepPeriodMs field = "RX pin", canRxPin @@if_ts_show_can_pins