From e693f57ec7079cc8bfee498720b7cf87a67165ed Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期三, 27 八月 2025 18:18:30 +0800
Subject: [PATCH] 1.修复手臂状态显示序号不正确的问题;
---
SourceCode/Bond/EAPSimulator/CHsmsActive.cpp | 86 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 86 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/EAPSimulator/CHsmsActive.cpp b/SourceCode/Bond/EAPSimulator/CHsmsActive.cpp
index b084312..b334708 100644
--- a/SourceCode/Bond/EAPSimulator/CHsmsActive.cpp
+++ b/SourceCode/Bond/EAPSimulator/CHsmsActive.cpp
@@ -3,6 +3,8 @@
#include "Log.h"
+static unsigned int DATAID = 1;
+
CHsmsActive::CHsmsActive()
{
m_listener = {};
@@ -69,6 +71,10 @@
if (nStream == 5 && pHeader->function == 1) {
// S5F1
replyAck(5, 2, pMessage->getHeader()->systemBytes, 0, _T("ACK0"));
+ }
+ else if (nStream == 6 && pHeader->function == 11) {
+ // S5F1
+ replyAck(6, 12, pMessage->getHeader()->systemBytes, 0, _T("ACK0"));
}
};
@@ -343,6 +349,86 @@
return hsmsCarrierActionRequest(DATAID, "CarrierRelease", pszCarrierId, PTN);
}
+int CHsmsActive::hsmsPRJobMultiCreate(std::vector<SERVO::CProcessJob*>& pjs)
+{
+ IMessage* pMessage = nullptr;
+ int nRet = HSMS_Create1Message(pMessage, m_nSessionId, 16 | REPLY, 15, ++m_nSystemByte);
+ char szMF[32] = {14};
+ pMessage->getBody()->addU4Item(++DATAID, "DATAID");
+ auto itemPjs = pMessage->getBody()->addItem();
+ for (auto pj : pjs) {
+ auto itemPj = itemPjs->addItem();
+ itemPj->addItem(pj->id().c_str(), "PRJOBID");
+ itemPj->addBinaryItem(szMF, 1, "MF");
+ auto itemCarriers = itemPj->addItem();
+ for (auto c : pj->carriers()) {
+ auto itemCarrier = itemCarriers->addItem();
+ itemCarrier->addItem(c.carrierId.c_str(), "CARRIERID");
+ auto itemSlots = itemCarrier->addItem();
+ for (auto s : c.slots) {
+ itemSlots->addU1Item(s, "SLOTID");
+ }
+ }
+
+ auto recipeItems = itemPj->addItem();
+ recipeItems->addU1Item(1, "PRRECIPEMETHOD");
+ recipeItems->addItem(pj->recipeSpec().c_str(), "RCPSPEC");
+ recipeItems->addItem();
+
+ itemPj->addBoolItem(false, "PRPROCESSSTART");
+ itemPj->addItem();
+ }
+
+ m_pActive->sendMessage(pMessage);
+ HSMS_Destroy1Message(pMessage);
+
+ return 0;
+}
+
+int CHsmsActive::hsmsCreateControlJob(const char* pszControlJobId, std::vector<std::string>& processJobIds)
+{
+ char szBuffer[256];
+ sprintf_s(szBuffer, 256, "ControlJob:%s>", pszControlJobId);
+
+ IMessage* pMessage = nullptr;
+ int nRet = HSMS_Create1Message(pMessage, m_nSessionId, 14 | REPLY, 9, ++m_nSystemByte);
+ pMessage->getBody()->addItem(szBuffer, "OBJSPEC");
+ pMessage->getBody()->addItem("ControlJob", "OBJTYPE");
+ auto itemAttrs = pMessage->getBody()->addItem();
+
+ {
+ auto itemAttr = itemAttrs->addItem();
+ itemAttr->addItem("Priority", "ATTRID");
+ itemAttr->addU1Item(8, "ATTRDATA");
+ }
+
+ {
+ auto itemAttr = itemAttrs->addItem();
+ itemAttr->addItem("weight", "ATTRID");
+ itemAttr->addF4Item(60.5, "ATTRDATA");
+ }
+
+ {
+ auto itemAttr = itemAttrs->addItem();
+ itemAttr->addItem("tel", "ATTRID");
+ itemAttr->addItem("15919875007", "ATTRDATA");
+ }
+
+ {
+ auto itemAttr = itemAttrs->addItem();
+ itemAttr->addItem("PRJOBLIST", "ATTRID");
+ auto itemProcessJobs = itemAttr->addItem();
+ for (auto& item : processJobIds) {
+ itemProcessJobs->addItem(item.c_str(), "");
+ }
+ }
+
+ m_pActive->sendMessage(pMessage);
+ HSMS_Destroy1Message(pMessage);
+
+ return 0;
+}
+
int CHsmsActive::replyAck0(IMessage* pMessage)
{
return 0;
--
Gitblit v1.9.3