1.读取机器的Job Event上报； 2.修复在读取CC-Link数据当单元号超出32767时读取失败的问题。

LAPTOP-SNT8I5JK\Boounion

2025-04-12 016183bc4926c4fd80599dc7e06542c5396e6fd8

 SourceCode/Bond/Servo/CReadStep.cpp

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


namespace SERVO {
@@ -83,21 +84,20 @@
            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);
            }

            // 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;
            }
@@ -106,15 +106,14 @@

            // 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);
            }
         }
      }