1.Glass的状态切换； 2.重新组织机器中Glass的序列化和反序列化；

LAPTOP-SNT8I5JK\Boounion

2025-09-11 71766e0946eaaf4473377a7943d6bc61da94a604

 SourceCode/Bond/Servo/CReadStep.cpp

@@ -1,6 +1,7 @@
#include "stdafx.h"
#include "CReadStep.h"
#include "Common.h"
#include "CEquipment.h"


namespace SERVO {
@@ -19,7 +20,11 @@
      m_hWorkThreadHandle = nullptr;
      m_hReadSignalOn = ::CreateEvent(NULL, TRUE, FALSE, NULL);
      m_hReadSignalOff = ::CreateEvent(NULL, TRUE, FALSE, NULL);
      m_nSignalType = 0;
      m_nCurStep = 0;
      m_szReturnBuf[1024] = {0};
      m_nReturnDataSize = 0;
      m_nReturnDevNo = 0;
   }

   CReadStep::~CReadStep()
@@ -37,14 +42,20 @@
   {
      m_nWriteSignalDev = dev;
   }
	
   void CReadStep::setReturnDev(int dev)
   {
      m_nReturnDevNo = dev;
   }

   void CReadStep::onReadSignal(BOOL bSignal)
   void CReadStep::onReadSignal(int nSignalType)
   {
      Lock();
      if (m_nCurStep == 0 && bSignal) {
      m_nSignalType = nSignalType;
      if (m_nCurStep == 0 && nSignalType != 0) {
         SetEvent(m_hReadSignalOn);
      }
      else if (m_nCurStep == 3 && !bSignal) {
      else if (m_nCurStep == 3 && nSignalType == 0) {
         SetEvent(m_hReadSignalOff);
      }

@@ -81,21 +92,31 @@
            nextStep();
            ASSERT(m_pCclink);
            if (0 == onReadData()) {
               if (m_listener.onEvent != nullptr) {
                  m_listener.onEvent(this, STEP_EVENT_READDATA, nullptr);
               ASSERT(m_pEquipment);
               m_pEquipment->onStepEvent(this, STEP_EVENT_READDATA);
            }

            // 0426新增
            // 1.1，写return code or data
            if (m_nReturnDataSize > 0) {
               int nWriteRet = m_pCclink->WriteData(m_station, (short)DeviceType::W,
                  m_nReturnDevNo, m_nReturnDataSize, (short*)m_szReturnBuf);
               if (0 != nWriteRet) {
                  onTimeout();
                  goto RESET;
               }
            }

            // 2.给对方写ON
            nextStep();
            m_pCclink->SetBitDevice(m_station, DeviceType::B, m_nWriteSignalDev);
            m_pCclink->SetBitDeviceEx(m_station, (long)DeviceType::B, m_nWriteSignalDev);


            // 3.等待对方OFF
            nextStep();
            int nStep3Ret = ::WaitForSingleObject(m_hReadSignalOff, TIMEOUT * 1000);
            if (nStep3Ret == WAIT_TIMEOUT) {
               m_pCclink->ResetBitDevice(m_station, DeviceType::B, m_nWriteSignalDev);
               m_pCclink->ResetBitDeviceEx(m_station, (long)DeviceType::B, m_nWriteSignalDev);
               onTimeout();
               goto RESET;
            }
@@ -104,16 +125,18 @@

            // 4.给对方写OFF
            nextStep();
            m_pCclink->ResetBitDevice(m_station, DeviceType::B, m_nWriteSignalDev);
            m_pCclink->ResetBitDeviceEx(m_station, (long)DeviceType::B, m_nWriteSignalDev);


            // 6.完成
            nextStep();
            if (0 == onComplete()) {
               if (m_listener.onEvent != nullptr) {
                  m_listener.onEvent(this, STEP_EVENT_COMPLETE, nullptr);
               }
               ASSERT(m_pEquipment);
               m_pEquipment->onStepEvent(this, STEP_EVENT_COMPLETE);
            }

            // 回复数据清空
            m_nReturnDataSize = 0;
         }
      }

@@ -129,10 +152,13 @@
   void CReadStep::getAttributeVector(CAttributeVector& attrubutes)
   {
      CStep::getAttributeVector(attrubutes);
      std::string strTemp;

      unsigned int weight = 21;
      attrubutes.addAttribute(new CAttribute("Current Step",
         std::to_string(m_nCurStep).c_str(), ""));
         std::to_string(m_nCurStep).c_str(), "", weight++));
      attrubutes.addAttribute(new CAttribute("Signal Dev",
         std::to_string(m_nWriteSignalDev).c_str(), ""));
         ("W" + CToolUnits::toHexString(m_nWriteSignalDev, strTemp)).c_str(), "", weight++));
   }

   void CReadStep::init()
@@ -184,4 +210,21 @@
   {
      return 0;
   }

   int CReadStep::setReturnCode(short code)
   {
      memcpy(m_szReturnBuf, &code, sizeof(short));
      m_nReturnDataSize = sizeof(short);

      return 0;
   }

   int CReadStep::setReturnData(const char* pszData, unsigned int size)
   {
      ASSERT(size < 1024);
      memcpy(m_szReturnBuf, pszData, size);
      m_nReturnDataSize = size;

      return 0;
   }
}