From bc7f1c4e028e69be51079b59dae4ae5c4d43f5bb Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期六, 31 一月 2026 21:54:56 +0800
Subject: [PATCH] 1.状态指示图，目前灰色表示掉线，绿色表示在线。增加Slot的小点表示有没有料，及加工状态 。 2.增加图示
---
SourceCode/Bond/Servo/CMaster.h | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.h b/SourceCode/Bond/Servo/CMaster.h
index 35eb6fc..20d4c3d 100644
--- a/SourceCode/Bond/Servo/CMaster.h
+++ b/SourceCode/Bond/Servo/CMaster.h
@@ -54,6 +54,11 @@
ATHERERROR
};
+ enum class CurveMode {
+ Production = 0,
+ EmptyChamber
+ };
+
typedef std::function<void(void* pMaster, MASTERSTATE state)> ONMASTERSTATECHANGED;
typedef std::function<void(void* pMaster, CEquipment* pEiuipment, BOOL bAlive)> ONEQALIVE;
typedef std::function<void(CStep* pStep, int code, void* pData)> ONEQSTEPEVENT;
@@ -66,6 +71,8 @@
typedef std::function<void(void* pMaster, CEquipment* pEquipment, const std::vector<CParam>& params)> ONPROCESSDATAREPORTEX;
typedef std::function<void(void* pMaster, CEquipment* pEquipment, const std::vector<CParam>& params)> ONSVDATAREPORT;
typedef std::function<void(void* pMaster, CEquipment* pEquipment, int port, CJobDataS* pJobDataS)> ONJOBRECEIVED;
+ typedef std::function<void(void* pMaster, CEquipment* pEquipment, int port, CJobDataS* pJobDataS)> ONJOBSENTOUT;
+ typedef std::function<void(void* pMaster, CEquipment* pEquipment, int unitId, int status, int reason)> ONEQSTATUSCHANGEDEX;
typedef std::function<void(void* pMaster, int round)> ONCTROUNDEND;
typedef std::function<void(void* pMaster, void* pj)> ONPJSTART;
typedef std::function<void(void* pMaster)> ONCONTROLJOBCHANGED;
@@ -83,6 +90,8 @@
ONSVDATAREPORT onSVDataReport;
ONPROCESSDATAREPORTEX onProcessDataReport;
ONJOBRECEIVED onJobReceived;
+ ONJOBSENTOUT onJobSentOut;
+ ONEQSTATUSCHANGEDEX onEqStatusChanged;
ONCTROUNDEND onCTRoundEnd;
ONPJSTART onCjStart;
ONPJSTART onCjEnd;
@@ -113,6 +122,8 @@
void clearError();
ULONGLONG getRunTime();
MASTERSTATE getState();
+ void setCurveMode(CurveMode mode);
+ CurveMode getCurveMode() const;
unsigned DispatchProc();
unsigned ReadBitsProc();
void onTimer(UINT nTimerid);
@@ -254,6 +265,7 @@
ULONGLONG m_ullStartTime;
ULONGLONG m_ullRunTime;
MASTERSTATE m_state;
+ CurveMode m_curveMode;
// 褰撳墠浠诲姟鍜屽凡瀹屾垚浠诲姟鍒楄〃
CRobotTask* m_pActiveRobotTask;
--
Gitblit v1.9.3