andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

can_msg_tx, can_rx: use 1-based CAN indexing for error/verbose messages

This commit is contained in:
Andrey Gusakov 2025-02-06 12:25:29 +03:00 committed by rusefillc
parent 971d4ef8eb
commit ae3a7837bb
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/controllers/can/can_rx.cpp
View File

@ -35,7 +35,7 @@ static void printPacket(const size_t busIndex, const CANRxFrame &rx) {
if (CAN_ISX(rx)) { if (CAN_ISX(rx)) {
// print extended IDs in hex only // print extended IDs in hex only
efiPrintf("CAN%d RX: ID %07x DLC %d: %02x %02x %02x %02x %02x %02x %02x %02x", efiPrintf("CAN%d RX: ID %07x DLC %d: %02x %02x %02x %02x %02x %02x %02x %02x",
busIndex, busIndex + 1,
id, id,
rx.DLC, rx.DLC,
rx.data8[0], rx.data8[1], rx.data8[2], rx.data8[3], rx.data8[0], rx.data8[1], rx.data8[2], rx.data8[3],
@ -43,7 +43,7 @@ static void printPacket(const size_t busIndex, const CANRxFrame &rx) {
} else { } else {
// internet people use both hex and decimal to discuss packed IDs, for usability it's better to print both right here // internet people use both hex and decimal to discuss packed IDs, for usability it's better to print both right here
efiPrintf("CAN%d RX: ID %03x(%d) DLC %d: %02x %02x %02x %02x %02x %02x %02x %02x", efiPrintf("CAN%d RX: ID %03x(%d) DLC %d: %02x %02x %02x %02x %02x %02x %02x %02x",
busIndex, busIndex + 1,
id, id, // once in hex, once in dec id, id, // once in hex, once in dec
rx.DLC, rx.DLC,
rx.data8[0], rx.data8[1], rx.data8[2], rx.data8[3], rx.data8[0], rx.data8[1], rx.data8[2], rx.data8[3],

10
firmware/hw_layer/drivers/can/can_msg_tx.cpp
View File

@ -64,9 +64,9 @@ CanTxMessage::~CanTxMessage() {
txCanBuffer.put(m_frame); txCanBuffer.put(m_frame);
#if EFI_UNIT_TEST #if EFI_UNIT_TEST
printf("%s Sending CAN bus%d message: ID=%x/l=%x %x %x %x %x %x %x %x %x \n", printf("%s Sending CAN%d message: ID=%x/l=%x %x %x %x %x %x %x %x %x \n",
getCanCategory(category), getCanCategory(category),
busIndex, busIndex + 1,
#ifndef STM32H7XX #ifndef STM32H7XX
(unsigned int)((m_frame.IDE == CAN_IDE_EXT) ? CAN_EID(m_frame) : CAN_SID(m_frame)), (unsigned int)((m_frame.IDE == CAN_IDE_EXT) ? CAN_EID(m_frame) : CAN_SID(m_frame)),
#else #else
@ -84,7 +84,7 @@ CanTxMessage::~CanTxMessage() {
auto device = s_devices[busIndex]; auto device = s_devices[busIndex];
if (!device) { if (!device) {
criticalError("Send: CAN device not configured busIndex=%d", busIndex); criticalError("Send: CAN%d device not configured", busIndex + 1);
return; return;
} }
@ -96,9 +96,9 @@ CanTxMessage::~CanTxMessage() {
bool verboseCan1 = engineConfiguration->verboseCan2 && busIndex == 1; bool verboseCan1 = engineConfiguration->verboseCan2 && busIndex == 1;
if (verboseCan0 || verboseCan1) { if (verboseCan0 || verboseCan1) {
efiPrintf("%s Sending CAN bus%d message: ID=%x/l=%x %x %x %x %x %x %x %x %x", efiPrintf("%s Sending CAN%d message: ID=%x/l=%x %x %x %x %x %x %x %x %x",
getCanCategory(category), getCanCategory(category),
busIndex, busIndex + 1,
#ifndef STM32H7XX #ifndef STM32H7XX
(unsigned int)((m_frame.IDE == CAN_IDE_EXT) ? CAN_EID(m_frame) : CAN_SID(m_frame)), (unsigned int)((m_frame.IDE == CAN_IDE_EXT) ? CAN_EID(m_frame) : CAN_SID(m_frame)),
#else #else