~chenluhua/Bond2.git

			@@ -38,7 +38,11 @@


			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;
			@@ -146,6 +150,9 @@
			// unitNo: 0:local; Others:unit No
			int recipeParameterRequest(short masterRecipeId, short localRecipeId, short unitNo);

			// 获取指定的Slot
			CSlot* getSlot(int index);

			// 获取一个可用的槽位
			CSlot* getAvailableSlot();

			@@ -160,6 +167,7 @@

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

			// 获取玻璃物料
			CGlass* getGlassFromSlot(int slotNo);
			@@ -177,6 +185,8 @@
			// 指定槽位是否可以放置玻璃
			BOOL canPlaceGlassInSlot(const short slotIndex);

			// 手动移除物料
			int removeGlass(int slotNo);

			// 以下为从CC-Link读取到的Bit标志位检测函数
			public:
			@@ -187,6 +197,11 @@
			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); }
			@@ -231,6 +246,7 @@
			BOOL m_bLocalAlarm;
			BOOL m_bAutoRecipeChange;
			BOOL m_bVCREnable[VCR_MAX];
			BOOL m_bLinkSignal[PATH_MAX][SIGNAL_MAX];

			protected:
			CCCLinkIEControl* m_pCclink;