From 829fe6c6bc33d53fda9c31fd45a37e1df87befff Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 30 一月 2026 11:16:24 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CPageGraph1.cpp | 60 +++++++++++++++---------------------------------------------
1 files changed, 15 insertions(+), 45 deletions(-)
diff --git a/SourceCode/Bond/Servo/CPageGraph1.cpp b/SourceCode/Bond/Servo/CPageGraph1.cpp
index 60f2ac4..2ae613e 100644
--- a/SourceCode/Bond/Servo/CPageGraph1.cpp
+++ b/SourceCode/Bond/Servo/CPageGraph1.cpp
@@ -180,7 +180,7 @@
{
CDialogEx::OnInitDialog();
InitRxWindows();
- SetTimer(TIMER_ID_DEVICE_STATUS, 3000, nullptr);
+ SetTimer(TIMER_ID_DEVICE_STATUS, 800, nullptr);
SetTimer(TIMER_ID_ROBOT_STATUS, 1000, nullptr); // 姣� 1000ms 鏇存柊涓�娆＄姸鎬�
// 鍥剧ず
@@ -196,73 +196,73 @@
// Bonder
m_pGraph->AddIndicateBox(INDICATE_BONDER1, 220, 172, 48, RGB(22, 22, 22),
RGB(255, 127, 39), EQ_BOX_OFFLINE);
- m_pGraph->SetBoxText(INDICATE_BONDER1, "10", "Bonder 1");
+ m_pGraph->SetBoxText(INDICATE_BONDER1, "", "Bonder 1");
m_pGraph->AddIndicateBox(INDICATE_BONDER2, 220, 516, 48, RGB(22, 22, 22),
RGB(255, 127, 39), EQ_BOX_OFFLINE);
- m_pGraph->SetBoxText(INDICATE_BONDER2, "11", "Bonder 2");
+ m_pGraph->SetBoxText(INDICATE_BONDER2, "", "Bonder 2");
// 缈昏浆
m_pGraph->AddIndicateBox(INDICATE_FLIPER, 338, 172, 48, RGB(22, 22, 22),
RGB(255, 127, 39), EQ_BOX_OFFLINE);
- m_pGraph->SetBoxText(INDICATE_FLIPER, "8", "Fliper");
+ m_pGraph->SetBoxText(INDICATE_FLIPER, "", "Fliper");
// 瀵逛綅
m_pGraph->AddIndicateBox(INDICATE_ALIGNER, 428, 172, 48, RGB(22, 22, 22),
RGB(255, 127, 39), EQ_BOX_OFFLINE);
- m_pGraph->SetBoxText(INDICATE_ALIGNER, "7", "Aligner");
+ m_pGraph->SetBoxText(INDICATE_ALIGNER, "", "Aligner");
// Load port 4
m_pGraph->AddIndicateBox(INDICATE_LPORT4, 518, 172, 48, RGB(22, 22, 22),
RGB(255, 127, 39), EQ_BOX_OFFLINE);
- m_pGraph->SetBoxText(INDICATE_LPORT4, "4", "LPort4");
+ m_pGraph->SetBoxText(INDICATE_LPORT4, "", "LPort4");
// Load port 3
m_pGraph->AddIndicateBox(INDICATE_LPORT3, 606, 172, 48, RGB(22, 22, 22),
RGB(255, 127, 39), EQ_BOX_OFFLINE);
- m_pGraph->SetBoxText(INDICATE_LPORT3, "3", "LPort3");
+ m_pGraph->SetBoxText(INDICATE_LPORT3, "", "LPort3");
// Load port 2
m_pGraph->AddIndicateBox(INDICATE_LPORT2, 690, 172, 48, RGB(22, 22, 22),
RGB(255, 127, 39), EQ_BOX_OFFLINE);
- m_pGraph->SetBoxText(INDICATE_LPORT2, "2", "LPort2");
+ m_pGraph->SetBoxText(INDICATE_LPORT2, "", "LPort2");
// Load port 1
m_pGraph->AddIndicateBox(INDICATE_LPORT1, 774, 172, 48, RGB(22, 22, 22),
RGB(255, 127, 39), EQ_BOX_OFFLINE);
- m_pGraph->SetBoxText(INDICATE_LPORT1, "1", "LPort1");
+ m_pGraph->SetBoxText(INDICATE_LPORT1, "", "LPort1");
// Robot
m_pGraph->AddIndicateBox(INDICATE_ROBOT_ARM1, 190, 294, 48, RGB(22, 22, 22),
RGB(255, 127, 39), EQ_BOX_OFFLINE);
- m_pGraph->SetBoxText(INDICATE_ROBOT_ARM1, "5", "Robot");
+ m_pGraph->SetBoxText(INDICATE_ROBOT_ARM1, "", "Robot");
m_pGraph->AddIndicateBox(INDICATE_ROBOT_ARM2, 243, 294, 48, RGB(22, 22, 22),
RGB(255, 127, 39), EQ_BOX_OFFLINE);
- m_pGraph->SetBoxText(INDICATE_ROBOT_ARM2, "6", "Robot");
+ m_pGraph->SetBoxText(INDICATE_ROBOT_ARM2, "", "Robot");
// Vacuum bake
m_pGraph->AddIndicateBox(INDICATE_VACUUM_BAKE, 396, 516, 48, RGB(22, 22, 22),
RGB(255, 127, 39), EQ_BOX_OFFLINE);
- m_pGraph->SetBoxText(INDICATE_VACUUM_BAKE, "9", "Vacuum bake");
+ m_pGraph->SetBoxText(INDICATE_VACUUM_BAKE, "", "Vacuum bake");
// Bake cooling
m_pGraph->AddIndicateBox(INDICATE_BAKE_COOLING, 566, 516, 48, RGB(22, 22, 22),
RGB(255, 127, 39), EQ_BOX_OFFLINE);
- m_pGraph->SetBoxText(INDICATE_BAKE_COOLING, "12", "Bake cooling");
+ m_pGraph->SetBoxText(INDICATE_BAKE_COOLING, "", "Bake cooling");
// 绮惧害妫�
m_pGraph->AddIndicateBox(INDICATE_MEASUREMENT, 737, 516, 48, RGB(22, 22, 22),
RGB(255, 127, 39), EQ_BOX_OFFLINE);
- m_pGraph->SetBoxText(INDICATE_MEASUREMENT, "13", "Measurement");
+ m_pGraph->SetBoxText(INDICATE_MEASUREMENT, "", "Measurement");
return TRUE; // return TRUE unless you set the focus to a control
@@ -560,37 +560,7 @@
// 绉诲姩鍒版寚瀹氫綅缃� (娴嬭瘯浣跨敤)
if (pGraphNmhdr->dwData == INDICATE_LPORT1) {
- StartRobotMoveToPosition(SERVO::ROBOT_POSITION::Port1);
- }
- else if (pGraphNmhdr->dwData == INDICATE_LPORT2) {
- StartRobotMoveToPosition(SERVO::ROBOT_POSITION::Port2);
- }
- else if (pGraphNmhdr->dwData == INDICATE_LPORT3) {
- StartRobotMoveToPosition(SERVO::ROBOT_POSITION::Port3);
- }
- else if (pGraphNmhdr->dwData == INDICATE_LPORT4) {
- StartRobotMoveToPosition(SERVO::ROBOT_POSITION::Port4);
- }
- else if (pGraphNmhdr->dwData == INDICATE_ALIGNER) {
- StartRobotMoveToPosition(SERVO::ROBOT_POSITION::Aligner);
- }
- else if (pGraphNmhdr->dwData == INDICATE_FLIPER) {
- StartRobotMoveToPosition(SERVO::ROBOT_POSITION::Fliper);
- }
- else if (pGraphNmhdr->dwData == INDICATE_BONDER1) {
- StartRobotMoveToPosition(SERVO::ROBOT_POSITION::Bonder1);
- }
- else if (pGraphNmhdr->dwData == INDICATE_BONDER2) {
- StartRobotMoveToPosition(SERVO::ROBOT_POSITION::Bonder2);
- }
- else if (pGraphNmhdr->dwData == INDICATE_VACUUM_BAKE) {
- StartRobotMoveToPosition(SERVO::ROBOT_POSITION::Bake);
- }
- else if (pGraphNmhdr->dwData == INDICATE_BAKE_COOLING) {
- StartRobotMoveToPosition(SERVO::ROBOT_POSITION::Cooling);
- }
- else if (pGraphNmhdr->dwData == INDICATE_MEASUREMENT) {
- StartRobotMoveToPosition(SERVO::ROBOT_POSITION::Measurement);
+
}
*pResult = 0;
--
Gitblit v1.9.3