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/BondEq/CProjectPageComponents.cpp | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/SourceCode/Bond/BondEq/CProjectPageComponents.cpp b/SourceCode/Bond/BondEq/CProjectPageComponents.cpp
index 9c4032c..e6eb9f5 100644
--- a/SourceCode/Bond/BondEq/CProjectPageComponents.cpp
+++ b/SourceCode/Bond/BondEq/CProjectPageComponents.cpp
@@ -6,6 +6,7 @@
#include "CProjectPageComponents.h"
#include "afxdialogex.h"
#include "Alarm.h"
+#include "AlarmMonitor.h"
// CProjectPageComponents 瀵硅瘽妗�
@@ -13,7 +14,7 @@
IMPLEMENT_DYNAMIC(CProjectPageComponents, CDialogEx)
CProjectPageComponents::CProjectPageComponents(CWnd* pParent /*=nullptr*/)
- : CDialogEx(IDD_PROJECT_PAGE_COMPENTS, pParent)
+ : CDialogEx(IDD_PROJECT_PAGE_COMPONENTS, pParent)
{
m_crBkgnd = PROPAGE_BACKGROUND_COLOR;
m_hbrBkgnd = nullptr;
@@ -72,18 +73,16 @@
}
}
}
- else if (RX_CODE_ALARM_EVENT == code) {
- CComponent* pComponent = nullptr;
- CAlarm* pAlarm = nullptr;
- pAny->getObject("obj", (IRxObject*&)pAlarm);
+ else if (RX_CODE_ALARM_ON == code
+ || RX_CODE_ALARM_OFF == code) {
+ CAlarmMonitor* pComponent = nullptr;
pAny->getPtrValue("ptr", (void*&)pComponent);
ASSERT(pComponent);
- ASSERT(pAlarm);
HTREEITEM hItem = getTreeItem(pComponent);
if (hItem != nullptr) {
- if(pAlarm->getStatus() == 1)
+ if (pComponent->isAlarming())
m_treeComponents.ShowItemBadgeDotMode(hItem);
- else if (pAlarm->getStatus() == 2)
+ else
m_treeComponents.HideItemBadge(hItem);
}
}
--
Gitblit v1.9.3