From 517c0e8eba29ff41afbbc0abb0f913914b37e4e1 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期二, 27 一月 2026 10:59:09 +0800
Subject: [PATCH] 1.SlotMap Mismatch 事件
---
SourceCode/Bond/Servo/CMaster.h | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.h b/SourceCode/Bond/Servo/CMaster.h
index 567a7b1..39f2579 100644
--- a/SourceCode/Bond/Servo/CMaster.h
+++ b/SourceCode/Bond/Servo/CMaster.h
@@ -1,5 +1,6 @@
锘�#pragma once
#include <list>
+#include <unordered_set>
#include "CEquipment.h"
#include "CEFEM.h"
#include "CBonder.h"
@@ -17,6 +18,8 @@
#include "CControlJob.h"
#include "../DAQBridge/core/Collector.h"
#include "CJobDataS.h"
+
+class CModel;
#define CTStep_Unknow 0
@@ -49,6 +52,11 @@
STOPPING,
MSERROR,
ATHERERROR
+ };
+
+ enum class CurveMode {
+ Production = 0,
+ EmptyChamber
};
typedef std::function<void(void* pMaster, MASTERSTATE state)> ONMASTERSTATECHANGED;
@@ -98,6 +106,7 @@
public:
+ void setModelCtx(CModel* pModel);
void setListener(MasterListener listener);
CRobotTask* getActiveRobotTask();
int init();
@@ -109,6 +118,8 @@
void clearError();
ULONGLONG getRunTime();
MASTERSTATE getState();
+ void setCurveMode(CurveMode mode);
+ CurveMode getCurveMode() const;
unsigned DispatchProc();
unsigned ReadBitsProc();
void onTimer(UINT nTimerid);
@@ -189,6 +200,15 @@
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;
+ void setAllowedCeids(const std::vector<unsigned int>& ceids);
+ void handleCollectionEvent(uint32_t ceid);
+ bool raiseSoftAlarm(int alarmId,
+ const std::string& desc,
+ int level = -1,
+ int deviceId = 0,
+ int unitId = 0,
+ const char* deviceName = "Software",
+ const char* unitName = "App");
public:
int getLastError();
@@ -241,6 +261,7 @@
ULONGLONG m_ullStartTime;
ULONGLONG m_ullRunTime;
MASTERSTATE m_state;
+ CurveMode m_curveMode;
// 褰撳墠浠诲姟鍜屽凡瀹屾垚浠诲姟鍒楄〃
CRobotTask* m_pActiveRobotTask;
@@ -270,15 +291,23 @@
private:
bool m_bEnableEventReport;
bool m_bEnableAlarmReport;
+ bool m_bPauseAlarmRaised;
SERVO::CControlJob* m_pControlJob;
std::vector<SERVO::CProcessJob*> m_processJobs;
std::string m_strStatePath;
+ CModel* m_pModelCtx;
int m_nTestFlag;
std::list<CGlass*> m_bufGlass;
+ std::unordered_set<uint32_t> m_allowedCeids;
private:
Collector* m_pCollector = nullptr;
void CreateDAQBridgeServer();
+ inline void notifyControlJobChanged() {
+ if (m_listener.onControlJobChanged) {
+ m_listener.onControlJobChanged(this);
+ }
+ }
};
}
--
Gitblit v1.9.3