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 | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/Servo/CPortStatusReport.cpp b/SourceCode/Bond/Servo/CPortStatusReport.cpp
index 03864e2..0d6fa95 100644
--- a/SourceCode/Bond/Servo/CPortStatusReport.cpp
+++ b/SourceCode/Bond/Servo/CPortStatusReport.cpp
@@ -51,6 +51,11 @@
return m_nPortStatus;
}
+ void CPortStatusReport::setPortStatus(short status)
+ {
+ m_nPortStatus = status;
+ }
+
short CPortStatusReport::getCassetteSequenceNo()
{
return m_nCassetteSequenceNo;
@@ -134,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);
@@ -146,7 +148,7 @@
memcpy(&m_nCassetteStatus, &pszBuffer[index], sizeof(short));
index += sizeof(short);
- return 15 * 2;
+ return 32 * 2;
}
void CPortStatusReport::getAttributeVector(CAttributeVector& attrubutes, int beginWeight)
@@ -237,6 +239,21 @@
return false;
}
+ short CPortStatusReport::getJobExistenceSlot()
+ {
+ return m_nJobExistenceSlot[0];
+ }
+
+ void CPortStatusReport::setJobExistenceSlot(short map)
+ {
+ 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