From 90ae1c3db92833354814484e65f8cd2eef1f5f3e Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期三, 30 七月 2025 15:14:20 +0800
Subject: [PATCH] 1.配方列表获取完善;

---
 SourceCode/Bond/Servo/CMaster.h |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/SourceCode/Bond/Servo/CMaster.h b/SourceCode/Bond/Servo/CMaster.h
index f005d7c..76d52eb 100644
--- a/SourceCode/Bond/Servo/CMaster.h
+++ b/SourceCode/Bond/Servo/CMaster.h
@@ -31,6 +31,7 @@
     typedef std::function<void(void* pMaster, CEquipment* pEquipment, CVcrEventReport* pReport)> ONEQVCREVENTREPORT;
     typedef std::function<void(void* pMaster, CEquipment* pEquipment, int code)> ONEQDATACHANGED;
     typedef std::function<void(void* pMaster, CRobotTask* pTask, int code)> ONROBOTTASKEVENT;
+    typedef std::function<void(void* pMaster, CEquipment* pEquipment, short status, __int64 data)> ONLOADPORTSTATUSCHANGED;
     typedef struct _MasterListener
     {
         ONMASTERSTATECHANGED    onMasterStateChanged;
@@ -40,6 +41,7 @@
         ONEQVCREVENTREPORT	    onEqVcrEventReport;
         ONEQDATACHANGED         onEqDataChanged;
         ONROBOTTASKEVENT        onRobotTaskEvent;
+        ONLOADPORTSTATUSCHANGED	onLoadPortStatusChanged;
     } MasterListener;
 
     class CMaster
@@ -67,9 +69,16 @@
         void setCacheFilepath(const char* pszFilepath);
         int abortCurrentTask();
         int restoreCurrentTask();
+        int resendCurrentTask();
         void setPortType(unsigned int index, BOOL enable, int type, int mode,
             int cassetteType, int transferMode, BOOL autoChangeEnable);
+        void setPortCassetteType(unsigned int index, SERVO::CassetteType type);
+        void setPortEnable(unsigned int index, BOOL bEnable);
+        void setCompareMapsBeforeProceeding(BOOL bCompare);
         void datetimeSync(SYSTEMTIME& time);
+        void enableEventReport(bool bEnable);
+        void enableAlarmReport(bool bEnable);
+        bool isAlarmReportEnable();
 
     private:
         inline void lock() { EnterCriticalSection(&m_criticalSection); }
@@ -131,6 +140,12 @@
         // 错误代码
         int m_nLastError;
         std::string m_strLastError;
+
+        // 在开始工艺前是否先需要先比较map
+        BOOL m_isCompareMapsBeforeProceeding;
+    private:
+        bool m_bEnableEventReport;
+        bool m_bEnableAlarmReport;
     };
 }
 

--
Gitblit v1.9.3