From b2aa706dfea78ad2e327fb5e414207af69d23d64 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期六, 13 九月 2025 11:33:04 +0800
Subject: [PATCH] 1.对话框显示工艺参数，可复制到剪贴板； 2.修复几处因按回车或ESC键导致页面被关闭的问题； 3.修复解释警告数据文本失败的问题； 4.更新警告文本，显示警告详细信息； 5.完善警告描述内容 ；
---
SourceCode/Bond/Servo/CMaster.h | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.h b/SourceCode/Bond/Servo/CMaster.h
index e79589d..ebca19b 100644
--- a/SourceCode/Bond/Servo/CMaster.h
+++ b/SourceCode/Bond/Servo/CMaster.h
@@ -33,6 +33,10 @@
#define CTStep_begin CTStep_LoadPort_Aligner
#define CTStep_end CTStep_Measurement_LoadPort
+#define ER_CODE_NOERROR 0
+#define ER_CODE_OPERATION_MODE_FAIL -1
+#define ER_CODE_AOI_NG -2
+
namespace SERVO {
enum class MASTERSTATE {
READY = 0,
@@ -41,7 +45,8 @@
RUNNING_CONTINUOUS_TRANSFER,
RUNNING_BATCH,
STOPPING,
- MSERROR
+ MSERROR,
+ ATHERERROR
};
typedef std::function<void(void* pMaster, MASTERSTATE state)> ONMASTERSTATECHANGED;
@@ -88,7 +93,7 @@
int start();
int startContinuousTransfer();
int startBatch();
- int stop();
+ int stop(int nErCode = ER_CODE_NOERROR);
void clearError();
ULONGLONG getRunTime();
MASTERSTATE getState();
@@ -125,6 +130,11 @@
bool saveState() const;
bool loadState(const std::string& path);
int getWipGlasses(std::vector<CGlass*>& glasses);
+ void test();
+ bool moveGlassToBuf(int eqid, int slotNo);
+ bool moveGlassToSlot(int eqid, int slotNo);
+ int getPortCassetteSnSeed(int port);
+ void setPortCassetteSnSeed(int port, int seed);
private:
inline void lock() { EnterCriticalSection(&m_criticalSection); }
@@ -163,6 +173,10 @@
bool carrierPresent(const std::string& carrierId) const override;
bool slotUsable(const std::string& carrierId, uint16_t slot) const override;
bool ceidDefined(uint32_t ceid) const override;
+
+ public:
+ int getLastError();
+ std::string& getLastErrorText();
public:
// 新增函数
@@ -237,6 +251,7 @@
std::string m_strStatePath;
int m_nTestFlag;
+ std::list<CGlass*> m_bufGlass;
};
}
--
Gitblit v1.9.3