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/CEquipmentPage2.cpp | 56 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 30 insertions(+), 26 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipmentPage2.cpp b/SourceCode/Bond/Servo/CEquipmentPage2.cpp
index 0a09494..14b46ac 100644
--- a/SourceCode/Bond/Servo/CEquipmentPage2.cpp
+++ b/SourceCode/Bond/Servo/CEquipmentPage2.cpp
@@ -82,24 +82,7 @@
ASSERT(m_pEquipment);
- for (int i = 0; i < SLOT_MAX; i++) {
- SERVO::CSlot* pSlot = m_pEquipment->getSlot(i);
- if (pSlot != nullptr && pSlot->isEnable()) {
- int index = m_listCtrl.InsertItem(m_listCtrl.GetItemCount(), _T(""));
- m_listCtrl.SetItemData(index, (DWORD_PTR)pSlot);
- m_listCtrl.SetItemText(index, 1, std::to_string(pSlot->getNo()).c_str());
- m_listCtrl.SetItemText(index, 2, pSlot->getName().c_str());
-
- SERVO::CGlass* pGlass = (SERVO::CGlass*)pSlot->getContext();
- if (pGlass != nullptr) {
- m_listCtrl.SetItemText(index, 3, pGlass->getID().c_str());
- SERVO::CGlass* pBuddy = pGlass->getBuddy();
- if (pBuddy != nullptr) {
- m_listCtrl.SetItemText(index, 4, pBuddy->getID().c_str());
- }
- }
- }
- }
+ UpdateSlots();
return TRUE; // return TRUE unless you set the focus to a control
// 寮傚父: OCX 灞炴�ч〉搴旇繑鍥� FALSE
@@ -173,16 +156,37 @@
void CEquipmentPage2::OnBnClickedButtonRemove()
{
- /*
int index = GetSelectedItemIndex();
if (index >= 0) {
- SERVO::CGlass* pGlass = (SERVO::CGlass*)m_listCtrl.GetItemData(index);
- ASSERT(m_pEquipment);
- BOOL bRet = m_pEquipment->removeClass(pGlass);
- if (bRet) {
- pGlass->release();
- m_listCtrl.DeleteItem(index);
+ SERVO::CSlot* pSlot = (SERVO::CSlot*)m_listCtrl.GetItemData(index);
+ ASSERT(pSlot);
+ int bRet = m_pEquipment->removeGlass(pSlot->getNo());
+ if (bRet == 0) {
+ UpdateSlots();
}
}
- */
}
+
+void CEquipmentPage2::UpdateSlots()
+{
+ m_listCtrl.DeleteAllItems();
+ for (int i = 0; i < SLOT_MAX; i++) {
+ SERVO::CSlot* pSlot = m_pEquipment->getSlot(i);
+ if (pSlot != nullptr && pSlot->isEnable()) {
+ int index = m_listCtrl.InsertItem(m_listCtrl.GetItemCount(), _T(""));
+ m_listCtrl.SetItemData(index, (DWORD_PTR)pSlot);
+ m_listCtrl.SetItemText(index, 1, std::to_string(pSlot->getNo()).c_str());
+ m_listCtrl.SetItemText(index, 2, pSlot->getName().c_str());
+
+ SERVO::CGlass* pGlass = (SERVO::CGlass*)pSlot->getContext();
+ if (pGlass != nullptr) {
+ m_listCtrl.SetItemText(index, 3, pGlass->getID().c_str());
+ SERVO::CGlass* pBuddy = pGlass->getBuddy();
+ if (pBuddy != nullptr) {
+ m_listCtrl.SetItemText(index, 4, pBuddy->getID().c_str());
+ }
+ }
+ }
+ }
+}
+
--
Gitblit v1.9.3