From ae6ef5e9343aba44b7547ecc4afab935ebdf4806 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 19 六月 2025 09:13:09 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CLoadPort.cpp | 78 ++++++++++++++++++++++++++------------
1 files changed, 53 insertions(+), 25 deletions(-)
diff --git a/SourceCode/Bond/Servo/CLoadPort.cpp b/SourceCode/Bond/Servo/CLoadPort.cpp
index bafeca1..81361bc 100644
--- a/SourceCode/Bond/Servo/CLoadPort.cpp
+++ b/SourceCode/Bond/Servo/CLoadPort.cpp
@@ -57,30 +57,12 @@
// 必须要实现的虚函数，在此初始化Slot信息
void CLoadPort::initSlots()
{
- m_slot[0].enable();
- m_slot[0].setPosition(m_nID);
- m_slot[0].setNo(1);
- m_slot[0].setName("Slot 1");
- m_slot[1].enable();
- m_slot[1].setPosition(m_nID);
- m_slot[1].setNo(2);
- m_slot[1].setName("Slot 2");
- m_slot[2].setPosition(m_nID);
- m_slot[2].enable();
- m_slot[2].setNo(3);
- m_slot[2].setName("Slot 3");
- m_slot[3].setPosition(m_nID);
- m_slot[3].enable();
- m_slot[3].setNo(4);
- m_slot[3].setName("Slot 4");
- m_slot[4].setPosition(m_nID);
- m_slot[4].enable();
- m_slot[4].setNo(5);
- m_slot[4].setName("Slot 5");
- m_slot[5].setPosition(m_nID);
- m_slot[5].enable();
- m_slot[5].setNo(6);
- m_slot[5].setName("Slot 6");
+ for (int i = 0; i < SLOT_MAX; i++) {
+ m_slot[i].enable();
+ m_slot[i].setPosition(m_nID);
+ m_slot[i].setNo(i + 1);
+ m_slot[i].setName((std::string("Slot") + std::to_string(i+1)).c_str());
+ }
}
void CLoadPort::initSteps()
@@ -363,6 +345,50 @@
if (addStep(addr[i][m_nIndex], pStep) != 0) {
delete pStep;
}
+ }
+ }
+
+ {
+ // 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;
}
}
}
@@ -838,6 +864,8 @@
void CLoadPort::onReceiveLBData(const char* pszData, size_t size)
{
+ __super::onReceiveLBData(pszData, size);
+
static int type[] = { STEP_ID_PORT1_TYPE_CHANGE, STEP_ID_PORT2_TYPE_CHANGE,
STEP_ID_PORT3_TYPE_CHANGE, STEP_ID_PORT4_TYPE_CHANGE };
static int mode[] = { STEP_ID_PORT1_MODE_CHANGE, STEP_ID_PORT2_MODE_CHANGE,
@@ -1128,7 +1156,7 @@
char szBuffer[64];
int suffix = startSuffix;
- for (int i = 0; i < SLOT_MAX; i++) {
+ for (int i = 0; i < 1; i++) {
if (!m_slot[i].isEnable()) continue;
CJobDataB jb;
--
Gitblit v1.9.3