From 7ddca21fdb798123239eab9daa390e2702afdff7 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 10 十月 2025 18:02:19 +0800
Subject: [PATCH] 1.ProcessStart和ProcessEnd加调上层时加上SlotNo, 状态也关联到SlotNo, 因为多腔可能 并行工作。 2.加入曲线采集服务端到项目中。
---
SourceCode/Bond/Servo/CMaster.h | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.h b/SourceCode/Bond/Servo/CMaster.h
index 47bf8cf..21b68d6 100644
--- a/SourceCode/Bond/Servo/CMaster.h
+++ b/SourceCode/Bond/Servo/CMaster.h
@@ -15,6 +15,7 @@
#include "CRobotTask.h"
#include "ProcessJob.h"
#include "CControlJob.h"
+#include "../DAQBridge/core/Collector.h"
#define CTStep_Unknow 0
@@ -107,8 +108,9 @@
int abortCurrentTask();
int restoreCurrentTask();
int resendCurrentTask();
- void setPortType(unsigned int index, BOOL enable, int type, int mode,
+ void setPortTypeEx(unsigned int index, BOOL enable, int type, int mode,
int cassetteType, int transferMode, BOOL autoChangeEnable);
+ void setPortType(unsigned int index, int type);
void setPortCassetteType(unsigned int index, SERVO::CassetteType type);
void setPortEnable(unsigned int index, BOOL bEnable);
void setCompareMapsBeforeProceeding(BOOL bCompare);
@@ -192,7 +194,8 @@
bool checkAndUpdatePjComplete(CProcessJob* pJob);
bool checkAndUpdateCjComplete(CControlJob* pJob);
CProcessJob* getGlassProcessJob(CGlass* pGlass);
- bool completeControlJob(std::string description);
+ bool completeControlJob();
+ bool forceCompleteControlJob(std::string description);
bool canCreateControlJob();
bool canCompleteControlJob();
bool canDeleteControlJob();
@@ -259,6 +262,10 @@
int m_nTestFlag;
std::list<CGlass*> m_bufGlass;
+
+ private:
+ Collector* m_pCollector = nullptr;
+ void CreateDAQBridgeServer();
};
}
--
Gitblit v1.9.3