From db9d120efcfe76bb73df089dca8986eca9ee0e6f Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期三, 10 十二月 2025 10:11:37 +0800
Subject: [PATCH] 1.扫码上报，但未在配置中设置变量；
---
SourceCode/Bond/Servo/CLoadPort.cpp | 39 +++++++++++++++++++++++++++------------
1 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/SourceCode/Bond/Servo/CLoadPort.cpp b/SourceCode/Bond/Servo/CLoadPort.cpp
index 9fe24b5..ebd1690 100644
--- a/SourceCode/Bond/Servo/CLoadPort.cpp
+++ b/SourceCode/Bond/Servo/CLoadPort.cpp
@@ -44,7 +44,7 @@
void CLoadPort::initPins()
{
// 加入Pin初始化代码
- LOGI("<CLoadPort>initPins");
+ LOGD("<CLoadPort>initPins");
addPin(SERVO::PinType::INPUT, _T("In"));
addPin(SERVO::PinType::OUTPUT, _T("Out"));
}
@@ -353,7 +353,7 @@
// 从配置读出的enable，初始化时写给efem
static int i_enable[4] = { 0 };
- if ((++i_enable[m_nIndex]) == 10 + m_nIndex) {
+ if ((++i_enable[m_nIndex]) == 20 + m_nIndex) {
eablePort(m_bEnable, [&](int code) -> int {
LOGI("<LoadPort-%d>eablePort:code=%d", m_nIndex, code);
return 0;
@@ -404,7 +404,6 @@
m_portStatusReport.serialize(ar);
}
else {
- int temp;
ar >> m_nIndex;
m_portStatusReport.serialize(ar);
}
@@ -490,9 +489,25 @@
return (m_nIndex + 1) * 1000 + m_nNextCassetteSequenceNo;
}
+ int CLoadPort::getPortCassetteSnSeed()
+ {
+ return m_nNextCassetteSequenceNo;
+ }
+
+ void CLoadPort::setPortCassetteSnSeed(int seed)
+ {
+ m_nNextCassetteSequenceNo = seed;
+ if (m_nNextCassetteSequenceNo >= 1000) {
+ m_nNextCassetteSequenceNo = 0;
+ }
+ }
+
void CLoadPort::setIndex(unsigned int index)
{
m_nIndex = index;
+
+ std::string id = "Port" + std::to_string(index + 1);
+ m_portStatusReport.setCassetteId(id.c_str());
}
unsigned int CLoadPort::getIndex()
@@ -983,7 +998,7 @@
LOGI("<CLoadPort-%d>设置Port type成功.", m_nIndex);
}
else {
- LOGI("<CLoadPort-%d>设置Port type失败，code:%d", m_nIndex, code);
+ LOGE("<CLoadPort-%d>设置Port type失败，code:%d", m_nIndex, code);
}
if (onWritedBlock != nullptr) {
return onWritedBlock(code);
@@ -1013,7 +1028,7 @@
LOGI("<CLoadPort-%d>%s Port成功.", m_nIndex, bEnable ? _T("启用") : _T("禁用"));
}
else {
- LOGI("<CLoadPort-%d>%s Port失败，code:%d", m_nIndex, bEnable ? _T("启用") : _T("禁用"), code);
+ LOGE("<CLoadPort-%d>%s Port失败，code:%d", m_nIndex, bEnable ? _T("启用") : _T("禁用"), code);
}
if (onWritedBlock != nullptr) {
return onWritedBlock(code);
@@ -1042,7 +1057,7 @@
LOGI("<CLoadPort-%d>设置Port mode成功.", m_nIndex);
}
else {
- LOGI("<CLoadPort-%d>设置Port mode失败，code:%d", m_nIndex, code);
+ LOGE("<CLoadPort-%d>设置Port mode失败，code:%d", m_nIndex, code);
}
if (onWritedBlock != nullptr) {
return onWritedBlock(code);
@@ -1071,7 +1086,7 @@
LOGI("<CLoadPort-%d>设置Cassette Type成功.", m_nIndex);
}
else {
- LOGI("<CLoadPort-%d>设置Cassette Type失败，code:%d", m_nIndex, code);
+ LOGE("<CLoadPort-%d>设置Cassette Type失败，code:%d", m_nIndex, code);
}
if (onWritedBlock != nullptr) {
return onWritedBlock(code);
@@ -1100,7 +1115,7 @@
LOGI("<CLoadPort-%d>设置Transfer mode成功.", m_nIndex + 1);
}
else {
- LOGI("<CLoadPort-%d>设置Transfer mode失败，code:%d", m_nIndex + 1, code);
+ LOGE("<CLoadPort-%d>设置Transfer mode失败，code:%d", m_nIndex + 1, code);
}
if (onWritedBlock != nullptr) {
return onWritedBlock(code);
@@ -1129,7 +1144,7 @@
LOGI("<CLoadPort-%d>%s Auto Change成功.", m_nIndex, bEnable ? _T("启用") : _T("禁用"));
}
else {
- LOGI("<CLoadPort-%d>%s Auto Change失败，code:%d", m_nIndex, bEnable ? _T("启用") : _T("禁用"), code);
+ LOGE("<CLoadPort-%d>%s Auto Change失败，code:%d", m_nIndex, bEnable ? _T("启用") : _T("禁用"), code);
}
if (onWritedBlock != nullptr) {
return onWritedBlock(code);
@@ -1209,7 +1224,7 @@
CGlass* pGlass = theApp.m_model.m_glassPool.allocaGlass();
pGlass->setOriginPort(m_nIndex, i);
- pGlass->addPath(m_nID, 0);
+ pGlass->addPath(m_nID, 0, i + 1);
pGlass->processEnd(m_nID, 0);
pGlass->setID(szBuffer);
pGlass->setType(type);
@@ -1249,7 +1264,7 @@
CGlass* pGlass = theApp.m_model.m_glassPool.allocaGlass();
pGlass->setOriginPort(m_nIndex, i);
pGlass->setScheduledForProcessing(i % 2 == 1);
- pGlass->addPath(m_nID, 0);
+ pGlass->addPath(m_nID, 0, i + 1);
pGlass->processEnd(m_nID, 0);
pGlass->setID(szBuffer);
pGlass->setType(m_cassetteType);
@@ -1289,7 +1304,7 @@
CGlass* pGlass = theApp.m_model.m_glassPool.allocaGlass();
pGlass->setOriginPort(m_nIndex, nSlotIndex);
- pGlass->addPath(m_nID, 0);
+ pGlass->addPath(m_nID, 0, slot.nSlotID);
pGlass->processEnd(m_nID, 0);
pGlass->setID(szBuffer);
pGlass->setType(static_cast<SERVO::MaterialsType>(config.nMaterialType));
--
Gitblit v1.9.3