1.配方列表获取完善；

LAPTOP-SNT8I5JK\Boounion

2025-07-30 90ae1c3db92833354814484e65f8cd2eef1f5f3e

 SourceCode/Bond/Servo/CMeasurement.cpp

@@ -38,6 +38,360 @@
      addPin(SERVO::PinType::OUTPUT, _T("Out2"));
   }

   void CMeasurement::initSteps()
   {
      CEquipment::initSteps();

      {
         // eq mode
         CEqModeStep* pStep = new CEqModeStep();
         pStep->setName(STEP_MODE);
         pStep->setWriteSignalDev(0xf40);
         pStep->setModeDev(0x19d7d);
         if (addStep(STEP_ID_EQMODE_CHANGED, pStep) != 0) {
            delete pStep;
         }
      }

      {
         // eq status
         CEqStatusStep* pStep = new CEqStatusStep();
         pStep->setName(STEP_STATUS);
         pStep->setWriteSignalDev(0xf41);
         pStep->setStatusDev(0x19d59);
         if (addStep(STEP_ID_EQSTATUS_CHANGED, pStep) != 0) {
            delete pStep;
         }
      }

      {
         // Eq Alarm
         static char* pszName[] = { STEP_ALARM_BLOCK1, STEP_ALARM_BLOCK2, STEP_ALARM_BLOCK3, STEP_ALARM_BLOCK4, STEP_ALARM_BLOCK5 };
         static int dev[5] = { 0x19f0e , 0x19f3b, 0x19f68, 0x19f95, 0x19fc2 };
         static int writeSignalDev[5] = { 0xf42, 0xf43, 0xf44, 0xf45, 0xf46 };
         static int addr[] = { STEP_ID_EQALARM1, STEP_ID_EQALARM2, STEP_ID_EQALARM3, STEP_ID_EQALARM4, STEP_ID_EQALARM5 };

         for (int i = 0; i < 5; i++) {
            CEqAlarmStep* pStep = new CEqAlarmStep();
            pStep->setName(pszName[i]);
            pStep->setWriteSignalDev(writeSignalDev[i]);
            pStep->setAlarmDev(dev[i]);
            if (addStep(addr[i], pStep) != 0) {
               delete pStep;
            }
         }

      }

      {
         CEqReadStep* pStep = new CEqReadStep(0x1ab55, 538 * 2,
            [&](void* pFrom, int code, const char* pszData, size_t size) -> int {
               if (code == ROK && pszData != nullptr && size > 0) {
                  decodeProcessDataReport((CStep*)pFrom, pszData, size);
               }
               return -1;
            });
         pStep->setName(STEP_PROCESS);
         pStep->setWriteSignalDev(0xf47);
         if (addStep(STEP_ID_PROCESS_DATA_REPORT, pStep) != 0) {
            delete pStep;
         }
      }

      {
         // eq cim mode change
         CEqCimModeChangeStep* pStep = new CEqCimModeChangeStep();
         pStep->setName(STEP_CIM_MODE_CHANGE);
         pStep->setWriteSignalDev(0xf60);
         pStep->setCimModeDev(0x2ea5);
         if (addStep(STEP_ID_CIMMODE_CHANGED_CMD_REPLY, pStep) != 0) {
            delete pStep;
         }
      }

      {
         // eq cim message cmd
         CEqCimMessageCmdStep* pStep = new CEqCimMessageCmdStep();
         pStep->setName(STEP_CIM_MESSAGE_CMD);
         pStep->setWriteSignalDev(0xf61);
         pStep->setCimMessageDev(0x2e90);
         if (addStep(STEP_ID_CIM_MSG_SET_CMD_REPLY, pStep) != 0) {
            delete pStep;
         }
      }

      {
         // eq current recipe change
         CEqCurrentRecipeChangeStep* pStep = new CEqCurrentRecipeChangeStep();
         pStep->setName(STEP_EQ_RURRENT_RECIPE_CHANGE);
         pStep->setWriteSignalDev(0xf48);
         pStep->setDataDev(0x1a850);
         if (addStep(STEP_ID_CURRENT_RECIPE_CHANGE_REPORT, pStep) != 0) {
            delete pStep;
         }
      }

      {
         // CIM Message Confirm
         // 要将int32的值拆分为两个short, 分别为msg id和panel id
         // 65538, 2Ϊmsg id, 1Ϊpanel id
         CEqReadIntStep* pStep = new CEqReadIntStep(__INT32, 0x19d80);
         pStep->setName(STEP_EQ_CIM_MESSAGE_CONFIRM);
         pStep->setWriteSignalDev(0xf49);
         if (addStep(STEP_ID_CIM_MSG_CONFIRM_REPORT, pStep) != 0) {
            delete pStep;
         }
      }

      {
         CEqCimMessageClearStep* pStep = new CEqCimMessageClearStep();
         pStep->setName(STEP_CIM_MESSAGE_CLEAR);
         pStep->setWriteSignalDev(0xf62);
         pStep->setClearCimMessageDev(0x2ea3);
         if (addStep(STEP_ID_CIM_MSG_CLEAR_CMD_REPLY, pStep) != 0) {
            delete pStep;
         }
      }

      {
         CEqDateTimeSetCmdStep* pStep = new CEqDateTimeSetCmdStep();
         pStep->setName(STEP_DATETIME_SET_CMD);
         pStep->setWriteSignalDev(0xf63);
         pStep->setDateTimeDev(0x2ea6);
         if (addStep(STEP_ID_DATETIME_SET_CMD_REPLY, pStep) != 0) {
            delete pStep;
         }
      }

      {
         CEqModeChangeStep* pStep = new CEqModeChangeStep();
         pStep->setName(STEP_EQ_MODE_CHANGE);
         pStep->setWriteSignalDev(0xf65);
         pStep->setEqModeDev(0x2eae);
         if (addStep(STEP_ID_EQMODE_CHANGE_CMD_REPLY, pStep) != 0) {
            delete pStep;
         }
      }

      {
         // 请求主配方列表的step
         CEqWriteStep* pStep = new CEqWriteStep();
         pStep->setName(STEP_EQ_MASTER_RECIPE_LIST_REQ);
         pStep->setWriteSignalDev(0xf66);
         pStep->setDataDev(0x379a);
         if (addStep(STEP_ID_MASTER_RECIPE_LIST_CMD_REPLY, pStep) != 0) {
            delete pStep;
         }
      }

      {
         // master recipe list report
         CEqReadStep* pStep = new CEqReadStep(0x1a955, 255 * 2,
            [&](void* pFrom, int code, const char* pszData, size_t size) -> int {
               CEqReadStep* pTmpStep = (CEqReadStep*)pFrom;
               short ret = MRLRC_OK;
               if (code == ROK && pszData != nullptr && size > 0) {
                  // 此处解释配方数据
                  ret = decodeRecipeListReport(pszData, size);
               }
               pTmpStep->setReturnCode(ret);
               return -1;
            });
         pStep->setName(STEP_EQ_MASTER_RECIPE_LIST);
         pStep->setWriteSignalDev(0xf4b);
         pStep->setReturnDev(0x37ad);
         if (addStep(STEP_ID_MASTER_RECIPE_LIST_REPORT, pStep) != 0) {
            delete pStep;
         }
      }

      {
         // 请求配方参数
         //CEqWriteStep* pStep = new CEqWriteStep();
         //pStep->setName(STEP_EQ_RECIPE_PARAMETER_REQ);
         //pStep->setWriteSignalDev(0xf67);
         //pStep->setDataDev(0x379b);
         //if (addStep(STEP_ID_RECIPE_PARAMETER_CMD_REPLY, pStep) != 0) {
         //   delete pStep;
         //}
      }

      {
         // recipe parameter report
         //CEqReadStep* pStep = new CEqReadStep(0x1aa54, 257 * 2,
         //   [&](void* pFrom, int code, const char* pszData, size_t size) -> int {
         //      if (code == ROK && pszData != nullptr && size > 0) {
         //         // 此处解释配方数据
         //         short ret = decodeRecipeParameterReport(pszData, size);
         //         pStep->setReturnCode(ret);
         //      }
         //      pStep->setReturnCode(MRLRC_OK);
         //      return -1;
         //   });
         //pStep->setName(STEP_EQ_RECIPE_PARAMETER);
         //pStep->setWriteSignalDev(0xf4c);
         //pStep->setReturnDev(m_nIndex == 0 ? 0x126c : 0x1bbc);
         //if (addStep(STEP_ID_RECIPE_PARAMETER_REPORT, pStep) != 0) {
         //   delete pStep;
         //}
      }

      // 使用CEqReadStep替换CEqJobEventStep
      {
         // Received Job Report Upstream #1~9
         char szBuffer[256];
         for (int i = 0; i < 1; i++) {
            CEqReadStep* pStep = new CEqReadStep(0x18c90 + 320 * i, 320 * 2,
               [&](void* pFrom, int code, const char* pszData, size_t size) -> int {
                  if (code == ROK && pszData != nullptr && size > 0) {
                     int port = (int)(__int64)((CEqReadStep*)pFrom)->getProp("Port");
                     if (port > 0) {
                        decodeReceivedJobReport((CStep*)pFrom, port, pszData, size);
                     }
                  }
                  return -1;
               });
            sprintf_s(szBuffer, "%s%d", STEP_EQ_RECEIVED_JOB_UPSn, i + 1);
            pStep->setName(szBuffer);
            pStep->setProp("Port", (void*)(__int64)(i + 1));
            pStep->setWriteSignalDev(0xf00 + i);
            if (addStep(STEP_ID_RECIVE_JOB_UPS1 + i, pStep) != 0) {
               delete pStep;
            }
         }
      }

      {
         // Sent Out Job Report Downstream #1~9
         char szBuffer[256];
         for (int i = 0; i < 1; i++) {
            CEqReadStep* pStep = new CEqReadStep(0x18000 + 320 * i, 320 * 2,
               [&](void* pFrom, int code, const char* pszData, size_t size) -> int {
                  if (code == ROK && pszData != nullptr && size > 0) {
                     int port = (int)(__int64)((CEqReadStep*)pFrom)->getProp("Port");
                     if (port > 0) {
                        decodeSentOutJobReport((CStep*)pFrom, port, pszData, size);
                     }
                  }
                  return -1;
               });
            sprintf_s(szBuffer, "%s%d", STEP_EQ_SENT_OUT_JOB_DOWNSn, i + 1);
            pStep->setName(szBuffer);
            pStep->setProp("Port", (void*)(__int64)(i + 1));
            pStep->setWriteSignalDev(0xf0a + i);
            if (addStep(STEP_ID_SENT_OUT_JOB_DOWNS1 + i, pStep) != 0) {
               delete pStep;
            }
         }
      }

      {
         // Fetched Out Job Report #1~15
         char szBuffer[256];
         for (int i = 0; i < 1; i++) {
            CEqReadStep* pStep = new CEqReadStep(0x19c31 + 18 * i, 18 * 2,
               [&](void* pFrom, int code, const char* pszData, size_t size) -> int {
                  if (code == ROK && pszData != nullptr && size > 0) {
                     int port = (int)(__int64)((CEqReadStep*)pFrom)->getProp("Port");
                     if (port > 0) {
                        decodeFetchedOutJobReport((CStep*)pFrom, port, pszData, size);
                     }
                  }
                  return -1;
               });
            sprintf_s(szBuffer, "%s%d", STEP_EQ_FETCHED_OUT_JOBn, i + 1);
            pStep->setName(szBuffer);
            pStep->setProp("Port", (void*)(__int64)(i + 1));
            pStep->setWriteSignalDev(0xf23 + i);
            if (addStep(STEP_ID_FETCHED_OUT_JOB_REPORT1 + i, pStep) != 0) {
               delete pStep;
            }
         }
      }

      {
         // Stored Job Report #1~15
         char szBuffer[256];
         for (int i = 0; i < 1; i++) {
            CEqReadStep* pStep = new CEqReadStep(0x19b23 + 18 * i, 18 * 2,
               [&](void* pFrom, int code, const char* pszData, size_t size) -> int {
                  if (code == ROK && pszData != nullptr && size > 0) {
                     int port = (int)(__int64)((CEqReadStep*)pFrom)->getProp("Port");
                     if (port > 0) {
                        decodeStoredJobReport((CStep*)pFrom, port, pszData, size);
                     }
                  }
                  return -1;
               });
            sprintf_s(szBuffer, "%s%d", STEP_EQ_STORED_JOBn, i + 1);
            pStep->setName(szBuffer);
            pStep->setProp("Port", (void*)(__int64)(i + 1));
            pStep->setWriteSignalDev(0xf14 + i);
            if (addStep(STEP_ID_STORE_JOB_REPORT1 + i, pStep) != 0) {
               delete pStep;
            }
         }
      }

      // process start/end report
      {
         CEqReadStep* pStep = new CEqReadStep(0x19D3F, 13 * 2,
            [&](void* pFrom, int code, const char* pszData, size_t size) -> int {
               if (code == ROK && pszData != nullptr && size > 0) {
                  decodeJobProcessStartReport((CStep*)pFrom, pszData, size);
               }
               return -1;
            });
         pStep->setName(STEP_EQ_JOB_PROCESS_START_REPORT);
         pStep->setProp("Port", (void*)1);
         pStep->setWriteSignalDev(0xf33);
         if (addStep(STEP_ID_JOB_PROCESS_START_REPORT, pStep) != 0) {
            delete pStep;
         }
      }
      {
         CEqReadStep* pStep = new CEqReadStep(0x19D4C, 13 * 2,
            [&](void* pFrom, int code, const char* pszData, size_t size) -> int {
               if (code == ROK && pszData != nullptr && size > 0) {
                  decodeJobProcessEndReport((CStep*)pFrom, pszData, size);
               }
               return -1;
            });
         pStep->setName(STEP_EQ_JOB_PROCESS_END_REPORT);
         pStep->setProp("Port", (void*)1);
         pStep->setWriteSignalDev(0xf34);
         if (addStep(STEP_ID_JOB_PROCESS_END_REPORT, pStep) != 0) {
            delete pStep;
         }
      }

      {
         // Panel Data Report
         CEqReadStep* pStep = new CEqReadStep(0x1A17f, 386 * 2,
            [&](void* pFrom, int code, const char* pszData, size_t size) -> int {
               if (code == ROK && pszData != nullptr && size > 0) {
                  decodePanelDataReport((CStep*)pFrom, pszData, size);
               }
               return -1;
            });
         pStep->setName(STEP_EQ_PANEL_DATA_REPORT);
         pStep->setProp("Port", (void*)1);
         pStep->setWriteSignalDev(0x105e);
         if (addStep(STEP_ID_PANEL_DATA_REPORT, pStep) != 0) {
            delete pStep;
         }
      }
   }

   // 必须要实现的虚函数，在此初始化Slot信息
   void CMeasurement::initSlots()
   {
      m_slot[0].enable();
      m_slot[0].setPosition(m_nID);
      m_slot[0].setNo(1);
      m_slot[0].setName("Slot 1");
   }

   void CMeasurement::onTimer(UINT nTimerid)
   {
      CEquipment::onTimer(nTimerid);
@@ -56,16 +410,6 @@
   int CMeasurement::recvIntent(CPin* pPin, CIntent* pIntent)
   {
      return __super::recvIntent(pPin, pIntent);
   }

   BOOL CMeasurement::glassWillArrive(CGlass* pGlass)
   {
      BOOL bRet = __super::glassWillArrive(pGlass);
      if (!bRet) {
         return FALSE;
      }

      return m_glassList.empty();
   }

   int CMeasurement::getIndexerOperationModeBaseValue()