From 699768e04b9064a64ca74a8fdb9b92effe5b15fa Mon Sep 17 00:00:00 2001 From: zhaohe Date: Tue, 8 Jul 2025 19:56:11 +0800 Subject: [PATCH] recode --- README.md | 18 +++++------ app_protocols/transmit_disfection_protocol | 2 +- usrc/app_main.cpp | 20 ++++++------ usrc/board/public_board.cpp | 52 +++++++++++++++--------------- usrc/board/public_board.hpp | 10 +++--- 5 files changed, 51 insertions(+), 51 deletions(-) diff --git a/README.md b/README.md index 8b19af0..6b7df6d 100644 --- a/README.md +++ b/README.md @@ -46,16 +46,16 @@ ```c BoardTypeId: 0x080E0000: - kLargeSpaceDMLiquidCtrlBoard = 0x1, // 大空间消毒机液路板 - kLargeSpaceDMPowerCtrlBoard = 0x2, // 大空间消毒机电源板 - kSmallSpaceDMLiquidCtrlBoard = 0x3, // 小空间消毒机液路板 - kSmallSpaceDMPowerCtrlBoard = 0x4, // 小空间消毒机电源板 - kPipeDMLiquidCtrlBoard = 0x5, // 管道式消毒机液路板 - kPipeDMPowerCtrlBoard = 0x6, // 管道式消毒机电源板 - kDrawBarDMLiquidCtrlBoard = 0x7, // 手持拉杆箱消毒机液路板 - kDrawBarDMPowerCtrlBoard = 0x8, // 手持拉杆箱消毒机电源板 + DT600N_LC_Board = 0x1, // 大空间消毒机液路板 + DT600N_PC_Board = 0x2, // 大空间消毒机电源板 + DT300N_LC_Board = 0x3, // 小空间消毒机液路板 + DT300N_PC_Board = 0x4, // 小空间消毒机电源板 + DT300W_LC_Board = 0x5, // 管道式消毒机液路板 + DT300W_PC_Board = 0x6, // 管道式消毒机电源板 + DT100N_LC_Board = 0x7, // 手持拉杆箱消毒机液路板 + DT100N_PC_Board = 0x8, // 手持拉杆箱消毒机电源板 kDrawBarDMExtBallValveCtrl = 0x9, // 手持拉杆箱消毒机外部球阀控制板 - kH2O2SensorBoard = 0xA, // H2O2传感器板 + EX_H2O2_SENSOR_BOARD = 0xA, // H2O2传感器板 DT600B_LC_BOARD = 0x61,//大空间标准版 液路 DT600B_PC_BOARD = 0x62,//大空间标准版 电源 diff --git a/app_protocols/transmit_disfection_protocol b/app_protocols/transmit_disfection_protocol index 613751c..d1e2069 160000 --- a/app_protocols/transmit_disfection_protocol +++ b/app_protocols/transmit_disfection_protocol @@ -1 +1 @@ -Subproject commit 613751c12e7df7f0e4deb9d56cfa22bc2555ca70 +Subproject commit d1e20693ae72b61d3fcda318e698a9da25d263c4 diff --git a/usrc/app_main.cpp b/usrc/app_main.cpp index a3ba7dd..49c1442 100644 --- a/usrc/app_main.cpp +++ b/usrc/app_main.cpp @@ -81,25 +81,25 @@ void umain() { PublicCmdProcesser::ins()->initialize(); switch (PublicBoard::ins()->getBoardTypeId()) { - case kDrawBarDMLiquidCtrlBoard: - case kDrawBarDMPowerCtrlBoard: + case DT100N_LC_Board: + case DT100N_PC_Board: // not suppport now gInitErrorFlag = true; break; - case kLargeSpaceDMLiquidCtrlBoard: - case kLargeSpaceDMPowerCtrlBoard: - case kSmallSpaceDMLiquidCtrlBoard: - case kSmallSpaceDMPowerCtrlBoard: - case kPipeDMLiquidCtrlBoard: - case kPipeDMPowerCtrlBoard: + case DT600N_LC_Board: + case DT600N_PC_Board: + case DT300N_LC_Board: + case DT300N_PC_Board: + case DT300W_LC_Board: + case DT300W_PC_Board: case DT600B_LC_BOARD: case DT600B_PC_BOARD: DisinfectionApp::ins()->initialize(); break; - case kDrawBarDMExtChSelector: + case DT100N_EXT_CH_SELECTOR: ExtChSelector::ins()->initialize(); break; - case kH2O2SensorBoard: + case EX_H2O2_SENSOR_BOARD: ExtH2O2Sensor::ins()->initialize(); break; default: diff --git a/usrc/board/public_board.cpp b/usrc/board/public_board.cpp index f8054bb..8e419f7 100644 --- a/usrc/board/public_board.cpp +++ b/usrc/board/public_board.cpp @@ -100,7 +100,7 @@ void PublicBoard::initialize() { debugUartInit(); canInit(); - if (getDeviceIdFromFlash() == kH2O2SensorBoard) { + if (getDeviceIdFromFlash() == EX_H2O2_SENSOR_BOARD) { m_debugled.initAsOutput(H2O2_SENSOR_BOARD_DEBUG_LIGHT_GPIO, kxs_gpio_nopull, false, false); } else { m_debugled.initAsOutput(DEBUG_LIGHT_GPIO, kxs_gpio_nopull, false, false); @@ -119,7 +119,7 @@ int PublicBoard::getBoardTypeId() { } } int PublicBoard::getBoardId() { - if (getBoardTypeId() == kH2O2SensorBoard) { + if (getBoardTypeId() == EX_H2O2_SENSOR_BOARD) { int boardIdoff = 0; static ZGPIO id_from_machine; // 消毒机上的开关 if (!id_from_machine.isInited()) { @@ -132,18 +132,18 @@ int PublicBoard::getBoardId() { } } -bool PORT::isLargeSpaceDM() { return PublicBoard::ins()->getProjId() == klarge_space_disinfection_machine; } -bool PORT::isSamllSpaceDM() { return PublicBoard::ins()->getProjId() == ksmall_space_disinfection_machine; } -bool PORT::isPipeDM() { return PublicBoard::ins()->getProjId() == kpipe_disinfection_machine; } -bool PORT::isDrawBarDM() { return PublicBoard::ins()->getProjId() == kdraw_bar_disinfection_box; } -bool PORT::isH2O2Sensor() { return PublicBoard::ins()->getProjId() == kh2o2_ext_sensor; } +bool PORT::isLargeSpaceDM() { return PublicBoard::ins()->getProjId() == DT600N; } +bool PORT::isSamllSpaceDM() { return PublicBoard::ins()->getProjId() == DT300N; } +bool PORT::isPipeDM() { return PublicBoard::ins()->getProjId() == DT300W; } +bool PORT::isDrawBarDM() { return PublicBoard::ins()->getProjId() == DT100N; } +bool PORT::isH2O2Sensor() { return PublicBoard::ins()->getProjId() == EX_H2O2_SENSOR; } bool PORT::isDT600B() { return PublicBoard::ins()->getProjId() == DT600B; } bool PORT::isLiquidCtrlBoard() { - if (PublicBoard::ins()->getBoardTypeId() == kLargeSpaceDMLiquidCtrlBoard || // - PublicBoard::ins()->getBoardTypeId() == kSmallSpaceDMLiquidCtrlBoard || // - PublicBoard::ins()->getBoardTypeId() == kPipeDMLiquidCtrlBoard || // - PublicBoard::ins()->getBoardTypeId() == kDrawBarDMLiquidCtrlBoard || // + if (PublicBoard::ins()->getBoardTypeId() == DT600N_LC_Board || // + PublicBoard::ins()->getBoardTypeId() == DT300N_LC_Board || // + PublicBoard::ins()->getBoardTypeId() == DT300W_LC_Board || // + PublicBoard::ins()->getBoardTypeId() == DT100N_LC_Board || // PublicBoard::ins()->getBoardTypeId() == DT600B_LC_BOARD // ) { return true; @@ -151,10 +151,10 @@ bool PORT::isLiquidCtrlBoard() { return false; } bool PORT::isPowerCtrlBoard() { - if (PublicBoard::ins()->getBoardTypeId() == kLargeSpaceDMPowerCtrlBoard || // - PublicBoard::ins()->getBoardTypeId() == kSmallSpaceDMPowerCtrlBoard || // - PublicBoard::ins()->getBoardTypeId() == kPipeDMPowerCtrlBoard || // - PublicBoard::ins()->getBoardTypeId() == kDrawBarDMPowerCtrlBoard || // + if (PublicBoard::ins()->getBoardTypeId() == DT600N_PC_Board || // + PublicBoard::ins()->getBoardTypeId() == DT300N_PC_Board || // + PublicBoard::ins()->getBoardTypeId() == DT300W_PC_Board || // + PublicBoard::ins()->getBoardTypeId() == DT100N_PC_Board || // PublicBoard::ins()->getBoardTypeId() == DT600B_PC_BOARD // ) { return true; @@ -164,27 +164,27 @@ bool PORT::isPowerCtrlBoard() { void PORT::idtable_init() { // 大空间ID初始化 - IdMgr::ins().addIdItem({kLargeSpaceDMLiquidCtrlBoard, klarge_space_disinfection_machine, kFixBoardId_LiquidCtrl}); - IdMgr::ins().addIdItem({kLargeSpaceDMPowerCtrlBoard, klarge_space_disinfection_machine, kFixBoardId_PowerControl}); + IdMgr::ins().addIdItem({DT600N_LC_Board, DT600N, FIXBOARDID_LC_BOARD}); + IdMgr::ins().addIdItem({DT600N_PC_Board, DT600N, FIXBOARDID_PC_BOARD}); // 小空间ID初始化 - IdMgr::ins().addIdItem({kSmallSpaceDMLiquidCtrlBoard, ksmall_space_disinfection_machine, kFixBoardId_LiquidCtrl}); - IdMgr::ins().addIdItem({kSmallSpaceDMPowerCtrlBoard, ksmall_space_disinfection_machine, kFixBoardId_PowerControl}); + IdMgr::ins().addIdItem({DT300N_LC_Board, DT300N, FIXBOARDID_LC_BOARD}); + IdMgr::ins().addIdItem({DT300N_PC_Board, DT300N, FIXBOARDID_PC_BOARD}); // 管道ID初始化 - IdMgr::ins().addIdItem({kPipeDMLiquidCtrlBoard, kpipe_disinfection_machine, kFixBoardId_LiquidCtrl}); - IdMgr::ins().addIdItem({kPipeDMPowerCtrlBoard, kpipe_disinfection_machine, kFixBoardId_PowerControl}); + IdMgr::ins().addIdItem({DT300W_LC_Board, DT300W, FIXBOARDID_LC_BOARD}); + IdMgr::ins().addIdItem({DT300W_PC_Board, DT300W, FIXBOARDID_PC_BOARD}); // 拉杆箱ID初始化 - IdMgr::ins().addIdItem({kDrawBarDMLiquidCtrlBoard, kdraw_bar_disinfection_box, kFixBoardId_LiquidCtrl}); - IdMgr::ins().addIdItem({kDrawBarDMPowerCtrlBoard, kdraw_bar_disinfection_box, kFixBoardId_PowerControl}); + IdMgr::ins().addIdItem({DT100N_LC_Board, DT100N, FIXBOARDID_LC_BOARD}); + IdMgr::ins().addIdItem({DT100N_PC_Board, DT100N, FIXBOARDID_PC_BOARD}); // H2O2传感器ID初始化 - IdMgr::ins().addIdItem({kH2O2SensorBoard, kh2o2_ext_sensor, kFixBoardId_H2O2SensorStart}); + IdMgr::ins().addIdItem({EX_H2O2_SENSOR_BOARD, EX_H2O2_SENSOR, FIXBOARDID_H2O2SENSOR_START}); // 小空间经济版 - IdMgr::ins().addIdItem({DT600B_LC_BOARD, DT600B, kFixBoardId_LiquidCtrl}); - IdMgr::ins().addIdItem({DT600B_PC_BOARD, DT600B, kFixBoardId_PowerControl}); + IdMgr::ins().addIdItem({DT600B_LC_BOARD, DT600B, FIXBOARDID_LC_BOARD}); + IdMgr::ins().addIdItem({DT600B_PC_BOARD, DT600B, FIXBOARDID_PC_BOARD}); } namespace iflytop { diff --git a/usrc/board/public_board.hpp b/usrc/board/public_board.hpp index 909b27f..db5f763 100644 --- a/usrc/board/public_board.hpp +++ b/usrc/board/public_board.hpp @@ -28,11 +28,11 @@ bool isBoardType(int32_t val0, int32_t val1); bool isBoardType(int32_t val0, int32_t val1, int32_t val2); bool isBoardType(int32_t val0, int32_t val1, int32_t val2, int32_t val3); -// klarge_space_disinfection_machine = 1, // 大空间消毒机 -// ksmall_space_disinfection_machine = 2, // 小空间消毒机 -// kpipe_disinfection_machine = 3, // 管道式消毒机 -// kdraw_bar_disinfection_box = 4, // 手持拉杆箱消毒机 -// kh2o2_ext_sensor = 5, // 外部H2O2传感器 +// DT600N = 1, // 大空间消毒机 +// DT300N = 2, // 小空间消毒机 +// DT300W = 3, // 管道式消毒机 +// DT100N = 4, // 手持拉杆箱消毒机 +// EX_H2O2_SENSOR = 5, // 外部H2O2传感器 class PORT { public: