Merge branch 'clh' into liuyang

mrDarker

2025-06-26 da96e6da0b677c6a4e96308aaecd3d619a8e4db2

 SourceCode/Bond/Servo/CPageGraph2.cpp

@@ -265,14 +265,14 @@
      else if (nCmd == ID_EQSGRAPHITEM_TEST4) {
         SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;
         if (pEquipment != nullptr) {
            pEquipment->setLinkSignal(0, SIGNAL_UPSTREAM_INLINE, TRUE);
            pEquipment->setLinkSignal(0, SIGNAL_UPSTREAM_TROUBLE, FALSE);
            pEquipment->setLinkSignal(0, SIGNAL_INTERLOCK, TRUE);
            pEquipment->setLinkSignal(0, SIGNAL_SEND_ABLE, TRUE);
            pEquipment->setLinkSignal(1, SIGNAL_UPSTREAM_INLINE, TRUE);
            pEquipment->setLinkSignal(1, SIGNAL_UPSTREAM_TROUBLE, FALSE);
            pEquipment->setLinkSignal(1, SIGNAL_INTERLOCK, TRUE);
            pEquipment->setLinkSignal(1, SIGNAL_SEND_ABLE, TRUE);
            pEquipment->setLinkSignalUpstream(0, SIGNAL_UPSTREAM_INLINE, TRUE);
            pEquipment->setLinkSignalUpstream(0, SIGNAL_UPSTREAM_TROUBLE, FALSE);
            pEquipment->setLinkSignalUpstream(0, SIGNAL_INTERLOCK, TRUE);
            pEquipment->setLinkSignalUpstream(0, SIGNAL_SEND_ABLE, TRUE);
            pEquipment->setLinkSignalUpstream(1, SIGNAL_UPSTREAM_INLINE, TRUE);
            pEquipment->setLinkSignalUpstream(1, SIGNAL_UPSTREAM_TROUBLE, FALSE);
            pEquipment->setLinkSignalUpstream(1, SIGNAL_INTERLOCK, TRUE);
            pEquipment->setLinkSignalUpstream(1, SIGNAL_SEND_ABLE, TRUE);
         }

         if (pEquipment != nullptr && (pEquipment->getID() == EQ_ID_Bonder1
@@ -288,14 +288,14 @@
      else if (nCmd == ID_EQSGRAPHITEM_TEST5) {
         SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;
         if (pEquipment != nullptr) {
            pEquipment->setLinkSignal(0, SIGNAL_UPSTREAM_INLINE, TRUE);
            pEquipment->setLinkSignal(0, SIGNAL_UPSTREAM_TROUBLE, TRUE);
            pEquipment->setLinkSignal(0, SIGNAL_INTERLOCK, TRUE);
            pEquipment->setLinkSignal(0, SIGNAL_SEND_ABLE, FALSE);
            pEquipment->setLinkSignal(1, SIGNAL_UPSTREAM_INLINE, TRUE);
            pEquipment->setLinkSignal(1, SIGNAL_UPSTREAM_TROUBLE, TRUE);
            pEquipment->setLinkSignal(1, SIGNAL_INTERLOCK, TRUE);
            pEquipment->setLinkSignal(1, SIGNAL_SEND_ABLE, FALSE);
            pEquipment->setLinkSignalUpstream(0, SIGNAL_UPSTREAM_INLINE, TRUE);
            pEquipment->setLinkSignalUpstream(0, SIGNAL_UPSTREAM_TROUBLE, TRUE);
            pEquipment->setLinkSignalUpstream(0, SIGNAL_INTERLOCK, TRUE);
            pEquipment->setLinkSignalUpstream(0, SIGNAL_SEND_ABLE, FALSE);
            pEquipment->setLinkSignalUpstream(1, SIGNAL_UPSTREAM_INLINE, TRUE);
            pEquipment->setLinkSignalUpstream(1, SIGNAL_UPSTREAM_TROUBLE, TRUE);
            pEquipment->setLinkSignalUpstream(1, SIGNAL_INTERLOCK, TRUE);
            pEquipment->setLinkSignalUpstream(1, SIGNAL_SEND_ABLE, FALSE);
         }
      }
      else if (nCmd == ID_EQSGRAPHITEM_TEST6) {
@@ -379,7 +379,7 @@

         // 请求主配方列表
         if (pEquipment != nullptr) {
            pEquipment->masterRecipeListRequest(0);
            pEquipment->masterRecipeListRequest(0, nullptr);
         }         
      }