~chenluhua/Bond2.git

			@@ -38,12 +38,18 @@


			namespace SERVO {
			#define SLOT_MAX 12
			#define SLOT_MAX PATH_MAX
			#define SIGNAL_UPSTREAM_INLINE 0
			#define SIGNAL_UPSTREAM_TROUBLE 1
			#define SIGNAL_INTERLOCK 2
			#define SIGNAL_SEND_ABLE 3

			typedef std::function<void(void* pEiuipment, BOOL bAlive)> ONALIVE;
			typedef std::function<void(void* pEiuipment, int code)> ONDATACHANGED;
			typedef std::function<void(void* pEiuipment, int state, int alarmId, int unitId, int level)> ONALARM;
			typedef std::function<void(void* pEiuipment, void* pReport)> ONVCREVENTREPORT;
			typedef std::function<BOOL(void* pEiuipment, CJobDataB* pJobDataB)> ONPREFETCHEDOUTJOB;
			typedef std::function<BOOL(void* pEiuipment, CJobDataB* pJobDataB, short& putSlot)> ONPRESTOREDJOB;
			typedef struct _EquipmentListener
			{
			ONALIVE onAlive;
			@@ -51,6 +57,8 @@
			ONALARM onAlarm;
			ONDATACHANGED onDataChanged;
			ONVCREVENTREPORT onVcrEventReport;
			ONPREFETCHEDOUTJOB onPreFethedOutJob;
			ONPRESTOREDJOB onPreStoredJob;
			} EquipmentListener;


			@@ -97,27 +105,21 @@
			virtual void onReceiveLBData(const char* pszData, size_t size);
			virtual int onStepEvent(CStep* pStep, int code);
			virtual CPin* addPin(PinType type, char* pszName);
			virtual short getSlotUnit(short slot) { return 0; };
			CPin* getPin(char* pszName);
			std::vector<CPin*>& CEquipment::getInputPins();
			std::vector<CPin*>& CEquipment::getOutputPins();
			virtual int recvIntent(CPin* pPin, CIntent* pIntent);
			virtual BOOL glassWillArrive(CGlass* pGlass);
			virtual int outputGlass(int port);
			virtual int glassArrived(CGlass* pGlass);
			virtual int fetchedOutJob(CJobDataB* pJobDataB);
			virtual int storedJob(CJobDataB* pJobDataB);
			virtual int storedJob(CJobDataB* pJobDataB, short putSlot);
			virtual int onReceivedJob(int port, CJobDataS* pJobDataS);
			virtual int onSentOutJob(int port, CJobDataS* pJobDataS);
			virtual BOOL onPreFetchedOutJob(int port, CJobDataB* pJobDataB);
			virtual int onFetchedOutJob(int port, CJobDataB* pJobDataB);
			virtual BOOL onPreStoredJob(int port, CJobDataB* pJobDataB);
			virtual BOOL onPreStoredJob(int port, CJobDataB* pJobDataB, short& putSlot);
			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);
			bool isVcrEventStep(SERVO::CStep* pStep);
			bool isCassetteTransferStateStep(SERVO::CStep* pStep);
			@@ -152,13 +154,34 @@
			CSlot* getAvailableSlot();

			// 获取一个指定物料类型(G1,G2,G1&G2)的空槽位
			CSlot* getEmptySlot(MaterialsType type);
			CSlot* getAvailableSlotForGlass(MaterialsType type);

			// 在指定的槽列表中，获取一个指定物料类型(G1,G2,G1&G2)的空槽位
			CSlot* getAvailableSlotForGlass2(MaterialsType type, const std::vector<int>& candidates);

			// 获取一个指定物料类型(G1,G2,G1&G2)的非空槽位
			CSlot* getNonEmptySlot(MaterialsType type);

			public:
			BOOL isGlassListEmpty();
			// 获取一个指定物料类型(G1,G2,G1&G2)的且已经加工处理的槽位
			CSlot* getProcessedSlot(MaterialsType putSlotType);
			CSlot* getProcessedSlot2(MaterialsType putSlotType, const std::vector<int>& candidates);

			// 获取玻璃物料
			CGlass* getGlassFromSlot(int slotNo);
			CGlass* getAnyGlass();

			// 验证玻璃和槽是否匹配
			BOOL ValidateGlassSlotMatch();

			// 是否有玻璃
			BOOL hasGlass();

			// 获取指定ID的glass
			CGlass * getGlass(const char* pszGlassId);

			// 指定槽位是否可以放置玻璃
			BOOL canPlaceGlassInSlot(const short slotIndex);


			// 以下为从CC-Link读取到的Bit标志位检测函数
			public:
			@@ -169,13 +192,17 @@
			BOOL isLocalAlarm();
			BOOL isAutoRecipeChange();
			BOOL isVCREnable(unsigned int index);
			BOOL isLinkSignalOn(unsigned int path, unsigned int signal);

			// 只在模拟测试时使用的函数，用于模拟信号
			void setLinkSignal(unsigned int path, unsigned int signal, BOOL bOn);
			void setLinkSignalBlock(unsigned int path, BOOL* pSignal);

			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 decodeProcessDataReport(CStep* pStep, const char* pszData, size_t size);
			@@ -190,6 +217,7 @@
			int addJobDataS(CJobDataS* pJobDataS);
			int removeJobDataS(int nCassetteSequenceNo, int nJobSequenceNo);
			CJobDataS* getJobDataS(int nCassetteSequenceNo, int nJobSequenceNo);
			BOOL compareJobDataB(CJobDataB* pJobDataB1, CJobDataB* pJobDataB2);

			protected:
			EquipmentListener m_listener;
			@@ -202,7 +230,6 @@
			MemoryBlock m_blockWriteBit;
			std::vector<CPin*> m_inputPins;
			std::vector<CPin*> m_outputPins;
			std::list<CGlass*> m_glassList;


			// 以下为从CC-Link读取到的Bit标志位
			@@ -214,6 +241,7 @@
			BOOL m_bLocalAlarm;
			BOOL m_bAutoRecipeChange;
			BOOL m_bVCREnable[VCR_MAX];
			BOOL m_bLinkSignal[PATH_MAX][SIGNAL_MAX];

			protected:
			CCCLinkIEControl* m_pCclink;