From 6fc65c5cf54432d1044fbe9799aca76f7273798c Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 23 五月 2025 18:02:27 +0800
Subject: [PATCH] Merge branch 'clh'
---
SourceCode/Bond/Servo/CEquipment.h | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h
index 90b7a12..6357114 100644
--- a/SourceCode/Bond/Servo/CEquipment.h
+++ b/SourceCode/Bond/Servo/CEquipment.h
@@ -32,12 +32,14 @@
#include "CJobDataC.h"
#include "CJobDataS.h"
#include "CProcessData.h"
+#include "CPortStatusReport.h"
namespace SERVO {
#define BLOCK_BUFFER_MAX 1024
#define ALIVE_TIMEOUT 15
#define VCR_MAX 1
+#define ARM_ALL 99
typedef std::function<void(void* pEiuipment, BOOL bAlive)> ONALIVE;
typedef std::function<void(void* pEiuipment, int code)> ONDATACHANGED;
@@ -96,6 +98,13 @@
Command_Clear,
Batch_get,
Batch_put
+ };
+
+ enum VCR_Reply_Code {
+ OK = 1,
+ NG,
+ Job_Data_Request,
+ VCR_Mismatch
};
// Robot cmd param
@@ -232,6 +241,7 @@
int decodeSentOutJobReport(CStep* pStep, int port, const char* pszData, size_t size);
int decodeFetchedOutJobReport(CStep* pStep, int port, const char* pszData, size_t size);
int decodeStoredJobReport(CStep* pStep, int port, const char* pszData, size_t size);
+ int decodeVCREventReport(CStep* pStep, const char* pszData, size_t size);
int addJobDataB(CJobDataB* pJobDataB);
int removeJobDataB(int nCassetteSequenceNo, int nJobSequenceNo);
CJobDataB* getJobDataB(int nCassetteSequenceNo, int nJobSequenceNo);
--
Gitblit v1.9.3