From 331f447bb0e5eccf0b3161ab287c1372b14b8480 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 08 八月 2025 11:53:58 +0800
Subject: [PATCH] 1.增加千传计数,保存计数，重启软件时恢复； 2.千传测试模式，打印相关日志，方便后期提取，用于统计； 3.千传模式时烘烤两腔体都要进入； 4.千传模式时，Fliper到Bonder修改为用手臂2取料； 5.修复千传模式不计运行时的问题； 6.千传模式，最后收料强制放入第一层； 6.修复Buf， 当任务未生成（在符合条件后仍有1秒间隙）而机器单元发送FetchOutJob时，数据检验失败的问题，增加Sleep, 缩小间隙；
---
SourceCode/Bond/Servo/CArm.cpp | 47 ++++++++++++++++++++++++++++++-----------------
1 files changed, 30 insertions(+), 17 deletions(-)
diff --git a/SourceCode/Bond/Servo/CArm.cpp b/SourceCode/Bond/Servo/CArm.cpp
index cf6320e..c257753 100644
--- a/SourceCode/Bond/Servo/CArm.cpp
+++ b/SourceCode/Bond/Servo/CArm.cpp
@@ -41,10 +41,6 @@
m_slot[0].setPosition(m_nID);
m_slot[0].setNo(1);
m_slot[0].setName("Slot 1(Temp)");
- m_slot[1].enable();
- m_slot[1].setPosition(m_nID);
- m_slot[1].setNo(2);
- m_slot[1].setName("Slot 2(Temp)");
}
void CArm::onTimer(UINT nTimerid)
@@ -70,22 +66,14 @@
int CArm::tempStore(CGlass* pGlass)
{
// 原：保证列表中只存储一个物料
- // 修改为：先清空之前的，再添加当前pGlass, 如果pGlass有buddy，也要加入列表中
+ // 修改为：先清空之前的，再添加当前pGlass
Lock();
CGlass* pPreviousGlass;
pPreviousGlass = (CGlass*)m_slot[0].getContext();
if (pPreviousGlass != nullptr) {
pPreviousGlass->release();
}
- pPreviousGlass = (CGlass*)m_slot[1].getContext();
- if (pPreviousGlass != nullptr) {
- pPreviousGlass->release();
- }
-
m_slot[0].setContext(pGlass);
- if (pGlass->getBuddy() != nullptr) {
- m_slot[1].setContext(pGlass->getBuddy());
- }
Unlock();
if (m_listener.onDataChanged != nullptr) {
@@ -106,10 +94,6 @@
pGlass = pPreviousGlass;
pGlass->addRef();
m_slot[0].setContext(nullptr);
- CGlass* pBuddy = pGlass->getBuddy();
- if (pBuddy != nullptr) {
- m_slot[1].setContext(nullptr);
- }
Unlock();
if (m_listener.onDataChanged != nullptr) {
@@ -118,4 +102,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