From ab3fd3cc3d2e71b8cf0d721a926a7218bd1dcc8d Mon Sep 17 00:00:00 2001 From: Fancy code <258828110.@qq.com> Date: Mon, 17 Jun 2024 13:47:33 +0800 Subject: [PATCH] Improve:LinuxApi McuProtocolHandle StatusCode include cleaner. --- utils/LinuxApi/include/LinuxApi.h | 1 - utils/LinuxApi/src/LinuxApi.c | 4 +++- utils/McuProtocol/src/LittleEndianHandle.cpp | 3 ++- utils/McuProtocol/src/McuProtocol.cpp | 7 +++++++ utils/McuProtocol/src/McuProtocolMakePtr.cpp | 5 ++++- utils/McuProtocol/src/ProtocolHandle.cpp | 7 +++++++ utils/StatusCode/src/StatusCode.c | 1 - 7 files changed, 23 insertions(+), 5 deletions(-) diff --git a/utils/LinuxApi/include/LinuxApi.h b/utils/LinuxApi/include/LinuxApi.h index 96f4568b..ceef5461 100644 --- a/utils/LinuxApi/include/LinuxApi.h +++ b/utils/LinuxApi/include/LinuxApi.h @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include diff --git a/utils/LinuxApi/src/LinuxApi.c b/utils/LinuxApi/src/LinuxApi.c index 754cf9c5..7fd4b4cd 100644 --- a/utils/LinuxApi/src/LinuxApi.c +++ b/utils/LinuxApi/src/LinuxApi.c @@ -13,11 +13,13 @@ * limitations under the License. */ #include "LinuxApi.h" -#include #include +#include #include #include +#include #include +#include #include #include #include diff --git a/utils/McuProtocol/src/LittleEndianHandle.cpp b/utils/McuProtocol/src/LittleEndianHandle.cpp index d6e848e0..f6d0691c 100644 --- a/utils/McuProtocol/src/LittleEndianHandle.cpp +++ b/utils/McuProtocol/src/LittleEndianHandle.cpp @@ -13,8 +13,9 @@ * limitations under the License. */ #include "LittleEndianHandle.h" -#include "ILog.h" #include "ModBusCRC16.h" +#include "ProtocolHandle.h" +#include #include #include LittleEndianHandle::LittleEndianHandle(const std::shared_ptr ¶m) : ProtocolHandle(param) diff --git a/utils/McuProtocol/src/McuProtocol.cpp b/utils/McuProtocol/src/McuProtocol.cpp index 55d6539a..481c96ee 100644 --- a/utils/McuProtocol/src/McuProtocol.cpp +++ b/utils/McuProtocol/src/McuProtocol.cpp @@ -15,7 +15,14 @@ #include "McuProtocol.h" #include "ILog.h" #include "ProtocolHandle.h" +#include "StatusCode.h" +#include +#include +#include +#include +#include #include +#include std::shared_ptr VProtocolBase::SharedFromThis(void) { return std::make_shared(); diff --git a/utils/McuProtocol/src/McuProtocolMakePtr.cpp b/utils/McuProtocol/src/McuProtocolMakePtr.cpp index a1c7625c..84506116 100644 --- a/utils/McuProtocol/src/McuProtocolMakePtr.cpp +++ b/utils/McuProtocol/src/McuProtocolMakePtr.cpp @@ -15,7 +15,10 @@ #include "McuProtocolMakePtr.h" #include "ILog.h" #include "LittleEndianHandle.h" -#include +#include "ProtocolHandle.h" +#include "StatusCode.h" +#include +#include std::shared_ptr &McuProtocolMakePtr::GetInstance(std::shared_ptr *impl) { static auto instance = std::make_shared(); diff --git a/utils/McuProtocol/src/ProtocolHandle.cpp b/utils/McuProtocol/src/ProtocolHandle.cpp index ea453b48..bec0c575 100644 --- a/utils/McuProtocol/src/ProtocolHandle.cpp +++ b/utils/McuProtocol/src/ProtocolHandle.cpp @@ -17,7 +17,14 @@ #include "McuProtocol.h" #include "McuProtocolMakePtr.h" #include "ModBusCRC16.h" +#include "StatusCode.h" +#include +#include +#include +#include #include +#include +#include #include using std::placeholders::_1; // using std::placeholders::_2; diff --git a/utils/StatusCode/src/StatusCode.c b/utils/StatusCode/src/StatusCode.c index fa86750d..8cd7343c 100644 --- a/utils/StatusCode/src/StatusCode.c +++ b/utils/StatusCode/src/StatusCode.c @@ -14,7 +14,6 @@ */ #include "StatusCode.h" #include "ILog.h" -#include #include static const char *StatusCodeString[STATUS_CODE_END + 1] = {"STATUS_CODE_OK", "STATUS_CODE_NOT_OK",