From 360a8c752485a9c248d179284ae34210ae59948d Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Sat, 12 Dec 2020 13:34:21 -0800 Subject: [PATCH] add support for ext ids (#2060) Co-authored-by: Matthew Kennedy --- firmware/hw_layer/drivers/can/can_msg_tx.cpp | 4 ++-- firmware/hw_layer/drivers/can/can_msg_tx.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/firmware/hw_layer/drivers/can/can_msg_tx.cpp b/firmware/hw_layer/drivers/can/can_msg_tx.cpp index 8c8984555c..a1e5d54a2d 100644 --- a/firmware/hw_layer/drivers/can/can_msg_tx.cpp +++ b/firmware/hw_layer/drivers/can/can_msg_tx.cpp @@ -26,8 +26,8 @@ extern int canWriteNotOk; s_device = device; } -CanTxMessage::CanTxMessage(uint32_t eid, uint8_t dlc) { - m_frame.IDE = CAN_IDE_STD; +CanTxMessage::CanTxMessage(uint32_t eid, uint8_t dlc, bool isExtended) { + m_frame.IDE = isExtended ? CAN_IDE_EXT : CAN_IDE_STD; m_frame.EID = eid; m_frame.RTR = CAN_RTR_DATA; m_frame.DLC = dlc; diff --git a/firmware/hw_layer/drivers/can/can_msg_tx.h b/firmware/hw_layer/drivers/can/can_msg_tx.h index 2ac51fe22c..d15aa3cdd4 100644 --- a/firmware/hw_layer/drivers/can/can_msg_tx.h +++ b/firmware/hw_layer/drivers/can/can_msg_tx.h @@ -28,7 +28,7 @@ public: /** * Create a new CAN message, with the specified extended ID. */ - explicit CanTxMessage(uint32_t eid, uint8_t dlc = 8); + explicit CanTxMessage(uint32_t eid, uint8_t dlc = 8, bool isExtended = false); /** * Destruction of an instance of CanTxMessage will transmit the message over the wire.