From e42e8364112e97d89eeaecd13f043dff42179949 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 27 五月 2025 17:19:02 +0800
Subject: [PATCH] 1.enum修改为enum class, 理顺CLoadPort各成员变量在调度中的判定作用；
---
SourceCode/Bond/Servo/CEquipment.h | 30 ++++++++++--------------------
1 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h
index 831a3df..c1d73c7 100644
--- a/SourceCode/Bond/Servo/CEquipment.h
+++ b/SourceCode/Bond/Servo/CEquipment.h
@@ -1,5 +1,6 @@
#pragma once
#include "Log.h"
+#include "ServoCommo.h"
#include "CCLinkIEControl.h"
#include "CSample.h"
#include "CPin.h"
@@ -32,12 +33,10 @@
#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
typedef std::function<void(void* pEiuipment, BOOL bAlive)> ONALIVE;
typedef std::function<void(void* pEiuipment, int code)> ONDATACHANGED;
@@ -52,28 +51,12 @@
ONVCREVENTREPORT onVcrEventReport;
} EquipmentListener;
- // Memory Block 结构体定义
- typedef struct _MemoryBlock {
- unsigned int type;
- unsigned int start;
- unsigned int end;
- unsigned int size;
- char buffer[BLOCK_BUFFER_MAX];
- } MemoryBlock;
-
- // ALIVE
- typedef struct _ALIVE {
- BOOL flag;
- int count;
- BOOL alive;
- } ALIVE;
class CEquipment
{
public:
CEquipment();
virtual ~CEquipment();
-
public:
virtual const char* getClassName() = 0;
@@ -127,7 +110,9 @@
virtual BOOL onPreStoredJob(int port, CJobDataB* pJobDataB);
virtual int onStoredJob(int port, CJobDataB* pJobDataB);
virtual int onProcessData(CProcessData* pProcessData);
+ virtual int getIndexerOperationModeBaseValue();
void getGlassList(std::list<CGlass*>& list);
+ CGlass* getGlassFromList(const char* pszId);
CGlass* getFrontGlass();
BOOL removeClass(CGlass* pGlass);
bool isAlarmStep(SERVO::CStep* pStep);
@@ -145,7 +130,11 @@
int setCimMessage(const char* pszMessage, short id, short nTouchPanelNo);
int clearCimMessage(short id, short nTouchPanelNo);
int setDateTime(short year, short month, short day, short hour, short minute, short second);
-
+ int setDispatchingMode(DISPATCHING_MODE mode, ONWRITED onWritedBlock = nullptr);
+ int indexerOperationModeChange(IDNEXER_OPERATION_MODE mode, ONWRITED onWritedBlock = nullptr);
+
+
+
// 请求主配方列表
// unitNo: 0:local; Others:unit No
int masterRecipeListRequest(short unitNo);
@@ -183,6 +172,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