From 0f014b951cde5536f508eb4a7386ebbd3808e78d Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期五, 30 一月 2026 10:26:40 +0800
Subject: [PATCH] 1.修复lambda重命问题； 2.修复setVariableValue参数问题；
---
SourceCode/Bond/Servo/CMaster.h | 4 ++--
SourceCode/Bond/Servo/Model.cpp | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.h b/SourceCode/Bond/Servo/CMaster.h
index 2e9c280..20d4c3d 100644
--- a/SourceCode/Bond/Servo/CMaster.h
+++ b/SourceCode/Bond/Servo/CMaster.h
@@ -72,7 +72,7 @@
typedef std::function<void(void* pMaster, CEquipment* pEquipment, const std::vector<CParam>& params)> ONSVDATAREPORT;
typedef std::function<void(void* pMaster, CEquipment* pEquipment, int port, CJobDataS* pJobDataS)> ONJOBRECEIVED;
typedef std::function<void(void* pMaster, CEquipment* pEquipment, int port, CJobDataS* pJobDataS)> ONJOBSENTOUT;
- typedef std::function<void(void* pMaster, CEquipment* pEquipment, int unitId, int status, int reason)> ONEQSTATUSCHANGED;
+ typedef std::function<void(void* pMaster, CEquipment* pEquipment, int unitId, int status, int reason)> ONEQSTATUSCHANGEDEX;
typedef std::function<void(void* pMaster, int round)> ONCTROUNDEND;
typedef std::function<void(void* pMaster, void* pj)> ONPJSTART;
typedef std::function<void(void* pMaster)> ONCONTROLJOBCHANGED;
@@ -91,7 +91,7 @@
ONPROCESSDATAREPORTEX onProcessDataReport;
ONJOBRECEIVED onJobReceived;
ONJOBSENTOUT onJobSentOut;
- ONEQSTATUSCHANGED onEqStatusChanged;
+ ONEQSTATUSCHANGEDEX onEqStatusChanged;
ONCTROUNDEND onCTRoundEnd;
ONPJSTART onCjStart;
ONPJSTART onCjEnd;
diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index 129d51d..358a582 100644
--- a/SourceCode/Bond/Servo/Model.cpp
+++ b/SourceCode/Bond/Servo/Model.cpp
@@ -975,7 +975,7 @@
if (pEquipment == nullptr) return;
m_hsmsPassive.withVariableLock([&] {
m_hsmsPassive.setVariableValue("SubEqpName", pEquipment->getName().c_str());
- m_hsmsPassive.setVariableValue("SubEqpSlot", unitId);
+ m_hsmsPassive.setVariableValue("SubEqpSlot", (__int64)unitId);
m_hsmsPassive.setVariableValue("EquipmentStatus", (__int64)status);
m_hsmsPassive.requestEventReportSend("SubEqpStateChange");
});
@@ -990,7 +990,7 @@
if (pEquipment != nullptr) {
m_hsmsPassive.setVariableValue("SubEqpName", pEquipment->getName().c_str());
}
- m_hsmsPassive.setVariableValue("SubEqpSlot", 0);
+ m_hsmsPassive.setVariableValue("SubEqpSlot", (__int64)0);
m_hsmsPassive.setVariableValue("Clock", CToolUnits::getCurrentTimeString().c_str());
for (size_t idx = 0; idx < count; ++idx) {
const std::string val = formatParamValue(params[idx]);
@@ -1036,7 +1036,7 @@
if (pEquipment != nullptr) {
m_hsmsPassive.setVariableValue("SubEqpName", pEquipment->getName().c_str());
}
- m_hsmsPassive.setVariableValue("SubEqpSlot", 0);
+ m_hsmsPassive.setVariableValue("SubEqpSlot", (__int64)0);
m_hsmsPassive.setVariableValue("Clock", CToolUnits::getCurrentTimeString().c_str());
for (size_t idx = 0; idx < count; ++idx) {
const std::string val = formatParamValue(params[idx]);
--
Gitblit v1.9.3