From e8a27bb203fe2aff70390a5eca002d7438da9b0f Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期三, 22 十月 2025 14:24:34 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CPortStatusReport.cpp | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/CPortStatusReport.cpp b/SourceCode/Bond/Servo/CPortStatusReport.cpp
index 0a0453d..0d6fa95 100644
--- a/SourceCode/Bond/Servo/CPortStatusReport.cpp
+++ b/SourceCode/Bond/Servo/CPortStatusReport.cpp
@@ -139,9 +139,6 @@
memcpy(&m_nLoadingCassetteType, &pszBuffer[index], sizeof(short));
index += sizeof(short);
- memcpy(&m_nLoadingCassetteType, &pszBuffer[index], sizeof(short));
- index += sizeof(short);
-
memcpy(&m_nQTimeFlag, &pszBuffer[index], sizeof(short));
index += sizeof(short);
@@ -252,6 +249,11 @@
m_nJobExistenceSlot[0] = map;
}
+ void CPortStatusReport::setCassetteId(const char* pszId)
+ {
+ m_strCassetteID = pszId;
+ }
+
void CPortStatusReport::WriteString(CArchive& ar, std::string& string)
{
CString strTemp = string.c_str();
--
Gitblit v1.9.3