From 2bd8d2ea4a89819cce19827e9c43783304d316d6 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Thu, 18 Apr 2024 21:04:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DCAN=E6=8E=A5=E6=94=B6?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=86=85=E5=AD=98=E6=BA=A2=E5=87=BA=E7=9A=84?= =?UTF-8?q?BUG=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/zcancmder/basic.hpp | 2 +- components/zcancmder/zcanreceiver.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/zcancmder/basic.hpp b/components/zcancmder/basic.hpp index edf2068..f7a5d07 100644 --- a/components/zcancmder/basic.hpp +++ b/components/zcancmder/basic.hpp @@ -26,7 +26,7 @@ using namespace zcr; class CanPacketRxBuffer { public: uint16_t id = 0; - CANPacket m_canPacket[125] = {0}; // 用于接收can消息 + CANPacket m_canPacket[100] = {0}; // 用于接收can消息 uint8_t m_canPacketNum = 0; uint8_t m_npacket = 0; uint8_t rxdata[1000] = {0}; diff --git a/components/zcancmder/zcanreceiver.cpp b/components/zcancmder/zcanreceiver.cpp index f86d834..44afaa5 100644 --- a/components/zcancmder/zcanreceiver.cpp +++ b/components/zcancmder/zcanreceiver.cpp @@ -321,7 +321,7 @@ void ZCanCmder::STM32_HAL_onCAN_RxFifo0MsgPending(CAN_HandleTypeDef *canHandle) rxbuf->m_canPacketNum = 0; } - if (rxbuf->m_canPacketNum < 255) { + if (rxbuf->m_canPacketNum < ZARRAY_SIZE(rxbuf->m_canPacket)) { rxbuf->m_canPacket[rxbuf->m_canPacketNum].dlc = pHeader.DLC; memcpy(rxbuf->m_canPacket[rxbuf->m_canPacketNum].aData, aData, 8); rxbuf->m_canPacketNum++;