diff --git a/.cproject b/.cproject index 08a26e8..cc7b75f 100644 --- a/.cproject +++ b/.cproject @@ -50,6 +50,7 @@ + @@ -76,6 +77,7 @@ + @@ -118,41 +120,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.gitmodules b/.gitmodules index 6b7b104..8f34e42 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,9 @@ [submodule "zsdk"] path = zsdk url = zwsd@192.168.1.3:p_transmit_disinfection_v2/disinfection_stm32_sdk.git -[submodule "iflytop_canbus_protocol"] - path = iflytop_canbus_protocol - url = zwsd@192.168.1.3:p_transmit_disinfection_v2/disinfection_iflytop_can_protocol.git \ No newline at end of file +[submodule "transmit_disfection_protocol"] + path = app_protocols/transmit_disfection_protocol + url = zwsd@192.168.1.3:p_transmit_disinfection_v3/transmit_disfection_protocol.git +[submodule "app_protocols/zscanprotocol"] + path = app_protocols/zscanprotocol + url = zwsd@192.168.1.3:zprotocols/zscanprotocol.git diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index 5eec09b..8909387 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -4,6 +4,7 @@ "name": "app", "includePath": [ "./Core/Inc", + "./app_protocols", "./Drivers/STM32F4xx_HAL_Driver/Inc", "./Drivers/STM32F4xx_HAL_Driver/Inc/Legacy", "./Middlewares/Third_Party/FreeRTOS/Source/include", diff --git a/.vscode/settings.json b/.vscode/settings.json index 49fec6e..a8ffd81 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -80,7 +80,8 @@ "gins.h": "c", "common_hardware_init.h": "c", "public_service.h": "c", - "stm32irq.h": "c" + "stm32irq.h": "c", + "project_configs.h": "c" }, "files.autoGuessEncoding": false, "files.encoding": "utf8" diff --git a/app_protocols/transmit_disfection_protocol b/app_protocols/transmit_disfection_protocol new file mode 160000 index 0000000..7ec8b89 --- /dev/null +++ b/app_protocols/transmit_disfection_protocol @@ -0,0 +1 @@ +Subproject commit 7ec8b89424ab02856d3c48a77dfb11e790db4693 diff --git a/app_protocols/zscanprotocol b/app_protocols/zscanprotocol new file mode 160000 index 0000000..94c49f6 --- /dev/null +++ b/app_protocols/zscanprotocol @@ -0,0 +1 @@ +Subproject commit 94c49f650f508e64b9e30e733dbb161c72ae2559 diff --git a/iflytop_canbus_protocol b/iflytop_canbus_protocol deleted file mode 160000 index d343d18..0000000 --- a/iflytop_canbus_protocol +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d343d187f3beb80852bae6f2d3322f85ee8c8bd9 diff --git a/usrc/base/device_info.cpp b/usrc/base/device_info.cpp index a01bc20..d2e8ca7 100644 --- a/usrc/base/device_info.cpp +++ b/usrc/base/device_info.cpp @@ -1,6 +1,6 @@ #include "device_info.hpp" -#include "iflytop_canbus_protocol/iflytop_canbus_protocol.hpp" +#include "transmit_disfection_protocol/transmit_disfection_protocol.hpp" uint16_t deviceInfo_init() { return 0; } uint16_t deviceInfo_getProtocolVersion() { return PROTOCOL_VERSION; } diff --git a/usrc/board/public_board.cpp b/usrc/board/public_board.cpp index 22902be..fc3a982 100644 --- a/usrc/board/public_board.cpp +++ b/usrc/board/public_board.cpp @@ -2,6 +2,7 @@ #include "idtable/IdMgr.hpp" using namespace iflytop; +using namespace transmit_disfection_protocol; void PublicBoard::debugUartInit(void) { GPIO_InitTypeDef GPIO_InitStruct = {0}; @@ -69,7 +70,6 @@ void PublicBoard::canInit() { HAL_NVIC_EnableIRQ(CAN1_SCE_IRQn); } - void PublicBoard::initialize() { debugUartInit(); canInit(); diff --git a/usrc/board/public_board.hpp b/usrc/board/public_board.hpp index 243563b..532549b 100644 --- a/usrc/board/public_board.hpp +++ b/usrc/board/public_board.hpp @@ -4,7 +4,7 @@ #include "zsdk/zsdk.hpp" #include "zstm32/zstm32.hpp" - +#include "transmit_disfection_protocol/transmit_disfection_protocol.hpp" namespace iflytop { class PublicBoard { ZGPIO m_debugled; diff --git a/usrc/project_configs.h b/usrc/project_configs.h index 4899259..2393b16 100644 --- a/usrc/project_configs.h +++ b/usrc/project_configs.h @@ -1,5 +1,5 @@ #pragma once -#include "iflytop_canbus_protocol/iflytop_canbus_protocol.hpp" + /*********************************************************************************************************************** * SDK_CONFIG * ***********************************************************************************************************************/ diff --git a/usrc/protocol_processer_impl/processer.hpp b/usrc/protocol_processer_impl/processer.hpp index a9aec58..aaca13b 100644 --- a/usrc/protocol_processer_impl/processer.hpp +++ b/usrc/protocol_processer_impl/processer.hpp @@ -1,2 +1,3 @@ +#pragma once #include "public_cmd_processer.hpp" #include "liquid_ctrl_board_cmd_processer.hpp" \ No newline at end of file diff --git a/usrc/protocol_processer_impl/public_cmd_processer.cpp b/usrc/protocol_processer_impl/public_cmd_processer.cpp index 16298b6..0b38e2b 100644 --- a/usrc/protocol_processer_impl/public_cmd_processer.cpp +++ b/usrc/protocol_processer_impl/public_cmd_processer.cpp @@ -1,6 +1,8 @@ #include "public_cmd_processer.hpp" using namespace iflytop; +using namespace zscanprotocol; +using namespace transmit_disfection_protocol; void PublicCmdProcesser::initialize() { REG_FN(read_board_info); diff --git a/usrc/protocol_processer_impl/public_cmd_processer.hpp b/usrc/protocol_processer_impl/public_cmd_processer.hpp index 7858a65..1b1ddfe 100644 --- a/usrc/protocol_processer_impl/public_cmd_processer.hpp +++ b/usrc/protocol_processer_impl/public_cmd_processer.hpp @@ -4,6 +4,9 @@ namespace iflytop { using namespace std; +using namespace zscanprotocol; +using namespace transmit_disfection_protocol; + class PublicCmdProcesser : public IProtocolProcesser { list cmdprocesser; diff --git a/usrc/protocol_processer_mgr/i_protocol_processer.hpp b/usrc/protocol_processer_mgr/i_protocol_processer.hpp index db89308..ed0e650 100644 --- a/usrc/protocol_processer_mgr/i_protocol_processer.hpp +++ b/usrc/protocol_processer_mgr/i_protocol_processer.hpp @@ -5,14 +5,16 @@ #include "zsdk/zsdk.hpp" #include "zstm32/zstm32.hpp" // +#include "transmit_disfection_protocol/transmit_disfection_protocol.hpp" #include "base/device_info.hpp" #include "board/board.hpp" #include "gflag/gflag.h" -#include "iflytop_canbus_protocol/iflytop_canbus_protocol.hpp" #include "zsdk/zcanreceiver/zcanreceiver.hpp" namespace iflytop { using namespace std; +using namespace zscanprotocol; +using namespace transmit_disfection_protocol; #define REG_FN(fn) cmdprocesser.push_back(CmdProcesser(kfn_##fn, bind(&PublicCmdProcesser::fn, this, placeholders::_1))) #define GET_PARAM(buff, off) ((((int32_t*)(buff))[off])) diff --git a/usrc/protocol_processer_mgr/protocol_processer_mgr.cpp b/usrc/protocol_processer_mgr/protocol_processer_mgr.cpp index b1dcb71..bacd2fa 100644 --- a/usrc/protocol_processer_mgr/protocol_processer_mgr.cpp +++ b/usrc/protocol_processer_mgr/protocol_processer_mgr.cpp @@ -1,5 +1,7 @@ #include "protocol_processer_mgr.hpp" using namespace iflytop; +using namespace zscanprotocol; +using namespace transmit_disfection_protocol; #define TAG "ProtocolProcesserMgr" diff --git a/zsdk b/zsdk index 18f5f3e..c7d515f 160000 --- a/zsdk +++ b/zsdk @@ -1 +1 @@ -Subproject commit 18f5f3e7ee74542a2f6d313a5a82acb5489bf114 +Subproject commit c7d515f2180f0ce961f7b61794544d8ea01ec586