Merge branch 'clh' into liuyang

mrDarker

6 天以前 829fe6c6bc33d53fda9c31fd45a37e1df87befff

 SourceCode/Bond/Servo/CEquipment.h

@@ -59,6 +59,8 @@
   typedef std::function<void(void* pEiuipment, short scanMap, short downMap)> ONMAPMISMATCH;
   typedef std::function<void(void* pEiuipment, short status, __int64 data)> ONPORTSTATUSCHANGED;
   typedef std::function<void(void* pEiuipment, const std::vector<CParam>& params)> ONPROCESSDATAREPORT;
   typedef std::function<void(void* pEiuipment, int port, CJobDataS* pJobDataS)> ONRECEIVEDJOB;
   typedef std::function<void(void* pEiuipment, int port, CJobDataS* pJobDataS)> ONSENTOUTJOB;
   
   typedef struct _EquipmentListener
   {
@@ -75,6 +77,8 @@
      ONVCREVENTREPORT   onSVDataReport;
      ONVCREVENTREPORT   onPanelDataReport;
      ONPROCESSDATAREPORT   onProcessDataReport;
      ONRECEIVEDJOB      onReceivedJob;
      ONSENTOUTJOB      onSentOutJob;
   } EquipmentListener;


@@ -101,6 +105,8 @@
      std::string& getName();
      void setDescription(const char* pszDescription);
      std::string& getDescription();
      void setCurrentRecipe(const std::string& recipe);
      std::string getCurrentRecipe();
      void setStation(int network, int station);
      const StationIdentifier& getStation();
      virtual void getAttributeVector(CAttributeVector& attrubutes);
@@ -284,6 +290,7 @@
      int m_nID;
      std::string m_strName;
      std::string m_strDescription;
      std::string m_currentRecipe;
      CRITICAL_SECTION m_criticalSection;
      StationIdentifier m_station;
      MemoryBlock m_blockReadBit;