From f5d3efdcec2d59e4adf6a3ae534082023e2df345 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 04 九月 2025 15:51:25 +0800
Subject: [PATCH] 1. 配方列表中添加设备配方参数 2. 测试权限功能
---
SourceCode/Bond/Servo/CRobotTask.cpp | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/Servo/CRobotTask.cpp b/SourceCode/Bond/Servo/CRobotTask.cpp
index e67d6e7..1c9f61d 100644
--- a/SourceCode/Bond/Servo/CRobotTask.cpp
+++ b/SourceCode/Bond/Servo/CRobotTask.cpp
@@ -286,9 +286,25 @@
});
}
+ void CRobotTask::resend()
+ {
+ // 重新下发命令，无非是下发取料或下发放料的命令，根据当前状态来
+ if (ROBOT_TASK_STATE::Picking == m_state || ROBOT_TASK_STATE::Picked == m_state) {
+ pick();
+ }
+ else if (ROBOT_TASK_STATE::Placing == m_state) {
+ place();
+ }
+ }
+
void CRobotTask::completed()
{
m_state = ROBOT_TASK_STATE::Completed;
+ }
+
+ void CRobotTask::restored()
+ {
+ m_state = ROBOT_TASK_STATE::Restored;
}
void CRobotTask::error()
@@ -354,6 +370,9 @@
case EQ_ID_LOADPORT2:
case EQ_ID_LOADPORT3:
case EQ_ID_LOADPORT4:
+ tarPos = srcPos;
+ tarSlot = srcSlot;
+ break;
case EQ_ID_ARM_TRAY1:
case EQ_ID_ARM_TRAY2:
case EQ_ID_ALIGNER:
@@ -363,25 +382,25 @@
break;
case EQ_ID_Bonder1:
if (1 <= srcSlot && srcSlot <= 2) {
- tarPos = 9 + srcSlot;
+ tarPos = 9 + srcSlot - 1;
tarSlot = 1;
}
break;
case EQ_ID_Bonder2:
if (1 <= srcSlot && srcSlot <= 2) {
- tarPos = 11 + srcSlot;
+ tarPos = 11 + srcSlot - 1;
tarSlot = 1;
}
break;
case EQ_ID_VACUUMBAKE:
if (1 <= srcSlot && srcSlot <= 2) {
- tarPos = 13 + srcSlot;
+ tarPos = 13 + srcSlot - 1;
tarSlot = 1;
}
break;
case EQ_ID_BAKE_COOLING:
if (1 <= srcSlot && srcSlot <= 4) {
- tarPos = 15 + srcSlot;
+ tarPos = 15 + srcSlot - 1;
tarSlot = 1;
}
break;
--
Gitblit v1.9.3