From 40d6da40267dc39bcff6b282dd6ed6e7da4408df Mon Sep 17 00:00:00 2001 From: zhaohe Date: Wed, 11 Oct 2023 15:42:10 +0800 Subject: [PATCH] update --- components/zcancmder/zcanreceiver.hpp | 43 +---------------------------------- 1 file changed, 1 insertion(+), 42 deletions(-) diff --git a/components/zcancmder/zcanreceiver.hpp b/components/zcancmder/zcanreceiver.hpp index 7d9635e..e5f1be7 100644 --- a/components/zcancmder/zcanreceiver.hpp +++ b/components/zcancmder/zcanreceiver.hpp @@ -5,52 +5,11 @@ #pragma once #include "sdk/os/zos.hpp" #include "sdk\components\zprotocols\zcancmder\zcancmder_protocol.hpp" +#include "basic.hpp" namespace iflytop { -namespace zcr { -typedef enum { - kpacketHeader = 0, - kpacketData = 1, - kpacketTail = 2, -} packet_type_t; - -class CANPacket { - public: - CAN_RxHeaderTypeDef pHeader; - uint8_t aData[8]; /*8byte table*/ -}; - -}; // namespace zcr using namespace zcr; -class CanPacketRxBuffer { - public: - uint16_t id = 0; - CANPacket m_canPacket[256] = {0}; // 用于接收can消息 - uint8_t m_canPacketNum = 0; - bool dataIsReady = false; - uint8_t rxdata[2000] = {0}; - - int rxdataSize = 0; - - public: - uint16_t get_packetindex(); - uint16_t get_cmdid(); - uint8_t get_subcmdid(); - uint8_t get_packetType(); - uint8_t *get_data(); - uint16_t get_datalen(); - - Cmdheader_t *get_cmdheader(); - - bool iscmd(CmdID_t id); - - template - T *get_data_as() { - return (T *)get_data(); - } -}; - class ZCanCmderListener { public: virtual void onRceivePacket(CanPacketRxBuffer *rxcmd) = 0;