Browse Source

去掉部分编译错误

master
zhaohe 2 years ago
parent
commit
a743f61531
  1. 3
      components/subcanmodule/zcancmder_subboard_initer.cpp
  2. 5
      components/subcanmodule/zcancmder_subboard_initer.hpp
  3. 5
      components/zcancmder/zcanreceiver.hpp
  4. 5
      components/zcancmder/zcanreceiver_master.hpp

3
components/subcanmodule/zcancmder_subboard_initer.cpp

@ -6,6 +6,8 @@
#include <string.h> #include <string.h>
#include "project_configs.h" #include "project_configs.h"
#ifdef HAL_CAN_MODULE_ENABLED
using namespace iflytop; using namespace iflytop;
const char* TAG = PC_PROJECT_NAME; const char* TAG = PC_PROJECT_NAME;
@ -90,3 +92,4 @@ void ZCancmderSubboardIniter::loop() {
cmder.schedule(); cmder.schedule();
} }
} }
#endif

5
components/subcanmodule/zcancmder_subboard_initer.hpp

@ -1,4 +1,5 @@
#pragma once #pragma once
#include "sdk/os/zos.hpp"
#include "sdk\components\cmdscheduler\cmd_scheduler_v2.hpp" #include "sdk\components\cmdscheduler\cmd_scheduler_v2.hpp"
#include "sdk\components\hardware\uart\zuart_dma_receiver.hpp" #include "sdk\components\hardware\uart\zuart_dma_receiver.hpp"
#include "sdk\components\zcancmder\zcan_board_module.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\protocol_parser.hpp"
#include "sdk\components\zprotocols\zcancmder_v2\zmodule_device_manager.hpp" #include "sdk\components\zprotocols\zcancmder_v2\zmodule_device_manager.hpp"
#include "sdk\components\zprotocols\zcancmder_v2\protocol_event_bus_sender.hpp" #include "sdk\components\zprotocols\zcancmder_v2\protocol_event_bus_sender.hpp"
#ifdef HAL_CAN_MODULE_ENABLED
namespace iflytop { namespace iflytop {
class ZCancmderSubboardIniter { class ZCancmderSubboardIniter {
@ -39,4 +41,5 @@ class ZCancmderSubboardIniter {
int32_t getDeviceId(); int32_t getDeviceId();
void initmodule(); void initmodule();
}; };
} // namespace iflytop
} // namespace iflytop
#endif

5
components/zcancmder/zcanreceiver.hpp

@ -6,7 +6,7 @@
#include "basic.hpp" #include "basic.hpp"
#include "sdk/os/zos.hpp" #include "sdk/os/zos.hpp"
#include "sdk\components\zprotocols\zcancmder_v2\api\api.hpp" #include "sdk\components\zprotocols\zcancmder_v2\api\api.hpp"
#ifdef HAL_CAN_MODULE_ENABLED
namespace iflytop { namespace iflytop {
using namespace zcr; using namespace zcr;
@ -93,4 +93,5 @@ class ZCanCmder : public ZCanIRQListener, public IZCanCmder {
bool getRxMessage(CAN_RxHeaderTypeDef *pHeader, uint8_t aData[] /*8byte table*/); bool getRxMessage(CAN_RxHeaderTypeDef *pHeader, uint8_t aData[] /*8byte table*/);
}; };
} // namespace iflytop
} // namespace iflytop
#endif

5
components/zcancmder/zcanreceiver_master.hpp

@ -8,6 +8,8 @@
#include "basic.hpp" #include "basic.hpp"
#include "sdk/os/zos.hpp" #include "sdk/os/zos.hpp"
// #include "sdk\components\zprotocols\zcancmder\zcancmder_protocol.hpp" // #include "sdk\components\zprotocols\zcancmder\zcancmder_protocol.hpp"
#ifdef HAL_CAN_MODULE_ENABLED
namespace iflytop { namespace iflytop {
using namespace std; using namespace std;
typedef function<void(CanPacketRxBuffer *report)> zcan_commnader_master_onpacket_t; typedef function<void(CanPacketRxBuffer *report)> zcan_commnader_master_onpacket_t;
@ -107,4 +109,5 @@ class ZCanCommnaderMaster : public ZCanIRQListener, public IZcanCmderMaster {
void processReadyPacket(CanPacketRxBuffer *buf); void processReadyPacket(CanPacketRxBuffer *buf);
}; };
} // namespace iflytop
} // namespace iflytop
#endif
Loading…
Cancel
Save