From d64036c0510cf06009a7252e318d828fbc2658f0 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 11 九月 2025 09:22:02 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CEquipment.h | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h
index 635c7a8..bf1808b 100644
--- a/SourceCode/Bond/Servo/CEquipment.h
+++ b/SourceCode/Bond/Servo/CEquipment.h
@@ -36,6 +36,7 @@
#include "CPortStatusReport.h"
#include "CSlot.h"
#include "CParam.h"
+#include "CSVData.h"
namespace SERVO {
@@ -57,6 +58,7 @@
typedef std::function<void(void* pEiuipment, PROCESS_STATE state)> ONPROCESSSTATE;
typedef std::function<void(void* pEiuipment, short scanMap, short downMap)> ONMAPMISMATCH;
typedef std::function<void(void* pEiuipment, short status, __int64 data)> ONPORTSTATUSCHANGED;
+
typedef struct _EquipmentListener
{
ONALIVE onAlive;
@@ -69,7 +71,7 @@
ONPROCESSSTATE onProcessStateChanged;
ONMAPMISMATCH onMapMismatch;
ONPORTSTATUSCHANGED onPortStatusChanged;
-
+ ONVCREVENTREPORT onSVDataReport;
} EquipmentListener;
@@ -158,7 +160,7 @@
int setDispatchingMode(DISPATCHING_MODE mode, ONWRITED onWritedBlock = nullptr);
int indexerOperationModeChange(IDNEXER_OPERATION_MODE mode, ONWRITEDRET onWritedRetBlock);
void printDebugString001();
-
+ std::vector<SERVO::CSVData>& getSVDatas();
// 请求主配方列表
// unitNo: 0:local; Others:unit No
@@ -173,6 +175,8 @@
// 解析配方参数列表
virtual int parsingParams(const char* pszData, size_t size, std::vector<CParam>& params) { return 0; };
virtual int parsingParams(const char* pszData, size_t size, std::string& strOut);
+ virtual int parsingProcessData(const char* pszData, size_t size, std::vector<CParam>& params) { return 0; };
+ virtual int parsingSVData(const char* pszData, size_t size, std::vector<CParam>& params) { return 0; };
// 获取指定的Slot
CSlot* getSlot(int index);
@@ -202,6 +206,7 @@
CGlass* getGlassWithCassette(int cassetteSequenceNo, int jobSequenceNo);
CGlass* getAnyGlass();
CGlass* getGlass(const char* pszGlassId);
+ int getAllGlass(std::vector<CGlass*>& glasses);
CJobDataS* getJobDataSWithCassette(int cassetteSequenceNo, int jobSequenceNo);
// 验证玻璃和槽是否匹配
@@ -264,6 +269,11 @@
float toFloat(const char* pszAddr);
protected:
+ // 部分优化/简化代码、暂实现部分，到时平铺开
+ void addFacDataReportStep(int dataDev, int writeSignalDev, int port);
+
+
+ protected:
BOOL m_bEnable;
EquipmentListener m_listener;
int m_nID;
@@ -296,6 +306,7 @@
CRecipesManager m_recipesManager;
CSlot m_slot[SLOT_MAX];
PROCESS_STATE m_processState;
+ std::vector<SERVO::CSVData> m_svDatas;
private:
CEquipment* m_pArm;
--
Gitblit v1.9.3