From 0b32b5ca45370256da5bbfa8ca43014890258997 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期六, 10 五月 2025 15:58:45 +0800
Subject: [PATCH] 1.修复storeJob为storedJob
---
SourceCode/Bond/Servo/CEquipment.h | 50 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 45 insertions(+), 5 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h
index b041c86..2861c80 100644
--- a/SourceCode/Bond/Servo/CEquipment.h
+++ b/SourceCode/Bond/Servo/CEquipment.h
@@ -19,10 +19,18 @@
#include "CEqCassetteCtrlCmdStep.h"
#include "CEqJobEventStep.h"
#include "CEqVcrEventStep.h"
+#include "CEqCurrentRecipeChangeStep.h"
+#include "CEqWriteStep.h"
+#include "CEqReadStep.h"
#include <vector>
#include <map>
#include <list>
#include "CGlass.h"
+#include "CRecipesManager.h"
+#include "CJobDataA.h"
+#include "CJobDataB.h"
+#include "CJobDataC.h"
+#include "CJobDataS.h"
namespace SERVO {
@@ -70,6 +78,8 @@
virtual const char* getClassName() = 0;
virtual void setListener(EquipmentListener listener);
void setCcLink(CCCLinkIEControl* pCcLink);
+ virtual BOOL isArm() { return FALSE; };
+ void setArm(CEquipment* pEquipment);
void setBaseAlarmId(int nBaseId);
int getBaseAlarmId();
void setID(int nID);
@@ -93,6 +103,7 @@
virtual void init();
virtual void term();
virtual void initPins() = 0;
+ virtual void initSteps();
virtual void onTimer(UINT nTimerid);
virtual void serialize(CArchive& ar);
virtual void onReceiveLBData(const char* pszData, size_t size);
@@ -105,18 +116,42 @@
virtual BOOL glassWillArrive(CGlass* pGlass);
virtual int outputGlass(int port);
virtual int glassArrived(CGlass* pGlass);
+ virtual int onFetchedOut(int port, const char* pszGlassId);
+ virtual int onStore(int port, const char* pszGlassId);
void getGlassList(std::list<CGlass*>& list);
CGlass* getFrontGlass();
BOOL removeClass(CGlass* pGlass);
bool isAlarmStep(SERVO::CStep* pStep);
bool isVcrEventStep(SERVO::CStep* pStep);
bool isCassetteTransferStateStep(SERVO::CStep* pStep);
+ bool isPortTypeStep(SERVO::CStep* pStep);
+ bool isPortModeStep(SERVO::CStep* pStep);
+ bool isPortCassetteTypeStep(SERVO::CStep* pStep);
+ bool isPortTransferModeStep(SERVO::CStep* pStep);
+ bool isPortEnableStep(SERVO::CStep* pStep);
+ bool isPortTypeAutoChangeEnableStep(SERVO::CStep* pStep);
bool isCimMessageConfirmStep(SERVO::CStep* pStep);
int setEqMode(short mode);
int setCimMode(BOOL bOn);
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);
+
+ // 请求主配方列表
+ // unitNo: 0:local; Others:unit No
+ int masterRecipeListRequest(short unitNo);
+
+ // 请求配方参数
+ // masterRecipeId: 主配方id
+ // localRecipeId: 本地配方id
+ // unitNo: 0:local; Others:unit No
+ int recipeParameterRequest(short masterRecipeId, short localRecipeId, short unitNo);
+
+ public:
+ int fetchedOut(const char* pszGlassId);
+ int storedJob(const char* pszGlassId);
+ BOOL isGlassListEmpty();
+
// 以下为从CC-Link读取到的Bit标志位检测函数
public:
@@ -128,15 +163,16 @@
BOOL isAutoRecipeChange();
BOOL isVCREnable(unsigned int index);
-
- private:
- BOOL isBitOn(const char* pszData, size_t size, int index);
- inline BOOL equalBool(BOOL b1, BOOL b2);
-
protected:
inline void Lock() { EnterCriticalSection(&m_criticalSection); }
inline void Unlock() { LeaveCriticalSection(&m_criticalSection); }
+ BOOL isBitOn(const char* pszData, size_t size, int index);
+ inline BOOL equalBool(BOOL b1, BOOL b2);
void addGlassToList(CGlass* pGlass);
+ short decodeRecipeListReport(const char* pszData, size_t size);
+ short decodeRecipeParameterReport(const char* pszData, size_t size);
+ int decodeFetchedOutJobReport(int port, const char* pszData, size_t size);
+ int decodeStoredJobReport(int port, const char* pszData, size_t size);
protected:
EquipmentListener m_listener;
@@ -166,6 +202,10 @@
CCCLinkIEControl* m_pCclink;
std::map<unsigned int, CStep*> m_mapStep;
int m_nBaseAlarmId;
+ CRecipesManager m_recipesManager;
+
+ private:
+ CEquipment* m_pArm;
};
}
--
Gitblit v1.9.3