From 31aa10eaae103c30e02d7dc6c71ff4e50de361b3 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 12 五月 2025 15:28:32 +0800
Subject: [PATCH] 1. 修改报警的显示模式（包括日志，需要后期修复） 2. 添加Release模式编译
---
SourceCode/Bond/Servo/CBonder.cpp | 293 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 219 insertions(+), 74 deletions(-)
diff --git a/SourceCode/Bond/Servo/CBonder.cpp b/SourceCode/Bond/Servo/CBonder.cpp
index 136a15f..5ce0745 100644
--- a/SourceCode/Bond/Servo/CBonder.cpp
+++ b/SourceCode/Bond/Servo/CBonder.cpp
@@ -5,7 +5,7 @@
namespace SERVO {
CBonder::CBonder() : CEquipment()
{
-
+ m_nIndex = 0;
}
CBonder::~CBonder()
@@ -38,6 +38,208 @@
addPin(SERVO::PinType::OUTPUT, _T("Out"));
}
+ void CBonder::initSteps()
+ {
+ CEquipment::initSteps();
+
+
+ {
+ // eq mode
+ CEqModeStep* pStep = new CEqModeStep();
+ pStep->setName(STEP_MODE);
+ pStep->setWriteSignalDev(m_nIndex == 0 ? 0x350 : 0x650);
+ pStep->setModeDev(m_nIndex == 0 ? 0x9d7d : 0xdd7d);
+ if (addStep(STEP_ID_EQMODE_CHANGED, pStep) != 0) {
+ delete pStep;
+ }
+ }
+
+ {
+ // eq status
+ CEqStatusStep* pStep = new CEqStatusStep();
+ pStep->setName(STEP_STATUS);
+ pStep->setWriteSignalDev(m_nIndex == 0 ? 0x351 : 0x651);
+ pStep->setStatusDev(m_nIndex == 0 ? 0x9d59 : 0xdd59);
+ 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[2][5] = { { 0x9f0e , 0x9f3b, 0x9f68, 0x9f95, 0x9fc2 },
+ { 0xdf0e , 0xdf3b, 0xdf68, 0xdf95, 0xdfc2 } };
+ static int writeSignalDev[2][5] = { { 0x352, 0x353, 0x354, 0x355, 0x356 },
+ { 0x652, 0x653, 0x654, 0x655, 0x656 } };
+ 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[m_nIndex][i]);
+ pStep->setAlarmDev(dev[m_nIndex][i]);
+ if (addStep(addr[i], pStep) != 0) {
+ delete pStep;
+ }
+ }
+
+ }
+
+ {
+ // eq process
+ CEqProcessStep* pStep = new CEqProcessStep();
+ pStep->setName(STEP_PROCESS);
+ pStep->setWriteSignalDev(m_nIndex == 0 ? 0x357 : 0x657);
+ pStep->setProcessDev(m_nIndex == 0 ? 0xab55 : 0xeb55);
+ 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(m_nIndex == 0 ? 0x370 : 0x670);
+ pStep->setCimModeDev(m_nIndex == 0 ? 0x965 : 0x12b5);
+ 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(m_nIndex == 0 ? 0x371 : 0x671);
+ pStep->setCimMessageDev(m_nIndex == 0 ? 0x950 : 0x12a0);
+ 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(m_nIndex == 0 ? 0x348 : 0x648);
+ pStep->setDataDev(m_nIndex == 0 ? 0xa850 : 0xe850);
+ if (addStep(STEP_ID_CURRENT_RECIPE_CHANGE_REPORT, pStep) != 0) {
+ delete pStep;
+ }
+ }
+
+ {
+ // CIM Message Confirm
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT32, m_nIndex == 0 ? 0x9d80 : 0xdd80);
+ pStep->setName(STEP_EQ_CIM_MESSAGE_CONFIRM);
+ pStep->setWriteSignalDev(m_nIndex == 0 ? 0x359 : 0x659);
+ if (addStep(STEP_ID_CIM_MSG_CONFIRM_REPORT, pStep) != 0) {
+ delete pStep;
+ }
+ }
+
+ {
+ CEqCimMessageClearStep* pStep = new CEqCimMessageClearStep();
+ pStep->setName(STEP_CIM_MESSAGE_CLEAR);
+ pStep->setWriteSignalDev(m_nIndex == 0 ? 0x372 : 0x672);
+ pStep->setClearCimMessageDev(m_nIndex == 0 ? 0x963 : 0x12b3);
+ 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(m_nIndex == 0 ? 0x373 : 0x673);
+ pStep->setDateTimeDev(m_nIndex == 0 ? 0x966 : 0x12b6);
+ if (addStep(STEP_ID_DATETIME_SET_CMD_REPLY, pStep) != 0) {
+ delete pStep;
+ }
+ }
+
+ {
+ CEqModeChangeStep* pStep = new CEqModeChangeStep();
+ pStep->setName(STEP_EQ_MODE_CHANGE);
+ pStep->setWriteSignalDev(m_nIndex == 0 ? 0x375 : 0x675);
+ pStep->setEqModeDev(m_nIndex == 0 ? 0x96E : 0x12be);
+ 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(m_nIndex == 0 ? 0x366 : 0x666);
+ pStep->setDataDev(m_nIndex == 0 ? 0x125a : 0x1baa);
+ if (addStep(STEP_ID_MASTER_RECIPE_LIST_CMD_REPLY, pStep) != 0) {
+ delete pStep;
+ }
+ }
+
+ {
+ // master recipe list report
+ CEqReadStep* pStep = new CEqReadStep(m_nIndex == 0 ? 0xa955 : 0xe955, 255 * 2,
+ [&](int code, const char* pszData, size_t size) -> int {
+ if (code == ROK && pszData != nullptr && size > 0) {
+ // 此处解释配方数据
+ short ret = decodeRecipeListReport(pszData, size);
+ pStep->setReturnCode(ret);
+ }
+ pStep->setReturnCode(MRLRC_OK);
+ return -1;
+ });
+ pStep->setName(STEP_EQ_MASTER_RECIPE_LIST);
+ pStep->setWriteSignalDev(m_nIndex == 0 ? 0x34b : 0x64b);
+ pStep->setReturnDev(m_nIndex == 0 ? 0x126d : 0x1bbd);
+ if (addStep(STEP_ID_MASTER_RECIPE_LIST_REPORT, pStep) != 0) {
+ delete pStep;
+ }
+ }
+
+ {
+ CEqJobEventStep* pStep = new CEqJobEventStep();
+ pStep->setName(STEP_EQ_RECEIVED_JOB_UPS1);
+ pStep->setWriteSignalDev(m_nIndex == 0 ? 0x300 : 0x600);
+ pStep->setJobDataDev(m_nIndex == 0 ? 0x8c90 : 0xcc90);
+ if (addStep(STEP_ID_RECIVE_JOB_UPS1, pStep) != 0) {
+ delete pStep;
+ }
+ }
+ {
+ CEqJobEventStep* pStep = new CEqJobEventStep();
+ pStep->setName(STEP_EQ_RECEIVED_JOB_UPS2);
+ pStep->setWriteSignalDev(m_nIndex == 0 ? 0x301 : 0x601);
+ pStep->setJobDataDev(m_nIndex == 0 ? 0x8dd0 : 0xcdd0);
+ if (addStep(STEP_ID_RECIVE_JOB_UPS2, pStep) != 0) {
+ delete pStep;
+ }
+ }
+ {
+ CEqJobEventStep* pStep = new CEqJobEventStep();
+ pStep->setName(STEP_EQ_SENT_OUT_JOB_DOWNS1);
+ pStep->setWriteSignalDev(m_nIndex == 0 ? 0x310 : 0x610);
+ pStep->setJobDataDev(m_nIndex == 0 ? 0x8000 : 0xc000);
+ if (addStep(STEP_ID_SENT_OUT_JOB_DOWNS1, pStep) != 0) {
+ delete pStep;
+ }
+ }
+ {
+ CEqJobEventStep* pStep = new CEqJobEventStep();
+ pStep->setName(STEP_EQ_SENT_OUT_JOB_DOWNS2);
+ pStep->setWriteSignalDev(m_nIndex == 0 ? 0x311 : 0x611);
+ pStep->setJobDataDev(m_nIndex == 0 ? 0x8140 : 0xc140);
+ if (addStep(STEP_ID_SENT_OUT_JOB_DOWNS2, pStep) != 0) {
+ delete pStep;
+ }
+ }
+ }
+
void CBonder::onTimer(UINT nTimerid)
{
CEquipment::onTimer(nTimerid);
@@ -51,87 +253,30 @@
void CBonder::getAttributeVector(CAttributeVector& attrubutes)
{
__super::getAttributeVector(attrubutes);
-
- for (auto item : m_inputPins) {
- attrubutes.addAttribute(new CAttribute(item->getName().c_str(),
- std::to_string((int)item->getType()).c_str(), ""));
- }
-
- for (auto item : m_outputPins) {
- attrubutes.addAttribute(new CAttribute(item->getName().c_str(),
- std::to_string((int)item->getType()).c_str(), ""));
- }
-
- for (auto item : m_panelList) {
- attrubutes.addAttribute(new CAttribute("Panel",
- item->getID().c_str(), ""));
- }
}
int CBonder::recvIntent(CPin* pPin, CIntent* pIntent)
{
- ASSERT(pPin);
+ return __super::recvIntent(pPin, pIntent);
+ }
- CPin* pFromPin = pPin->getConnectedPin();
- ASSERT(pFromPin);
-
- CEquipment* pFromEq = pFromPin->getEquipment();
- ASSERT(pFromEq);
-
- LOGI("<CBonder><%s-%s>收到来自<%s.%s>的Intent<%d,%s,0x%x>",
- this->getName().c_str(),
- pPin->getName().c_str(),
- pFromEq->getName().c_str(),
- pFromPin->getName().c_str(),
- pIntent->getCode(),
- pIntent->getMsg(),
- pIntent->getContext());
-
-
-
- // 以下解释处理数据
- int code = pIntent->getCode();
-
-
- // 测试
- if (code == FLOW_TEST) {
- AfxMessageBox(pIntent->getMsg());
- return FLOW_ACCEPT;
+ BOOL CBonder::glassWillArrive(CGlass* pGlass)
+ {
+ BOOL bRet = __super::glassWillArrive(pGlass);
+ if (!bRet) {
+ return FALSE;
}
+ return m_glassList.empty();
+ }
- // 信号
- if (code == FLOW_SIGNAL) {
- return FLOW_ACCEPT;
- }
+ void CBonder::setIndex(unsigned int index)
+ {
+ m_nIndex = index;
+ }
-
- // 数据
- if (code == FLOW_SIGNAL) {
- return FLOW_ACCEPT;
- }
-
-
- // 物料
- if (code == FLOW_MOVE_MATERIAL) {
- // 如果我这里是空的，可以接受
- Lock();
- if (m_panelList.size() < 15) {
- CPanel* pPanel = (CPanel*)pIntent->getContext();
- ASSERT(pPanel);
- pPanel->addRef();
- m_panelList.push_back(pPanel);
- Unlock();
- return FLOW_ACCEPT;
- }
- else {
- Unlock();
- return FLOW_REJECT;
- }
- }
-
-
-
- return FLOW_ACCEPT;
+ unsigned int CBonder::getIndex()
+ {
+ return m_nIndex;
}
}
--
Gitblit v1.9.3