From 072a953dd0bbec385cdf809f4403c1e975f13c37 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期三, 11 二月 2026 21:31:01 +0800
Subject: [PATCH] 1.客户说我们Status变量和Data变量搞反了。就是那个SxFx需要换过来,先标记下来,如确实需要修改再处理。
---
SourceCode/Bond/Servo/Model.cpp | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index ce8ee46..6785250 100644
--- a/SourceCode/Bond/Servo/Model.cpp
+++ b/SourceCode/Bond/Servo/Model.cpp
@@ -305,7 +305,7 @@
m_configuration.getUnitId(strUnitId);
// 鏈哄櫒鍨嬪彿鍜岃蒋浠剁増鏈彿搴斾粠閰嶇疆涓鍙栵紝褰撳墠鍏堝浐瀹氬��
- CString strModeType = _T("Master");
+ CString strModeType = _T("Panel Bonder");
CString strSoftRev = _T("1.0.2");
@@ -537,7 +537,7 @@
m_hsmsPassive.loadEquipmentConstants((LPTSTR)(LPCTSTR)strVarialbleFile);
setControlState(m_currentControlState);
refreshDerivedSVs();
- m_hsmsPassive.init(this, "APP", 7000);
+ m_hsmsPassive.init(this, "APP", 5000);
strVarialbleFile.Format(_T("%s\\ReportList.txt"), (LPTSTR)(LPCTSTR)m_strWorkDir);
m_hsmsPassive.loadReports((LPTSTR)(LPCTSTR)strVarialbleFile);
strVarialbleFile.Format(_T("%s\\CollectionEventList.txt"), (LPTSTR)(LPCTSTR)m_strWorkDir);
@@ -985,6 +985,8 @@
};
masterListener.onSVDataReport = [&](void* pMaster, SERVO::CEquipment* pEquipment, const std::vector<CParam>& params) {
(void)pMaster;
+ // 瀹㈡埛瑕佹眰鏆傛椂鍏虫帀SV涓婃姤锛屽皢鏉ユ崲鍙︿竴绉嶆柟寮�
+ /*
const int eqId = pEquipment ? pEquipment->getID() : 0;
auto sendSv = [&](const auto& vidMap, const char* evName) {
@@ -1028,6 +1030,7 @@
static constexpr std::array<int, 2> vids = { 6600, 6601 };
sendSv(vids, "MeasurementSVData");
}
+ */
};
masterListener.onProcessDataReport = [&](void* pMaster, SERVO::CEquipment* pEquipment, const std::vector<CParam>& params) {
(void)pMaster;
--
Gitblit v1.9.3