From a351ed8a97a72bddfb281d2aa350a5c42a7f81a5 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 16 十月 2025 17:40:49 +0800
Subject: [PATCH] 1.添加客户端列表显示；
---
SourceCode/Bond/Servo/CMaster.h | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.h b/SourceCode/Bond/Servo/CMaster.h
index 21b68d6..e2844bd 100644
--- a/SourceCode/Bond/Servo/CMaster.h
+++ b/SourceCode/Bond/Servo/CMaster.h
@@ -1,4 +1,4 @@
-#pragma once
+锘�#pragma once
#include <list>
#include "CEquipment.h"
#include "CEFEM.h"
@@ -171,7 +171,7 @@
CEquipment* pTarEq, int nTarSlot, int armNo = 1);
public:
- // —— IResourceView 覆写 ——（注意 const）
+ // 鈥斺�� IResourceView 瑕嗗啓 鈥斺�旓紙娉ㄦ剰 const锛�
bool isProcessJobsEmpty() const override;
bool recipeExists(const std::string& ppid) const override;
bool carrierPresent(const std::string& carrierId) const override;
@@ -183,7 +183,7 @@
std::string& getLastErrorText();
public:
- // 新增函数
+ // 鏂板鍑芥暟
CProcessJob* acquireNextProcessJob();
CGlass* acquireNextGlass();
int acquireGlassToQueue();
@@ -199,6 +199,9 @@
bool canCreateControlJob();
bool canCompleteControlJob();
bool canDeleteControlJob();
+
+ // DAQ Bridge閻╃鍙�
+ Collector* getCollector() const { return m_pCollector; }
private:
CRITICAL_SECTION m_criticalSection;
@@ -211,42 +214,42 @@
bool m_bBatch;
private:
- /* 监控比特位的线程*/
+ /* 鐩戞帶姣旂壒浣嶇殑绾跨▼*/
HANDLE m_hEventReadBitsThreadExit[2];
HANDLE m_hReadBitsThreadHandle;
unsigned m_nReadBitsThreadAddr;
- // 调度线程
+ // 璋冨害绾跨▼
HANDLE m_hDispatchEvent;
HANDLE m_hEventDispatchThreadExit[2];
HANDLE m_hDispatchThreadHandle;
unsigned m_nDispatchThreadAddr;
- // 启动时间，运行时间，状态
+ // 鍚姩鏃堕棿锛岃繍琛屾椂闂达紝鐘舵��
ULONGLONG m_ullStartTime;
ULONGLONG m_ullRunTime;
MASTERSTATE m_state;
- // 当前任务和已完成任务列表
+ // 褰撳墠浠诲姟鍜屽凡瀹屾垚浠诲姟鍒楄〃
CRobotTask* m_pActiveRobotTask;
std::list< CRobotTask* > m_listTask;
- // 错误代码
+ // 閿欒浠ｇ爜
int m_nLastError;
std::string m_strLastError;
- // 在开始工艺前是否先需要先比较map
+ // 鍦ㄥ紑濮嬪伐鑹哄墠鏄惁鍏堥渶瑕佸厛姣旇緝map
BOOL m_isCompareMapsBeforeProceeding;
BOOL m_bJobMode;
- // 千传圈数计数
+ // 鍗冧紶鍦堟暟璁℃暟
int m_nContinuousTransferCount;
int m_nContinuousTransferStep;
int m_nContinuousWorkingPort;
int m_nContinuousWorkingSlot;
- // 新增已经开始处理的ProcessJob列表
+ // 鏂板宸茬粡寮�濮嬪鐞嗙殑ProcessJob鍒楄〃
std::vector<CProcessJob*> m_inProcesJobs;
std::vector<CProcessJob*> m_completeProcessJobs;
std::vector<CGlass*> m_queueGlasses;
--
Gitblit v1.9.3