From a743f61531ad7657da7290db69e35c2fdf2b1ea4 Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Mon, 1 Jan 2024 15:13:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=83=A8=E5=88=86=E7=BC=96?=
 =?UTF-8?q?=E8=AF=91=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/subcanmodule/zcancmder_subboard_initer.cpp | 3 +++
 components/subcanmodule/zcancmder_subboard_initer.hpp | 5 ++++-
 components/zcancmder/zcanreceiver.hpp                 | 5 +++--
 components/zcancmder/zcanreceiver_master.hpp          | 5 ++++-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/components/subcanmodule/zcancmder_subboard_initer.cpp b/components/subcanmodule/zcancmder_subboard_initer.cpp
index ac1df9f..b6c7cea 100644
--- a/components/subcanmodule/zcancmder_subboard_initer.cpp
+++ b/components/subcanmodule/zcancmder_subboard_initer.cpp
@@ -6,6 +6,8 @@
 #include <string.h>
 
 #include "project_configs.h"
+#ifdef HAL_CAN_MODULE_ENABLED
+
 using namespace iflytop;
 const char* TAG = PC_PROJECT_NAME;
 
@@ -90,3 +92,4 @@ void ZCancmderSubboardIniter::loop() {
     cmder.schedule();
   }
 }
+#endif
\ No newline at end of file
diff --git a/components/subcanmodule/zcancmder_subboard_initer.hpp b/components/subcanmodule/zcancmder_subboard_initer.hpp
index 3b9e9c0..0a51678 100644
--- a/components/subcanmodule/zcancmder_subboard_initer.hpp
+++ b/components/subcanmodule/zcancmder_subboard_initer.hpp
@@ -1,4 +1,5 @@
 #pragma once
+#include "sdk/os/zos.hpp"
 #include "sdk\components\cmdscheduler\cmd_scheduler_v2.hpp"
 #include "sdk\components\hardware\uart\zuart_dma_receiver.hpp"
 #include "sdk\components\zcancmder\zcan_board_module.hpp"
@@ -7,6 +8,7 @@
 #include "sdk\components\zprotocols\zcancmder_v2\protocol_parser.hpp"
 #include "sdk\components\zprotocols\zcancmder_v2\zmodule_device_manager.hpp"
 #include "sdk\components\zprotocols\zcancmder_v2\protocol_event_bus_sender.hpp"
+#ifdef HAL_CAN_MODULE_ENABLED
 
 namespace iflytop {
 class ZCancmderSubboardIniter {
@@ -39,4 +41,5 @@ class ZCancmderSubboardIniter {
   int32_t getDeviceId();
   void    initmodule();
 };
-}  // namespace iflytop
\ No newline at end of file
+}  // namespace iflytop
+#endif
\ No newline at end of file
diff --git a/components/zcancmder/zcanreceiver.hpp b/components/zcancmder/zcanreceiver.hpp
index 15d25f9..a2dcebe 100644
--- a/components/zcancmder/zcanreceiver.hpp
+++ b/components/zcancmder/zcanreceiver.hpp
@@ -6,7 +6,7 @@
 #include "basic.hpp"
 #include "sdk/os/zos.hpp"
 #include "sdk\components\zprotocols\zcancmder_v2\api\api.hpp"
-
+#ifdef HAL_CAN_MODULE_ENABLED
 namespace iflytop {
 using namespace zcr;
 
@@ -93,4 +93,5 @@ class ZCanCmder : public ZCanIRQListener, public IZCanCmder {
   bool              getRxMessage(CAN_RxHeaderTypeDef *pHeader, uint8_t aData[] /*8byte table*/);
 };
 
-}  // namespace iflytop
\ No newline at end of file
+}  // namespace iflytop
+#endif
\ No newline at end of file
diff --git a/components/zcancmder/zcanreceiver_master.hpp b/components/zcancmder/zcanreceiver_master.hpp
index 0f02035..87d4bc9 100644
--- a/components/zcancmder/zcanreceiver_master.hpp
+++ b/components/zcancmder/zcanreceiver_master.hpp
@@ -8,6 +8,8 @@
 #include "basic.hpp"
 #include "sdk/os/zos.hpp"
 // #include "sdk\components\zprotocols\zcancmder\zcancmder_protocol.hpp"
+#ifdef HAL_CAN_MODULE_ENABLED
+
 namespace iflytop {
 using namespace std;
 typedef function<void(CanPacketRxBuffer *report)> zcan_commnader_master_onpacket_t;
@@ -107,4 +109,5 @@ class ZCanCommnaderMaster : public ZCanIRQListener, public IZcanCmderMaster {
   void               processReadyPacket(CanPacketRxBuffer *buf);
 };
 
-}  // namespace iflytop
\ No newline at end of file
+}  // namespace iflytop
+#endif
\ No newline at end of file