From 9ead6413c66bb55bcac56aac421942faa44bbf80 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 20 六月 2025 16:57:19 +0800
Subject: [PATCH] 1.整理优化代码；
---
SourceCode/Bond/Servo/CEFEM.cpp | 1 -
SourceCode/Bond/Servo/CLoadPort.cpp | 47 -----------------------------------------------
2 files changed, 0 insertions(+), 48 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEFEM.cpp b/SourceCode/Bond/Servo/CEFEM.cpp
index 645251f..201f8b5 100644
--- a/SourceCode/Bond/Servo/CEFEM.cpp
+++ b/SourceCode/Bond/Servo/CEFEM.cpp
@@ -728,7 +728,6 @@
CJobDataS* pJobDataS = ((CGlass*)m_pActiveContext)->getJobDataS();
if (pJobDataS != nullptr) {
pJobDataS->serialize(szBuffer, 1024);
- pJobDataS->serialize(szBuffer, 1024);
ack = (short)JobDataRequestAck::OK;
}
}
diff --git a/SourceCode/Bond/Servo/CLoadPort.cpp b/SourceCode/Bond/Servo/CLoadPort.cpp
index 54c0d85..0ba62ba 100644
--- a/SourceCode/Bond/Servo/CLoadPort.cpp
+++ b/SourceCode/Bond/Servo/CLoadPort.cpp
@@ -348,53 +348,6 @@
}
}
}
-
- /*
-
- {
- // Fetched Out Job Report #1~15
- char szBuffer[256];
- CEqReadStep* pStep = new CEqReadStep(0x5c31 + 18 * m_nIndex, 18 * 2,
- [&](void* pFrom, int code, const char* pszData, size_t size) -> int {
- if (code == ROK && pszData != nullptr && size > 0) {
- int port = (int)(__int64)((CEqReadStep*)pFrom)->getProp("Port");
- if (port > 0) {
- decodeFetchedOutJobReport((CStep*)pFrom, port, pszData, size);
- }
- }
- return -1;
- });
- sprintf_s(szBuffer, "%s%d", STEP_EQ_FETCHED_OUT_JOBn, m_nIndex + 1);
- pStep->setName(szBuffer);
- pStep->setProp("Port", (void*)(__int64)(m_nIndex + 1));
- pStep->setWriteSignalDev(0x023 + m_nIndex);
- if (addStep(STEP_ID_FETCHED_OUT_JOB_REPORT1 + m_nIndex, pStep) != 0) {
- delete pStep;
- }
- }
-
- {
- // Store Job Report #1~15
- char szBuffer[256];
- CEqReadStep* pStep = new CEqReadStep(0x5b23 + 18 * m_nIndex, 18 * 2,
- [&](void* pFrom, int code, const char* pszData, size_t size) -> int {
- if (code == ROK && pszData != nullptr && size > 0) {
- int port = (int)(__int64)((CEqReadStep*)pFrom)->getProp("Port");
- if (port > 0) {
- decodeStoredJobReport((CStep*)pFrom, port, pszData, size);
- }
- }
- return -1;
- });
- sprintf_s(szBuffer, "%s%d", STEP_EQ_STORED_JOBn, m_nIndex + 1);
- pStep->setName(szBuffer);
- pStep->setProp("Port", (void*)(__int64)(m_nIndex + 1));
- pStep->setWriteSignalDev(0x014 + m_nIndex);
- if (addStep(STEP_ID_STORE_JOB_REPORT1 + m_nIndex, pStep) != 0) {
- delete pStep;
- }
- }
- */
}
void CLoadPort::onTimer(UINT nTimerid)
--
Gitblit v1.9.3