From a79fcf6a937e1bfe57014d2c99f1bb9f98bfa892 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期二, 10 二月 2026 10:20:17 +0800
Subject: [PATCH] 1.完善日志； 2.背景图表配置 3.更改EAP通讯端口和设备名；
---
SourceCode/Bond/Servo/Model.cpp | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index 129d51d..4493f04 100644
--- a/SourceCode/Bond/Servo/Model.cpp
+++ b/SourceCode/Bond/Servo/Model.cpp
@@ -272,6 +272,9 @@
int seed = m_configuration.getPortCassetteSnSeed(i + 1);
m_master.setPortCassetteSnSeed(i + 1, seed);
}
+
+ // 鎸夎皟搴︽ā寮忚鍐欑敓浜х鍙ｉ厤缃�
+ m_master.applySchedulingModePortMapping();
}
void CModel::setPortType(unsigned int index, SERVO::PortType type)
@@ -302,7 +305,7 @@
m_configuration.getUnitId(strUnitId);
// 鏈哄櫒鍨嬪彿鍜岃蒋浠剁増鏈彿搴斾粠閰嶇疆涓鍙栵紝褰撳墠鍏堝浐瀹氬��
- CString strModeType = _T("Master");
+ CString strModeType = _T("Panel Bonder");
CString strSoftRev = _T("1.0.2");
@@ -534,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);
@@ -975,7 +978,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 +993,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 +1039,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]);
@@ -1129,6 +1132,7 @@
m_master.setCacheFilepath((LPTSTR)(LPCTSTR)strMasterDataFile);
m_master.setCompareMapsBeforeProceeding(m_configuration.isCompareMapsBeforeProceeding());
m_master.setJobMode(m_configuration.isJobMode());
+ m_master.setSchedulingMode((SERVO::SchedulingMode)m_configuration.getSchedulingMode());
// 鍔犳埅Job
strMasterDataFile.Format(_T("%s\\MasterState.dat"), (LPTSTR)(LPCTSTR)m_strWorkDir);
--
Gitblit v1.9.3