From 784d3a9b1d3c9b5fa203059dd63b696a64c02497 Mon Sep 17 00:00:00 2001 From: Fancy code <258828110.@qq.com> Date: Thu, 16 May 2024 11:47:19 +0800 Subject: [PATCH] Fixed:McuManager reply what recv. --- doc/develop_standard.md | 57 +++++++++++++++++ middleware/McuManager/include/IMcuManager.h | 4 +- middleware/McuManager/src/IMcuManager.cpp | 4 +- middleware/McuManager/src/McuManagerImpl.cpp | 13 ++-- .../src_mock/McuManager_Mock_Test.cpp | 29 ++++++++- .../tool/include/McuManagerTestTool.h | 1 + .../tool/src/McuManagerTestTool.cpp | 5 ++ test/test_develop.md | 2 +- .../tool/include/McuProtocolTestTool.h | 5 ++ .../tool/src/McuProtocolTestTool.cpp | 61 ++++++++++++++++++- .../McuProtocol/tool/src/ProtocolMonitor.cpp | 26 +++++++- utils/McuProtocol/src/McuProtocol.cpp | 4 +- utils/McuProtocol/src/ProtocolHandle.cpp | 7 +++ 13 files changed, 199 insertions(+), 19 deletions(-) create mode 100644 doc/develop_standard.md diff --git a/doc/develop_standard.md b/doc/develop_standard.md new file mode 100644 index 00000000..62a76150 --- /dev/null +++ b/doc/develop_standard.md @@ -0,0 +1,57 @@ +# 1. SDK开发规范 + +## 1.1. 编码规范 + +### 1.1.1. 指针/智能指针 + +* C++编码只能使用智能指针； +* 指针遵循谁使用谁进行“非空”判断，且无比使用前进行“非空”判断； +* 智能指针经过转换后务必进行“非空”判断； + +理论上，**明显不可能为空的指针，可以不进行“非空”判断**，可以不进行“非空”判断的场景： + +``` +void McuManagerImpl::OtherSideSendIpcMission(const unsigned int &serialNumber, const unsigned char &mission) +{ + class McuRecvIpcMission : public McuRecvImpl, public McuRecv + { + public: + McuRecvIpcMission(std::shared_ptr &mcuManager, const unsigned int &serialNumber, + const OtherSideSendType &sendType, const unsigned char &mission) + : McuRecvImpl(serialNumber, sendType) + { + McuRecv::mDataRecvReply = mission; + McuRecvImpl::mMcuManager = mcuManager; + } + ~McuRecvIpcMission() = default; + void ReplyFinished(const bool result) override + { + // 此处可以不进行“非空”判断，该值在有限范围内（OtherSideSendIpcMission函数内部）就能看出是否为空 + McuRecvImpl::mMcuManager->ReplyOtherSideSendIpcMission(ASK_RESULT::SUCCEED, McuRecvImpl::mSerialNumber); + } + }; + std::shared_ptr monitor = GetMcuMonitor(); + std::shared_ptr manager = std::dynamic_pointer_cast(SharedFromThis()); + std::shared_ptr recv = + std::make_shared(manager, serialNumber, OtherSideSendType::SEND_IPC_MISSION, mission); + if (monitor) { + monitor->RecvIpcMissionEvent(recv, static_cast(mission)); + } + else { + LogWarning("mMonitor is nullptr, AddMcuRecv.\n"); + AddMcuRecv(recv); + } +} +``` + +**没有进行“非空”判断的代码，应该开发测试用例，保证“空指针”的报错。** + +### 1.1.2. 注释 + +* 注释必须使用英文，且使用翻译器翻译； +  避免编码问题导致的乱码，且需要保证阅读困难时可使用翻译器翻译成可读的中文； +**注：** 注释翻译工具使用[百度翻译](https://fanyi.baidu.com/)； + +### 1.1.3. C++继承 + +* 子类使用父类的函数时，函数前必须加父类名，降低阅读难度，没有父类名的一律为本类函数（有可能是虚函数）； \ No newline at end of file diff --git a/middleware/McuManager/include/IMcuManager.h b/middleware/McuManager/include/IMcuManager.h index 391c3b54..4356bfa3 100644 --- a/middleware/McuManager/include/IMcuManager.h +++ b/middleware/McuManager/include/IMcuManager.h @@ -133,8 +133,8 @@ public: VMcuMonitor() = default; virtual ~VMcuMonitor() = default; virtual void RecvIpcMissionEvent(std::shared_ptr &recv, const IpcMission &mission); - virtual void RecvMcuHeartBeat(std::shared_ptr &recv); - virtual void RecvGetIntervalStart(std::shared_ptr &recv); + virtual void RecvMcuHeartBeatEvent(std::shared_ptr &recv); + virtual void RecvGetIntervalStartEvent(std::shared_ptr &recv); virtual void RecvGetDateTime(std::shared_ptr &recv); virtual void RecvGetPirSensitivity(std::shared_ptr &recv); }; diff --git a/middleware/McuManager/src/IMcuManager.cpp b/middleware/McuManager/src/IMcuManager.cpp index c7860e5c..64d307c8 100644 --- a/middleware/McuManager/src/IMcuManager.cpp +++ b/middleware/McuManager/src/IMcuManager.cpp @@ -52,10 +52,10 @@ void VMcuRecv::ReplyFinished(const bool result) void VMcuMonitor::RecvIpcMissionEvent(std::shared_ptr &recv, const IpcMission &mission) { } -void VMcuMonitor::RecvMcuHeartBeat(std::shared_ptr &recv) +void VMcuMonitor::RecvMcuHeartBeatEvent(std::shared_ptr &recv) { } -void VMcuMonitor::RecvGetIntervalStart(std::shared_ptr &recv) +void VMcuMonitor::RecvGetIntervalStartEvent(std::shared_ptr &recv) { } void VMcuMonitor::RecvGetDateTime(std::shared_ptr &recv) diff --git a/middleware/McuManager/src/McuManagerImpl.cpp b/middleware/McuManager/src/McuManagerImpl.cpp index 820daf6c..33a9bc7f 100644 --- a/middleware/McuManager/src/McuManagerImpl.cpp +++ b/middleware/McuManager/src/McuManagerImpl.cpp @@ -199,7 +199,7 @@ void McuManagerImpl::OtherSideSendHearBeat(const unsigned int &serialNumber) std::make_shared(manager, serialNumber, OtherSideSendType::SEND_HEART_BEAT); if (monitor) { LogInfo("Mcu manager report heart beat to mcu monitor.\n"); - monitor->RecvMcuHeartBeat(recv); + monitor->RecvMcuHeartBeatEvent(recv); } else { LogWarning("mMonitor is nullptr, AddMcuRecv.\n"); @@ -220,6 +220,7 @@ void McuManagerImpl::OtherSideSendGetIntervalStart(const unsigned int &serialNum ~McuRecvGetIntervalStart() = default; void ReplyFinished(const bool result) override { + LogInfo("OtherSideSendGetIntervalStart finised.\n"); McuRecvImpl::mMcuManager->ReplyOtherSideSendGetIntervalStart(mDataRecvReply, McuRecvImpl::mSerialNumber); } }; @@ -228,8 +229,8 @@ void McuManagerImpl::OtherSideSendGetIntervalStart(const unsigned int &serialNum std::shared_ptr recv = std::make_shared(manager, serialNumber, OtherSideSendType::GET_INTERVAL_START); if (monitor) { - LogInfo("Mcu manager report heart beat to mcu monitor.\n"); - monitor->RecvMcuHeartBeat(recv); + LogInfo("Mcu manager report get interval start to mcu monitor.\n"); + monitor->RecvGetIntervalStartEvent(recv); } else { LogWarning("mMonitor is nullptr, AddMcuRecv.\n"); @@ -259,7 +260,7 @@ void McuManagerImpl::OtherSideSendGetDateTime(const unsigned int &serialNumber) std::make_shared(manager, serialNumber, OtherSideSendType::GET_DATE_TIME); if (monitor) { LogInfo("Mcu manager report heart beat to mcu monitor.\n"); - monitor->RecvMcuHeartBeat(recv); + monitor->RecvMcuHeartBeatEvent(recv); } else { LogWarning("mMonitor is nullptr, AddMcuRecv.\n"); @@ -290,7 +291,7 @@ void McuManagerImpl::OtherSideSendGetPirSensitivity(const unsigned int &serialNu std::make_shared(manager, serialNumber, OtherSideSendType::GET_DATE_TIME); if (monitor) { LogInfo("Mcu manager report heart beat to mcu monitor.\n"); - monitor->RecvMcuHeartBeat(recv); + monitor->RecvMcuHeartBeatEvent(recv); } else { LogWarning("mMonitor is nullptr, AddMcuRecv.\n"); @@ -350,6 +351,6 @@ void McuManagerImpl::McuAskSendHeartBeatHandle(std::shared_ptr &recv) { std::shared_ptr monitor = GetMcuMonitor(); if (monitor) { - monitor->RecvMcuHeartBeat(recv); + monitor->RecvMcuHeartBeatEvent(recv); } } \ No newline at end of file diff --git a/test/middleware/McuManager/src_mock/McuManager_Mock_Test.cpp b/test/middleware/McuManager/src_mock/McuManager_Mock_Test.cpp index 644bb615..44924774 100644 --- a/test/middleware/McuManager/src_mock/McuManager_Mock_Test.cpp +++ b/test/middleware/McuManager/src_mock/McuManager_Mock_Test.cpp @@ -188,9 +188,9 @@ TEST_F(McuManagerMockTest, HS_INTEGRATION_McuManager_EXAMPLE_OtherSideSendHeartB public: MonitorTest() = default; virtual ~MonitorTest() = default; - void RecvMcuHeartBeat(std::shared_ptr &recv) override + void RecvMcuHeartBeatEvent(std::shared_ptr &recv) override { - LogInfo("RecvMcuHeartBeat\n"); + LogInfo("RecvMcuHeartBeatEvent\n"); // std::shared_ptr> ask = std::dynamic_pointer_cast>(recv); // ask->mDataReply = ASK_RESULT::SUCCEED; recv->ReplyFinished(true); @@ -857,7 +857,6 @@ TEST_F(McuManagerMockTest, HS_INTEGRATION_McuManager_AUTO_GetIpcMissionFailed) McuAskBaseTestTool::ReplyFinished(result); if (result) { LogInfo("Ask data succeed, mDataReply = %d.\n", static_cast(mDataReply)); - // Do something here. } else { LogError("Ask data falied.\n"); @@ -899,4 +898,28 @@ TEST_F(McuManagerMockTest, HS_INTEGRATION_McuManager_AUTO_OtherSideSendIpcMissio std::this_thread::sleep_for(std::chrono::milliseconds(2000)); IMcuManager::GetInstance()->UnInit(); } +// ../output_files/test/bin/McuManagerTest +// --gtest_filter=McuManagerMockTest.HS_INTEGRATION_McuManager_AUTO_OtherSideGetIntervalStart +TEST_F(McuManagerMockTest, HS_INTEGRATION_McuManager_AUTO_OtherSideGetIntervalStart) +{ + constexpr unsigned int TEST_SERIAL_NUMBER = 99; + class MonitorTest : public VMcuMonitor + { + public: + MonitorTest() = default; + virtual ~MonitorTest() = default; + void RecvGetIntervalStartEvent(std::shared_ptr &recv) override + { + LogInfo("RecvGetIntervalStartEvent\n"); + std::shared_ptr> recvData = std::dynamic_pointer_cast>(recv); + recv->ReplyFinished(true); + } + }; + IMcuManager::GetInstance()->Init(); + MockOtherSideGetIntervalStart(mLinuxTest, TEST_SERIAL_NUMBER); + std::shared_ptr monitor = std::make_shared(); + IMcuManager::GetInstance()->SetMcuMonitor(monitor); + std::this_thread::sleep_for(std::chrono::milliseconds(2000)); + IMcuManager::GetInstance()->UnInit(); +} } // namespace McuManagerMockTest \ No newline at end of file diff --git a/test/middleware/McuManager/tool/include/McuManagerTestTool.h b/test/middleware/McuManager/tool/include/McuManagerTestTool.h index 3c34e3e6..a84b2cfe 100644 --- a/test/middleware/McuManager/tool/include/McuManagerTestTool.h +++ b/test/middleware/McuManager/tool/include/McuManagerTestTool.h @@ -36,6 +36,7 @@ public: bool CheckAskExist(const std::shared_ptr &ask); void MockOtherSideAskIpcMission(std::shared_ptr &mock, const unsigned int &serialNumber); void MockOtherSideAskHeartBeat(std::shared_ptr &mock, const unsigned int &serialNumber); + void MockOtherSideGetIntervalStart(std::shared_ptr &mock, const unsigned int &serialNumber); void MockMcuDeviceOpenFailed(std::shared_ptr &mock); void MockMcuDeviceOpenSuccessButReadNothing(std::shared_ptr &mock); diff --git a/test/middleware/McuManager/tool/src/McuManagerTestTool.cpp b/test/middleware/McuManager/tool/src/McuManagerTestTool.cpp index 93bcbff1..8a63d8a9 100644 --- a/test/middleware/McuManager/tool/src/McuManagerTestTool.cpp +++ b/test/middleware/McuManager/tool/src/McuManagerTestTool.cpp @@ -52,6 +52,11 @@ void McuManagerTestTool::MockOtherSideAskHeartBeat(std::shared_ptr &m { McuProtocolTestTool::MockOtherSideAskHeartBeat(mock, serialNumber); } +void McuManagerTestTool::MockOtherSideGetIntervalStart(std::shared_ptr &mock, + const unsigned int &serialNumber) +{ + McuProtocolTestTool::MockOtherSideAskGetIntervalStart(mock, serialNumber); +} void McuManagerTestTool::MockMcuDeviceOpenFailed(std::shared_ptr &mock) { UartDeviceTestTool::SetUartDeviceOpenFailed(mock, gUartDevice); diff --git a/test/test_develop.md b/test/test_develop.md index ab1afdeb..43bb77dd 100644 --- a/test/test_develop.md +++ b/test/test_develop.md @@ -24,7 +24,7 @@ ### 1.1.2. 测试用例命名： -1. 仿真：硬件仿真，使用hardware simulation的缩写：**HS**，硬件仿真只能运行在Ubuntu系统进行仿真测试；真实硬件接口使用real hardware的缩写：**RH**，真实硬件接口测试用例只能运行在开发板进行真机测试；不涉及使用NOT INVOLVED的缩写：**NI**，即可执行在Ubuntu也可以运行在开发板； +1. 仿真：硬件仿真，使用hardware simulation的缩写：**HS**，硬件仿真只能运行在Ubuntu系统进行仿真测试；真实硬件接口使用real hardware的缩写：**RH**，真实硬件接口测试用例只能运行在开发板进行真机测试； 2. 测试用例类型：含单元测试（UNIT）和集成测试（INTEGRATION）； 3. 用例所属模块：大小驼峰； 4. 测试用例属性：EXAMPLE/AUTO/STRESS diff --git a/test/utils/McuProtocol/tool/include/McuProtocolTestTool.h b/test/utils/McuProtocol/tool/include/McuProtocolTestTool.h index 34541b2b..a87fd54b 100644 --- a/test/utils/McuProtocol/tool/include/McuProtocolTestTool.h +++ b/test/utils/McuProtocol/tool/include/McuProtocolTestTool.h @@ -33,6 +33,7 @@ public: void UnInit(void); void MockOtherSideAskIpcMission(std::shared_ptr &mock, const unsigned int &serialNumber); void MockOtherSideAskHeartBeat(std::shared_ptr &mock, const unsigned int &serialNumber); + void MockOtherSideAskGetIntervalStart(std::shared_ptr &mock, const unsigned int &serialNumber); void ReadNothingAnyTime(std::shared_ptr &mock); private: @@ -75,6 +76,10 @@ private: const unsigned int &serialNumber); void OtherSideAskHeartBeatInit(std::shared_ptr &mock, const int &uartFd, const unsigned int &serialNumber); + void OtherSideAskGetIntervalStartHandle(std::shared_ptr &mock, const int &uartFd, + const unsigned int &serialNumber); + void OtherSideAskGetIntervalStartInit(std::shared_ptr &mock, const int &uartFd, + const unsigned int &serialNumber); private: static void PrintHexadecimalData(const void *buf, const size_t &bufLength, const char *log); diff --git a/test/utils/McuProtocol/tool/src/McuProtocolTestTool.cpp b/test/utils/McuProtocol/tool/src/McuProtocolTestTool.cpp index 17827385..aaf03be5 100644 --- a/test/utils/McuProtocol/tool/src/McuProtocolTestTool.cpp +++ b/test/utils/McuProtocol/tool/src/McuProtocolTestTool.cpp @@ -69,6 +69,10 @@ unsigned char REPLY_OTHER_SIDE_ASK_SEND_HEART_BEAT_X[] = { 0xFA, 0xC1, 0x00, 0x00, 0x00, 0x00, 0xC1, 0x02, 0x00, 0x0C, 0xFF, 0xFF}; unsigned char OTHER_SIDE_ASK_SEND_HEART_BEAT_X[] = { 0xFA, 0xC1, 0x00, 0x00, 0x00, 0x00, 0x41, 0x02, 0x00, 0x0C, 0xFF, 0xFF}; +unsigned char REPLY_OTHER_SIDE_ASK_GET_INTERVAL_START_X[] = { + 0xFA, 0xC1, 0x00, 0x00, 0x00, 0x00, 0xC1, 0x06, 0x00, 0x0F, 0x00, 0x00, 0x00, 0xFF, 0xFF}; +unsigned char OTHER_SIDE_ASK_GET_INTERVAL_START_X[] = { + 0xFA, 0xC1, 0x00, 0x00, 0x00, 0x00, 0x41, 0x06, 0x00, 0x0C, 0xFF, 0xFF}; McuProtocolTestTool::McuProtocolTestTool() { mThreadRuning = false; @@ -145,6 +149,11 @@ void McuProtocolTestTool::MockOtherSideAskHeartBeat(std::shared_ptr & { OtherSideAskHeartBeatHandle(mock, mUartFd, serialNumber); } +void McuProtocolTestTool::MockOtherSideAskGetIntervalStart(std::shared_ptr &mock, + const unsigned int &serialNumber) +{ + OtherSideAskGetIntervalStartHandle(mock, mUartFd, serialNumber); +} void McuProtocolTestTool::ReadNothingAnyTime(std::shared_ptr &mock) { static size_t WRITE_COUNT = -1; @@ -708,7 +717,7 @@ void McuProtocolTestTool::OtherSideAskIpcMissionInit(std::shared_ptr serialNumber, REPLY_OTHER_SIDE_ASK_SEND_IPC_MISSION, nullptr, - sizeof(OTHER_SIDE_ASK_SEND_IPC_MISSION_X)); + sizeof(REPLY_OTHER_SIDE_ASK_SEND_IPC_MISSION_X)); } } void McuProtocolTestTool::OtherSideAskHeartBeatHandle(std::shared_ptr &mock, const int &uartFd, @@ -755,7 +764,55 @@ void McuProtocolTestTool::OtherSideAskHeartBeatInit(std::shared_ptr & serialNumber, REPLY_OTHER_SIDE_ASK_SEND_HEART_BEAT, nullptr, - sizeof(OTHER_SIDE_ASK_SEND_HEART_BEAT_X)); + sizeof(REPLY_OTHER_SIDE_ASK_SEND_HEART_BEAT_X)); + } +} +void McuProtocolTestTool::OtherSideAskGetIntervalStartHandle(std::shared_ptr &mock, const int &uartFd, + const unsigned int &serialNumber) +{ + LogInfo("OtherSideAskGetIntervalStartHandle\n"); + auto handle = [=, &mock](McuProtocolTestTool *testTool) { + testTool->OtherSideAskGetIntervalStartInit(mock, uartFd, serialNumber); + }; + if (mLockThread.joinable()) { + mLockThread.join(); + } + mLockThread = std::thread(handle, this); +} +void McuProtocolTestTool::OtherSideAskGetIntervalStartInit(std::shared_ptr &mock, const int &uartFd, + const unsigned int &serialNumber) +{ + LockProtocolHandle(); + unsigned int serialNum = serialNumber; + serialNum = htonl(serialNum); + memcpy( + OTHER_SIDE_ASK_GET_INTERVAL_START_X + PROTOCOL_SERIAL_NUMBER_OFFSET, &serialNum, PROTOCOL_SERIAL_NUMBER_LENGTH); + ResetCheckCode(OTHER_SIDE_ASK_GET_INTERVAL_START_X, sizeof(OTHER_SIDE_ASK_GET_INTERVAL_START_X)); + ReplySelectSucceed(mock, uartFd); + constexpr int LEFT_DATA_LENGTH = sizeof(OTHER_SIDE_ASK_GET_INTERVAL_START_X) - PROTOCOL_DATA_KEY_HEAD_LENGTH; + auto apiReadKeyHead = [=](int fd, void *buf, size_t count) { + memcpy(buf, OTHER_SIDE_ASK_GET_INTERVAL_START_X, PROTOCOL_DATA_KEY_HEAD_LENGTH); + McuProtocolTestTool::PrintHexadecimalData( + buf, PROTOCOL_DATA_KEY_HEAD_LENGTH, "OtherSideAskGetIntervalStartInit read:"); + }; + auto apiReadLeftData = [=](int fd, void *buf, size_t count) { + memcpy(buf, OTHER_SIDE_ASK_GET_INTERVAL_START_X + PROTOCOL_DATA_KEY_HEAD_LENGTH, LEFT_DATA_LENGTH); + McuProtocolTestTool::PrintHexadecimalData(buf, LEFT_DATA_LENGTH, "OtherSideAskGetIntervalStartInit read:"); + UnlockProtocolHandle(); + }; + EXPECT_CALL(*mock.get(), fx_read(uartFd, _, _)) + .WillOnce(DoAll(WithArgs<0, 1, 2>(Invoke(apiReadKeyHead)), Return(PROTOCOL_DATA_KEY_HEAD_LENGTH))) + .WillOnce(DoAll(WithArgs<0, 1, 2>(Invoke(apiReadLeftData)), Return(LEFT_DATA_LENGTH))) + .WillRepeatedly(DoAll(Return(UART_DEVICE_READ_NOTHING))); + std::shared_ptr test = + std::dynamic_pointer_cast(ProtocolMonitorTest::GetInstance()); + if (test) { + ProtocolMonitorTest::WriteDataOnce(test, + PROTOCOL_HEAD, + serialNumber, + REPLY_OTHER_SIDE_ASK_GET_INTERVAL_START, + nullptr, + sizeof(REPLY_OTHER_SIDE_ASK_GET_INTERVAL_START_X)); } } void McuProtocolTestTool::PrintHexadecimalData(const void *buf, const size_t &bufLength, const char *log) diff --git a/test/utils/McuProtocol/tool/src/ProtocolMonitor.cpp b/test/utils/McuProtocol/tool/src/ProtocolMonitor.cpp index ec40cc37..41470308 100644 --- a/test/utils/McuProtocol/tool/src/ProtocolMonitor.cpp +++ b/test/utils/McuProtocol/tool/src/ProtocolMonitor.cpp @@ -14,6 +14,14 @@ */ #include "ProtocolMonitor.h" #include "ILog.h" +static void PrintHexadecimalData(const void *buf, const size_t &bufLength, const char *log) +{ + printf("%s { 0x%02X", log, *(unsigned char *)buf); + for (size_t i = 1; i < bufLength; i++) { + printf(", 0x%02X", *((unsigned char *)buf + i)); + } + printf(" }\n"); +} std::shared_ptr &ProtocolMonitor::GetInstance(std::shared_ptr *impl) { static auto instance = std::make_shared(); @@ -34,7 +42,19 @@ void ProtocolMonitor::MonitorWriteProtocolData(const short &head, const unsigned } void ProtocolMonitorTest::Init(std::shared_ptr &test) { - EXPECT_CALL(*test.get(), MonitorWriteProtocolData(_, _, _, _, _)).WillRepeatedly(DoAll(Return())); + auto printfParam = [=](const short &head, + const unsigned int &serialNumber, + const short &command, + const void *data, + const short &packetLength) { + LogInfo("MonitorWriteProtocolData called.\n"); + PrintHexadecimalData(&head, sizeof(head), "MonitorWriteProtocolData(head):"); + PrintHexadecimalData(&serialNumber, sizeof(serialNumber), "MonitorWriteProtocolData(serialNumber):"); + PrintHexadecimalData(&command, sizeof(command), "MonitorWriteProtocolData(command):"); + PrintHexadecimalData(&packetLength, sizeof(packetLength), "MonitorWriteProtocolData(packetLength):"); + }; + EXPECT_CALL(*test.get(), MonitorWriteProtocolData(_, _, _, _, _)) + .WillRepeatedly(DoAll(WithArgs<0, 1, 2, 3, 4>(Invoke(printfParam)), Return())); } void ProtocolMonitorTest::WriteDataOnce(std::shared_ptr &test, const short &head, const unsigned int &serialNumber, const short &command, const void *data, @@ -46,6 +66,10 @@ void ProtocolMonitorTest::WriteDataOnce(std::shared_ptr &te const void *data, const short &packetLength) { }; + PrintHexadecimalData(&head, sizeof(head), "WriteDataOnce(head):"); + PrintHexadecimalData(&serialNumber, sizeof(serialNumber), "WriteDataOnce(serialNumber):"); + PrintHexadecimalData(&command, sizeof(command), "WriteDataOnce(command):"); + PrintHexadecimalData(&packetLength, sizeof(packetLength), "WriteDataOnce(packetLength):"); EXPECT_CALL(*test.get(), MonitorWriteProtocolData(head, serialNumber, command, _, packetLength)) .Times(1) .WillOnce(DoAll(WithArgs<0, 1, 2, 3, 4>(Invoke(printfParam)), Return())); diff --git a/utils/McuProtocol/src/McuProtocol.cpp b/utils/McuProtocol/src/McuProtocol.cpp index e12fa320..48951229 100644 --- a/utils/McuProtocol/src/McuProtocol.cpp +++ b/utils/McuProtocol/src/McuProtocol.cpp @@ -194,8 +194,8 @@ void McuProtocol::ReplyOtherSideSendGetIntervalStart(const ReplyResult &result, SetTime interval(hour, min, second); std::shared_ptr param = std::make_shared>(PROTOCOL_COMMAND::REPLY_OTHER_SIDE_ASK_GET_INTERVAL_START, interval); - std::shared_ptr handle = ProtocolHandle::CreateProtocolData(param); param->mSerialNumber = serialNumber; + std::shared_ptr handle = ProtocolHandle::CreateProtocolData(param); WriteProtocolData( handle->GetProtocolDataBuff(), handle->GetProtocolDataLength(), NULL_CONTEXT, handle->GetSerialNumber()); } @@ -208,8 +208,8 @@ void McuProtocol::ReplyOtherSideSendGetDateTime(const ReplyResult &result, const SetDateTime dateTime(year, mon, day, hour, min, second); std::shared_ptr param = std::make_shared>(PROTOCOL_COMMAND::REPLY_OTHER_SIDE_ASK_GET_DATE_TIME, dateTime); - std::shared_ptr handle = ProtocolHandle::CreateProtocolData(param); param->mSerialNumber = serialNumber; + std::shared_ptr handle = ProtocolHandle::CreateProtocolData(param); WriteProtocolData( handle->GetProtocolDataBuff(), handle->GetProtocolDataLength(), NULL_CONTEXT, handle->GetSerialNumber()); } diff --git a/utils/McuProtocol/src/ProtocolHandle.cpp b/utils/McuProtocol/src/ProtocolHandle.cpp index 7c7cf66a..78b5780a 100644 --- a/utils/McuProtocol/src/ProtocolHandle.cpp +++ b/utils/McuProtocol/src/ProtocolHandle.cpp @@ -68,6 +68,12 @@ ProtocolHandle::ProtocolHandle(const void *data, const size_t &length) std::bind(&ProtocolHandle::AnalyzeOtherSideSendIpcMissionPacket, this, _1); mAnalyzePacketFunc[OTHER_SIDE_ASK_SEND_HEART_BEAT] = std::bind(&ProtocolHandle::AnalyzeOtherSideSendHeartBeatPacket, this, _1); + mAnalyzePacketFunc[OTHER_SIDE_ASK_GET_INTERVAL_START] = + std::bind(&ProtocolHandle::AnalyzeOtherSideSendGetIntervalStart, this, _1); + mAnalyzePacketFunc[OTHER_SIDE_ASK_GET_DATE_TIME] = + std::bind(&ProtocolHandle::AnalyzeOtherSideSendGetDataTime, this, _1); + mAnalyzePacketFunc[OTHER_SIDE_ASK_GET_PIR_SENSITIVITY] = + std::bind(&ProtocolHandle::AnalyzeOtherSideSendGetPirSensitivity, this, _1); } ProtocolHandle::~ProtocolHandle() { @@ -110,6 +116,7 @@ void ProtocolHandle::MallocPacketDataBuff(const void *data, const size_t dataLen // packet.mCheckCode = BigEndianConversion(packet.mCheckCode); memcpy(mProtocolData + packetLength - CHECK_CODE_LENGTH, &packet.mCheckCode, CHECK_CODE_LENGTH); mProtocolDataLength = packetLength; + ProtocolHandle::PrintHexadecimalData(mProtocolData, mProtocolDataLength, "Make protocol packet:"); } void ProtocolHandle::MakeProtocolPacket(const std::shared_ptr ¶m) {