From a79fcf6a937e1bfe57014d2c99f1bb9f98bfa892 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期二, 10 二月 2026 10:20:17 +0800
Subject: [PATCH] 1.完善日志； 2.背景图表配置 3.更改EAP通讯端口和设备名；
---
SourceCode/Bond/Servo/CArm.cpp | 76 ++++++++++++++++++++++++++++++--------
1 files changed, 60 insertions(+), 16 deletions(-)
diff --git a/SourceCode/Bond/Servo/CArm.cpp b/SourceCode/Bond/Servo/CArm.cpp
index 77e43d3..7f76c49 100644
--- a/SourceCode/Bond/Servo/CArm.cpp
+++ b/SourceCode/Bond/Servo/CArm.cpp
@@ -37,7 +37,10 @@
// 必须要实现的虚函数，在此初始化Slot信息
void CArm::initSlots()
{
-
+ m_slot[0].enable();
+ m_slot[0].setPosition(m_nID);
+ m_slot[0].setNo(1);
+ m_slot[0].setName("Slot 1(Temp)");
}
void CArm::onTimer(UINT nTimerid)
@@ -63,17 +66,26 @@
int CArm::tempStore(CGlass* pGlass)
{
// 原：保证列表中只存储一个物料
- // 修改为：先清空之前的，再添加当前pGlass, 如果pGlass有buddy，也要加入列表中
+ // 修改为：先清空之前的，再添加当前pGlass
Lock();
- for (auto item : m_glassList) {
- item->release();
+ CGlass* pPreviousGlass;
+ pPreviousGlass = (CGlass*)m_slot[0].getContext();
+ if (pPreviousGlass != nullptr) {
+ LOGE("<CArm>tempStore, overwrite previous glass: %s (%d,%d)",
+ pPreviousGlass->getID().c_str(),
+ pPreviousGlass->getCassetteSequenceNo(),
+ pPreviousGlass->getJobSequenceNo());
+ pPreviousGlass->release();
}
- m_glassList.clear();
- addGlassToList(pGlass);
- if (pGlass->getBuddy() != nullptr) {
- addGlassToList(pGlass->getBuddy());
- }
+ m_slot[0].setContext(pGlass);
Unlock();
+
+ if (pGlass != nullptr) {
+ LOGI("<CArm>tempStore: GlassId:%s, Cassette:%d, Job:%d",
+ pGlass->getID().c_str(),
+ pGlass->getCassetteSequenceNo(),
+ pGlass->getJobSequenceNo());
+ }
if (m_listener.onDataChanged != nullptr) {
m_listener.onDataChanged(this, 0);
@@ -85,18 +97,21 @@
int CArm::tempFetchOut(OUT CGlass*& pGlass)
{
Lock();
- if (m_glassList.empty()) {
+ CGlass* pPreviousGlass = (CGlass*)m_slot[0].getContext();
+ if (pPreviousGlass == nullptr) {
Unlock();
+ LOGE("<CArm>tempFetchOut failed: arm slot empty.");
return -1;
}
-
- pGlass = m_glassList.front();
+ pGlass = pPreviousGlass;
pGlass->addRef();
- for (auto item : m_glassList) {
- item->release();
- }
- m_glassList.clear();
+ m_slot[0].setContext(nullptr);
Unlock();
+
+ LOGI("<CArm>tempFetchOut: GlassId:%s, Cassette:%d, Job:%d",
+ pGlass->getID().c_str(),
+ pGlass->getCassetteSequenceNo(),
+ pGlass->getJobSequenceNo());
if (m_listener.onDataChanged != nullptr) {
m_listener.onDataChanged(this, 0);
@@ -104,4 +119,33 @@
return 0;
}
+
+ int CArm::glassUpdateJobDataS(CJobDataS* pJobDataS)
+ {
+ ASSERT(pJobDataS);
+
+ Lock();
+ CGlass* pGlass = (CGlass*)m_slot[0].getContext();
+ if (pGlass == nullptr) {
+ Unlock();
+ LOGE("<CArm>glassUpdateJobDataS失败，找不到对应的Glass");
+ return -1;
+ }
+
+ CJobDataS* pSrcJs = pGlass->getJobDataS();
+ if (pSrcJs->getCassetteSequenceNo() != pJobDataS->getCassetteSequenceNo()
+ || pSrcJs->getJobSequenceNo() != pJobDataS->getJobSequenceNo()) {
+ Unlock();
+ LOGE("<CArm>glassUpdateJobDataS失败，CassetteNo不匹配([%d,%d] != [%d,%d])",
+ pSrcJs->getCassetteSequenceNo(),
+ pJobDataS->getCassetteSequenceNo(),
+ pSrcJs->getJobSequenceNo(),
+ pJobDataS->getJobSequenceNo());
+ return -2;
+ }
+
+ pGlass->updateJobDataS(pJobDataS);
+ Unlock();
+ return 0;
+ }
}
--
Gitblit v1.9.3