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/CServoUtilsTool.cpp |  104 +++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 86 insertions(+), 18 deletions(-)

diff --git a/SourceCode/Bond/Servo/CServoUtilsTool.cpp b/SourceCode/Bond/Servo/CServoUtilsTool.cpp
index 1bf444a..94bb8f7 100644
--- a/SourceCode/Bond/Servo/CServoUtilsTool.cpp
+++ b/SourceCode/Bond/Servo/CServoUtilsTool.cpp
@@ -1,9 +1,40 @@
-#include "stdafx.h"
+锘�#include "stdafx.h"
 #include "CServoUtilsTool.h"
 #include "Common.h"
 
 
 namespace SERVO {
+	static std::unordered_map<int, std::vector<std::string>> EQ_DATA_TYPES = {
+		{MID_Bonder1, {
+			"姘斿泭鍘嬪姏", "涓婅厰鍘嬪姏", "绠¢亾鐪熺┖瑙勫��", "鑵斾綋鐪熺┖瑙勫��",
+			"涓婅厰娓╁害1", "涓婅厰娓╁害2", "涓婅厰娓╁害3", "涓婅厰娓╁害4",
+			"涓婅厰娓╁害5", "涓婅厰娓╁害6", "涓嬭厰娓╁害1", "涓嬭厰娓╁害2",
+			"涓嬭厰娓╁害3", "涓嬭厰娓╁害4", "涓嬭厰娓╁害5", "涓嬭厰娓╁害6"
+		}},
+		{MID_Bonder2, {
+			"姘斿泭鍘嬪姏", "涓婅厰鍘嬪姏", "绠¢亾鐪熺┖瑙勫��", "鑵斾綋鐪熺┖瑙勫��",
+			"涓婅厰娓╁害1", "涓婅厰娓╁害2", "涓婅厰娓╁害3", "涓婅厰娓╁害4",
+			"涓婅厰娓╁害5", "涓婅厰娓╁害6", "涓嬭厰娓╁害1", "涓嬭厰娓╁害2",
+			"涓嬭厰娓╁害3", "涓嬭厰娓╁害4", "涓嬭厰娓╁害5", "涓嬭厰娓╁害6"
+		}},
+		{MID_VacuumBakeA, {
+			"鐪熺┖瑙勫��", "娓╂帶1", "娓╂帶2", "娓╂帶4",
+			"娓╂帶5", "娓╂帶6", "娓╂帶7"
+		}},
+		{MID_VacuumBakeB, {
+			"鐪熺┖瑙勫��", "娓╂帶1", "娓╂帶2", "娓╂帶4",
+			"娓╂帶5", "娓╂帶6", "娓╂帶7"
+		}},
+		{MID_BakeCoolingA, {
+			"鐑樼儰娓╂帶1", "鐑樼儰娓╂帶2", "鐑樼儰娓╂帶4", "鐑樼儰娓╂帶5",
+			"鐑樼儰娓╂帶6", "鐑樼儰娓╂帶7"
+		}},
+		{MID_BakeCoolingB, {
+			"鐑樼儰娓╂帶1", "鐑樼儰娓╂帶2", "鐑樼儰娓╂帶4", "鐑樼儰娓╂帶5",
+			"鐑樼儰娓╂帶6", "鐑樼儰娓╂帶7"
+		}}
+	};
+
 	CServoUtilsTool::CServoUtilsTool()
 	{
 
@@ -12,6 +43,43 @@
 	CServoUtilsTool::~CServoUtilsTool()
 	{
 
+	}
+
+	std::string CServoUtilsTool::getEqName(int eqid)
+	{
+		switch (eqid)
+		{
+		case EQ_ID_LOADPORT1:
+			return "Port1";
+		case EQ_ID_LOADPORT2:
+			return "Port2";
+		case EQ_ID_LOADPORT3:
+			return "Port3";
+		case EQ_ID_LOADPORT4:
+			return "Port4";
+		case EQ_ID_ALIGNER:
+			return "Aligner";
+		case EQ_ID_FLIPER:
+			return "Fliper";
+		case EQ_ID_VACUUMBAKE:
+			return "VacuumBake";
+		case EQ_ID_Bonder1:
+			return "Bonder1";
+		case EQ_ID_Bonder2:
+			return "Bonder2";
+		case EQ_ID_BAKE_COOLING:
+			return "BakeCooling";
+		case EQ_ID_MEASUREMENT:
+			return "AOI";
+		case EQ_ID_ARM_TRAY1:
+			return "ArmTray1";
+		case EQ_ID_ARM_TRAY2:
+			return "ArmTray2";
+		default:
+			break;
+		}
+
+		return "";
 	}
 
 	std::string CServoUtilsTool::getEqUnitName(int eqid, int unit)
@@ -35,13 +103,8 @@
 		}
 
 		if (eqid == EQ_ID_VACUUMBAKE) {
-			if (unit == 0) return "烘烤A腔";
-			if (unit == 1) return "烘烤B腔";
-		}
-
-		if (eqid == EQ_ID_VACUUMBAKE) {
-			if (unit == 0) return "烘烤A腔";
-			if (unit == 1) return "烘烤B腔";
+			if (unit == 0) return "鐑樼儰A鑵�";
+			if (unit == 1) return "鐑樼儰B鑵�";
 		}
 
 		if (eqid == EQ_ID_Bonder1) {
@@ -54,10 +117,10 @@
 
 		if (eqid == EQ_ID_BAKE_COOLING) {
 
-			if (unit == 0) return "后烘烤A腔";
-			if (unit == 1) return "冷却A";
-			if (unit == 0) return "后烘烤B腔";
-			if (unit == 1) return "冷却B";
+			if (unit == 0) return "鍚庣儤鐑鑵�";
+			if (unit == 1) return "鍐峰嵈A";
+			if (unit == 2) return "鍚庣儤鐑鑵�";
+			if (unit == 3) return "鍐峰嵈B";
 		}
 
 		if (eqid == EQ_ID_MEASUREMENT) {
@@ -98,11 +161,11 @@
 
 		if (eqid == EQ_ID_VACUUMBAKE) {
 			if (unit == 0) {
-				sprintf_s(szBuffer, 256, "烘烤A腔(Slot%d)", slot);
+				sprintf_s(szBuffer, 256, "鐑樼儰A鑵�(Slot%d)", slot);
 				return std::string(szBuffer);
 			}
 			if (unit == 1) {
-				sprintf_s(szBuffer, 256, "烘烤B腔(Slot%d)", slot);
+				sprintf_s(szBuffer, 256, "鐑樼儰B鑵�(Slot%d)", slot);
 				return std::string(szBuffer);
 			}
 		}
@@ -119,10 +182,10 @@
 
 		if (eqid == EQ_ID_BAKE_COOLING) {
 
-			if (slot == 0) return "后烘烤A腔";
-			if (slot == 1) return "冷却A";
-			if (slot == 2) return "后烘烤B腔";
-			if (slot == 3) return "冷却B";
+			if (slot == 0) return "鍚庣儤鐑鑵�";
+			if (slot == 1) return "鍐峰嵈A";
+			if (slot == 2) return "鍚庣儤鐑鑵�";
+			if (slot == 3) return "鍐峰嵈B";
 		}
 
 		if (eqid == EQ_ID_MEASUREMENT) {
@@ -203,4 +266,9 @@
 			break;
 		}
 	}
+
+	std::unordered_map<int, std::vector<std::string>>& CServoUtilsTool::getEqDataTypes()
+	{
+		return EQ_DATA_TYPES;
+	}
 }

--
Gitblit v1.9.3