~chenluhua/Bond2.git

			@@ -110,7 +110,7 @@
			// Type
			static char* pszName[] = { STEP_EQ_PORT1_TYPE, STEP_EQ_PORT2_TYPE, STEP_EQ_PORT3_TYPE, STEP_EQ_PORT4_TYPE };
			static int dev[] = { 0x6010 , 0x6020, 0x6030, 0x6040 };
			static int writeSignalDev[] = { 0xa0, 0xa1, 0xa2, 0xa3 };
			static int writeSignalDev[] = { 0x90, 0x91, 0x92, 0x93 };
			static int addr[] = { STEP_ID_PORT1_TYPE_CHANGE, STEP_ID_PORT2_TYPE_CHANGE, STEP_ID_PORT3_TYPE_CHANGE, STEP_ID_PORT4_TYPE_CHANGE };

			CEqReadStep* pStep = new CEqReadStep(dev[m_nIndex], sizeof(short),
			@@ -131,7 +131,7 @@
			// Mode
			static char* pszName[] = { STEP_EQ_PORT1_MODE, STEP_EQ_PORT2_MODE, STEP_EQ_PORT3_MODE, STEP_EQ_PORT4_MODE };
			static int dev[] = { 0x6011, 0x6021, 0x6031, 0x6041 };
			static int writeSignalDev[] = { 0xa8, 0xa9, 0xaa, 0xab };
			static int writeSignalDev[] = { 0x98, 0x99, 0x9a, 0x9b };
			static int addr[] = { STEP_ID_PORT1_MODE_CHANGE, STEP_ID_PORT2_MODE_CHANGE, STEP_ID_PORT3_MODE_CHANGE, STEP_ID_PORT4_MODE_CHANGE };

			CEqReadStep* pStep = new CEqReadStep(dev[m_nIndex], sizeof(short),
			@@ -152,7 +152,7 @@
			// Cassette type
			static char* pszName[] = { STEP_EQ_PORT1_CASSETTE_TYPE, STEP_EQ_PORT2_CASSETTE_TYPE, STEP_EQ_PORT3_CASSETTE_TYPE, STEP_EQ_PORT4_CASSETTE_TYPE };
			static int dev[] = { 0x6012, 0x6022, 0x6032, 0x6042 };
			static int writeSignalDev[] = { 0xb0, 0xb1, 0xb2, 0xb3 };
			static int writeSignalDev[] = { 0xa0, 0xa1, 0xa2, 0xa3 };
			static int addr[] = { STEP_ID_PORT1_CASSETTE_TYPE_CHANGE, STEP_ID_PORT2_CASSETTE_TYPE_CHANGE, STEP_ID_PORT3_CASSETTE_TYPE_CHANGE, STEP_ID_PORT4_CASSETTE_TYPE_CHANGE };

			CEqReadStep* pStep = new CEqReadStep(dev[m_nIndex], sizeof(short),
			@@ -173,7 +173,7 @@
			// Transfer type
			static char* pszName[] = { STEP_EQ_PORT1_TRANSFER_MODE, STEP_EQ_PORT2_TRANSFER_MODE, STEP_EQ_PORT3_TRANSFER_MODE, STEP_EQ_PORT4_TRANSFER_MODE };
			static int dev[] = { 0x6014, 0x6024, 0x6034, 0x6044 };
			static int writeSignalDev[] = { 0xb8, 0xb9, 0xba, 0xbb };
			static int writeSignalDev[] = { 0xa8, 0xa9, 0xaa, 0xab };
			static int addr[] = { STEP_ID_PORT1_TRANSFER_MODE_CHANGE, STEP_ID_PORT2_TRANSFER_MODE_CHANGE, STEP_ID_PORT3_TRANSFER_MODE_CHANGE, STEP_ID_PORT4_TRANSFER_MODE_CHANGE };

			CEqReadStep* pStep = new CEqReadStep(dev[m_nIndex], sizeof(short),
			@@ -194,7 +194,7 @@
			// Port enable
			static char* pszName[] = { STEP_EQ_PORT1_ENABLE, STEP_EQ_PORT2_ENABLE, STEP_EQ_PORT3_ENABLE, STEP_EQ_PORT4_ENABLE };
			static int dev[] = { 0x6015, 0x6025, 0x6035, 0x6045 };
			static int writeSignalDev[] = { 0xc0, 0xc1, 0xc2, 0xc3 };
			static int writeSignalDev[] = { 0xb0, 0xb1, 0xb2, 0xb3 };
			static int addr[] = { STEP_ID_PORT1_ENABLE_MODE_CHANGE, STEP_ID_PORT2_ENABLE_MODE_CHANGE, STEP_ID_PORT3_ENABLE_MODE_CHANGE, STEP_ID_PORT4_ENABLE_MODE_CHANGE };

			CEqReadStep* pStep = new CEqReadStep(dev[m_nIndex], sizeof(short),
			@@ -378,23 +378,23 @@

			if (ar.IsStoring()) {
			ar << m_nIndex;
			ar << (int)m_portType;
			ar << (int)m_portMode;
			ar << (int)m_cassetteType;
			ar << (int)m_transferMode;
			ar << m_bEnable;
			ar << m_bAutoChangeEnable;
			//ar << (int)m_portType;
			//ar << (int)m_portMode;
			//ar << (int)m_cassetteType;
			//ar << (int)m_transferMode;
			//ar << m_bEnable;
			//ar << m_bAutoChangeEnable;
			m_portStatusReport.serialize(ar);
			}
			else {
			int temp;
			ar >> m_nIndex;
			ar >> temp; m_portType = (PortType)temp;
			ar >> temp; m_portMode = (PortMode)temp;
			ar >> temp; m_cassetteType = (CassetteType)temp;
			ar >> temp; m_transferMode = (TransferMode)temp;
			ar >> m_bEnable;
			ar >> m_bAutoChangeEnable;
			//ar >> temp; m_portType = (PortType)temp;
			//ar >> temp; m_portMode = (PortMode)temp;
			//ar >> temp; m_cassetteType = (CassetteType)temp;
			//ar >> temp; m_transferMode = (TransferMode)temp;
			//ar >> m_bEnable;
			//ar >> m_bAutoChangeEnable;
			m_portStatusReport.serialize(ar);
			}
			}
			@@ -1077,6 +1077,36 @@
			return 0;
			}

			void CLoadPort::localEanblePort(BOOL bEnable)
			{
			m_bEnable = bEnable;
			}

			void CLoadPort::localSetPortType(PortType type)
			{
			m_portType = type;
			}

			void CLoadPort::localSetPortMode(PortMode mode)
			{
			m_portMode = mode;
			}

			void CLoadPort::localSetCessetteType(CassetteType type)
			{
			m_cassetteType = type;
			}

			void CLoadPort::localSetTransferMode(TransferMode mode)
			{
			m_transferMode = mode;
			}

			void CLoadPort::localAutoChangeEnable(BOOL bEnable)
			{
			m_bAutoChangeEnable = bEnable;
			}

			/*
			* 生成测试用的玻璃列表
			*/