From c4a817dfa0c56e907abadc1b0e69ec451abe0b81 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Tue, 9 Aug 2022 20:39:27 -0400 Subject: [PATCH] verboseCan EXT fix --- firmware/hw_layer/drivers/can/can_msg_tx.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/firmware/hw_layer/drivers/can/can_msg_tx.cpp b/firmware/hw_layer/drivers/can/can_msg_tx.cpp index f9d72288bf..ec57e50911 100644 --- a/firmware/hw_layer/drivers/can/can_msg_tx.cpp +++ b/firmware/hw_layer/drivers/can/can_msg_tx.cpp @@ -60,9 +60,14 @@ CanTxMessage::~CanTxMessage() { } if (engineConfiguration->verboseCan) { - efiPrintf("Sending CAN bus%d message: SID %x/%x %x %x %x %x %x %x %x %x", + efiPrintf("Sending CAN bus%d message: SID=%x/l=%x %x %x %x %x %x %x %x %x", busIndex, - CAN_SID(m_frame), m_frame.DLC, +#ifndef STM32H7XX + (m_frame.IDE == CAN_IDE_EXT) ? CAN_SID(m_frame) : CAN_EID(m_frame), +#else + m_frame.common.XTD ? CAN_SID(m_frame) : CAN_EID(m_frame), +#endif + m_frame.DLC, m_frame.data8[0], m_frame.data8[1], m_frame.data8[2], m_frame.data8[3], m_frame.data8[4], m_frame.data8[5],