From 4d9d8d22e3666076988c30afb4e7c6fe365c19aa Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期二, 06 一月 2026 18:53:04 +0800
Subject: [PATCH] 1.修复一个回复错误的问题；
---
SourceCode/Bond/Servo/HsmsAction.cpp | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 58 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/HsmsAction.cpp b/SourceCode/Bond/Servo/HsmsAction.cpp
index fb85224..1c0d71c 100644
--- a/SourceCode/Bond/Servo/HsmsAction.cpp
+++ b/SourceCode/Bond/Servo/HsmsAction.cpp
@@ -104,6 +104,63 @@
BOOL CHsmsAction::incrementAndCheckTimeout()
{
unsigned int nResponseTime = InterlockedIncrement(&m_nResponseTime);
- return nResponseTime >= m_nTimeout;
+ return nResponseTime >= m_nTimeout + 1;
+}
+
+int CHsmsAction::serialize(char* pszBuffer, int nBufferSize)
+{
+ int index = 0;
+ if (pszBuffer == nullptr) {
+ index += sizeof(int);
+ index += sizeof(m_nTimeout);
+ index += sizeof(int);
+ index += sizeof(BOOL);
+ index += m_pSendMessage->serialize(pszBuffer, nBufferSize);
+
+ return index;
+ }
+ else {
+ memcpy(&pszBuffer[index], &m_nAction, sizeof(int));
+ index += sizeof(int);
+
+ memcpy(&pszBuffer[index], &m_nTimeout, sizeof(int));
+ index += sizeof(int);
+
+ memcpy(&pszBuffer[index], &m_nResponseTime, sizeof(int));
+ index += sizeof(int);
+
+ memcpy(&pszBuffer[index], &m_bNeedWaitReply, sizeof(BOOL));
+ index += sizeof(BOOL);
+
+ index += m_pSendMessage->serialize(&pszBuffer[index], nBufferSize - index);
+
+ return index;
+ }
+}
+
+int CHsmsAction::unserialize(const char* pszBuffer, int nBufferSize)
+{
+ int index = 0;
+ if (index + sizeof(int) > nBufferSize) return -1;
+ memcpy(&m_nAction, &pszBuffer[index], sizeof(int));
+ index += sizeof(int);
+
+ if (index + sizeof(int) > nBufferSize) return -1;
+ memcpy(&m_nTimeout, &pszBuffer[index], sizeof(int));
+ index += sizeof(int);
+
+ if (index + sizeof(int) > nBufferSize) return -1;
+ memcpy(&m_nResponseTime, &pszBuffer[index], sizeof(int));
+ index += sizeof(int);
+
+ if (index + sizeof(BOOL) > nBufferSize) return -1;
+ memcpy(&m_bNeedWaitReply, &pszBuffer[index], sizeof(BOOL));
+ index += sizeof(BOOL);
+
+ HSMS_Create1Message(m_pSendMessage, 1, 1 | REPLY, 1, 1);
+ int nRet = m_pSendMessage->unserialize(&pszBuffer[index], nBufferSize - index);
+ if (nRet < 0) return nRet;
+
+ return index + nRet;
}
--
Gitblit v1.9.3