Merge branch 'clh' into liuyang

mrDarker

2025-06-19 ae6ef5e9343aba44b7547ecc4afab935ebdf4806

 SourceCode/Bond/Servo/CReadStep.cpp

@@ -22,6 +22,9 @@
      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()
@@ -38,6 +41,11 @@
   void CReadStep::setWriteSignalDev(int dev)
   {
      m_nWriteSignalDev = dev;
   }
	
   void CReadStep::setReturnDev(int dev)
   {
      m_nReturnDevNo = dev;
   }

   void CReadStep::onReadSignal(int nSignalType)
@@ -88,6 +96,17 @@
               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->SetBitDeviceEx(m_station, (long)DeviceType::B, m_nWriteSignalDev);
@@ -115,6 +134,9 @@
               ASSERT(m_pEquipment);
               m_pEquipment->onStepEvent(this, STEP_EVENT_COMPLETE);
            }

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

@@ -132,10 +154,11 @@
      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",
         ("W" + CToolUnits::toHexString(m_nWriteSignalDev, strTemp)).c_str(), ""));
         ("W" + CToolUnits::toHexString(m_nWriteSignalDev, strTemp)).c_str(), "", weight++));
   }

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

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

      return 0;
   }
}