~chenluhua/Bond2.git

			@@ -2,6 +2,15 @@
			#include "Log.h"
			#include "CCLinkIEControl.h"
			#include "CEqModeStep.h"
			#include "CEqStatusStep.h"
			#include "CEqAlarmStep.h"
			#include "CEqProcessStep.h"
			#include "CEqCimModeChangeStep.h"
			#include "CEqModeChangeStep.h"
			#include "CEqCimMessageCmdStep.h"
			#include "CEqCimMessageClearStep.h"
			#include "CEqDateTimeSetCmdStep.h"
			#include "CEqVCREnableStep.h"
			#include <map>


			@@ -44,6 +53,8 @@
			virtual const char* getClassName() = 0;
			virtual void setListener(EquipmentListener listener);
			void setCcLink(CCCLinkIEControl* pCcLink);
			void setBaseAlarmId(int nBaseId);
			int getBaseAlarmId();
			void setID(int nID);
			int getID();
			void setName(const char* pszName);
			@@ -52,6 +63,7 @@
			std::string& getDescription();
			void setStation(int network, int station);
			const StationIdentifier& getStation();
			virtual void getAttributeVector(CAttributeVector& attrubutes);
			void setReadBitBlock(unsigned int start, unsigned int end);
			MemoryBlock& getReadBitBlock();
			void setWriteBitBlock(unsigned int start, unsigned int end);
			@@ -59,6 +71,8 @@
			void getProperties(std::vector<std::pair<std::string, std::string>>& container);
			int addStep(unsigned int addr, CStep* pStep);
			CStep* getStep(unsigned int addr);
			CStep* getStepWithName(const char* pszName);
			std::map<unsigned int, CStep*>& getSteps();
			virtual void init();
			virtual void term();
			virtual void onTimer(UINT nTimerid);
			@@ -108,6 +122,7 @@
			private:
			CCCLinkIEControl* m_pCclink;
			std::map<unsigned int, CStep*> m_mapStep;
			int m_nBaseAlarmId;
			};
			}