Merge branch 'clh' into liuyang

mrDarker

2025-09-11 d64036c0510cf06009a7252e318d828fbc2658f0

 SourceCode/Bond/Servo/CLoadPort.cpp

@@ -44,7 +44,7 @@
   void CLoadPort::initPins()
   {
      // 加入Pin初始化代码
      LOGI("<CLoadPort>initPins");
      LOGD("<CLoadPort>initPins");
      addPin(SERVO::PinType::INPUT, _T("In"));
      addPin(SERVO::PinType::OUTPUT, _T("Out"));
   }
@@ -983,7 +983,7 @@
            LOGI("<CLoadPort-%d>设置Port type成功.", m_nIndex);
         }
         else {
            LOGI("<CLoadPort-%d>设置Port type失败，code:%d", m_nIndex, code);
            LOGE("<CLoadPort-%d>设置Port type失败，code:%d", m_nIndex, code);
         }
         if (onWritedBlock != nullptr) {
            return onWritedBlock(code);
@@ -1013,7 +1013,7 @@
            LOGI("<CLoadPort-%d>%s Port成功.", m_nIndex, bEnable ? _T("启用") : _T("禁用"));
         }
         else {
            LOGI("<CLoadPort-%d>%s  Port失败，code:%d", m_nIndex, bEnable ? _T("启用") : _T("禁用"), code);
            LOGE("<CLoadPort-%d>%s  Port失败，code:%d", m_nIndex, bEnable ? _T("启用") : _T("禁用"), code);
         }
         if (onWritedBlock != nullptr) {
            return onWritedBlock(code);
@@ -1042,7 +1042,7 @@
            LOGI("<CLoadPort-%d>设置Port mode成功.", m_nIndex);
         }
         else {
            LOGI("<CLoadPort-%d>设置Port mode失败，code:%d", m_nIndex, code);
            LOGE("<CLoadPort-%d>设置Port mode失败，code:%d", m_nIndex, code);
         }
         if (onWritedBlock != nullptr) {
            return onWritedBlock(code);
@@ -1071,7 +1071,7 @@
            LOGI("<CLoadPort-%d>设置Cassette Type成功.", m_nIndex);
         }
         else {
            LOGI("<CLoadPort-%d>设置Cassette Type失败，code:%d", m_nIndex, code);
            LOGE("<CLoadPort-%d>设置Cassette Type失败，code:%d", m_nIndex, code);
         }
         if (onWritedBlock != nullptr) {
            return onWritedBlock(code);
@@ -1100,7 +1100,7 @@
            LOGI("<CLoadPort-%d>设置Transfer mode成功.", m_nIndex + 1);
         }
         else {
            LOGI("<CLoadPort-%d>设置Transfer mode失败，code:%d", m_nIndex + 1, code);
            LOGE("<CLoadPort-%d>设置Transfer mode失败，code:%d", m_nIndex + 1, code);
         }
         if (onWritedBlock != nullptr) {
            return onWritedBlock(code);
@@ -1129,7 +1129,7 @@
            LOGI("<CLoadPort-%d>%s Auto Change成功.", m_nIndex, bEnable ? _T("启用") : _T("禁用"));
         }
         else {
            LOGI("<CLoadPort-%d>%s  Auto Change失败，code:%d", m_nIndex, bEnable ? _T("启用") : _T("禁用"), code);
            LOGE("<CLoadPort-%d>%s  Auto Change失败，code:%d", m_nIndex, bEnable ? _T("启用") : _T("禁用"), code);
         }
         if (onWritedBlock != nullptr) {
            return onWritedBlock(code);
@@ -1209,7 +1209,7 @@

         CGlass* pGlass = theApp.m_model.m_glassPool.allocaGlass();
         pGlass->setOriginPort(m_nIndex, i);
         pGlass->addPath(m_nID, 0);
         pGlass->addPath(m_nID, 0, i + 1);
         pGlass->processEnd(m_nID, 0);
         pGlass->setID(szBuffer);
         pGlass->setType(type);
@@ -1249,7 +1249,7 @@
         CGlass* pGlass = theApp.m_model.m_glassPool.allocaGlass();
         pGlass->setOriginPort(m_nIndex, i);
         pGlass->setScheduledForProcessing(i % 2 == 1);
         pGlass->addPath(m_nID, 0);
         pGlass->addPath(m_nID, 0, i + 1);
         pGlass->processEnd(m_nID, 0);
         pGlass->setID(szBuffer);
         pGlass->setType(m_cassetteType);
@@ -1289,7 +1289,7 @@

         CGlass* pGlass = theApp.m_model.m_glassPool.allocaGlass();
         pGlass->setOriginPort(m_nIndex, nSlotIndex);
         pGlass->addPath(m_nID, 0);
         pGlass->addPath(m_nID, 0, slot.nSlotID);
         pGlass->processEnd(m_nID, 0);
         pGlass->setID(szBuffer);
         pGlass->setType(static_cast<SERVO::MaterialsType>(config.nMaterialType));