diff --git a/usrc/app_main.cpp b/usrc/app_main.cpp index 8fdd0c8..254246a 100644 --- a/usrc/app_main.cpp +++ b/usrc/app_main.cpp @@ -6,11 +6,15 @@ // #include "board/large_space_dm_liquid_ctrl_board.hpp" #include "board/large_space_dm_power_ctrl_board.hpp" +#include "board/pipe_dm_liquid_ctrl_board.hpp" +#include "board/pipe_dm_power_ctrl_board.hpp" #include "board/public_board.hpp" // #include "base/protocol_processer_mgr.hpp" #include "protocol_processer_impl/large_space_dm_liquid_ctrl_board_pp.hpp" #include "protocol_processer_impl/large_space_dm_power_ctrl_board_pp.hpp" +#include "protocol_processer_impl/pipe_dm_liquid_ctrl_board_pp.hpp" +#include "protocol_processer_impl/pipe_dm_power_ctrl_board_pp.hpp" #include "protocol_processer_impl/public_cmd_processer.hpp" // #include "zsdk/zcanreceiver/zcanreceiver.hpp" @@ -72,6 +76,8 @@ void idtable_init() { IdMgr::ins().addIdItem({kH2O2SensorBoard, kh2o2_ext_sensor, kFixBoardId_H2O2SensorStart}); } +#define REG_PROCESSER(processer) ProtocolProcesserMgr::ins()->regProcesser(processer); + void umain() { gBoardFlagSetResetFlag(); @@ -91,22 +97,26 @@ void umain() { ZLOGI(TAG, "="); ProtocolProcesserMgr::ins()->initialize(); - ProtocolProcesserMgr::ins()->regProcesser(PublicCmdProcesser::ins()); + REG_PROCESSER(PublicCmdProcesser::ins()); switch (PublicBoard::ins()->getBoardTypeId()) { case kLargeSpaceDMLiquidCtrlBoard: case kSmallSpaceDMLiquidCtrlBoard: LargeSpaceDmLiquidCtrlBoard::ins()->initialize(); - ProtocolProcesserMgr::ins()->regProcesser(LargeSpaceDmLiquidCtrlBoardPP::ins()); + REG_PROCESSER(LargeSpaceDmLiquidCtrlBoardPP::ins()); break; case kLargeSpaceDMPowerCtrlBoard: case kSmallSpaceDMPowerCtrlBoard: LargeSpaceDmPowerCtrlBoard::ins()->initialize(); - ProtocolProcesserMgr::ins()->regProcesser(LargeSpaceDmPowerCtrlBoardPP::ins()); + REG_PROCESSER(LargeSpaceDmPowerCtrlBoardPP::ins()); break; case kPipeDMLiquidCtrlBoard: + PipeDMLiquidCtrlBoard::ins()->initialize(); + REG_PROCESSER(PipeDMLiquidCtrlBoardPP::ins()); break; case kPipeDMPowerCtrlBoard: + PipeDMPowerCtrlBoard::ins()->initialize(); + REG_PROCESSER(PipeDMPowerCtrlBoardPP::ins()); break; case kDrawBarDMLiquidCtrlBoard: break;