From 7c35ff8d9a626f69a8a8b7de3d73dc9d73de9dd7 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期六, 13 九月 2025 10:51:32 +0800
Subject: [PATCH] 1. 解决读取报警文件错误的问题,提高兼容性(可能文件是在MacOS编辑的,导致换行符不一样)

---
 SourceCode/Bond/Servo/Model.cpp |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index 6f2111e..b100f14 100644
--- a/SourceCode/Bond/Servo/Model.cpp
+++ b/SourceCode/Bond/Servo/Model.cpp
@@ -51,6 +51,9 @@
 			cassetteType, transferMode, autoChangeEnable);
 		m_master.setPortType(i, portEnable, portType, portMode, cassetteType,
 			transferMode, autoChangeEnable);
+
+		int seed = m_configuration.getPortCassetteSnSeed(i + 1);
+		m_master.setPortCassetteSnSeed(i + 1, seed);
 	}
 }
 
@@ -437,6 +440,10 @@
 		m_hsmsPassive.requestEventReportSend_Panel_End();
 		auto& db = GlassLogDb::Instance();
 		db.insertFromCGlass((*(SERVO::CGlass*)pPanel));
+		SERVO::CGlass* pBuddy = ((SERVO::CGlass*)pPanel)->getBuddy();
+		if (pBuddy != nullptr) {
+			db.insertFromCGlass(*pBuddy);
+		}
 	};
 	m_master.setListener(masterListener);
 	m_master.setContinuousTransferCount(m_configuration.getContinuousTransferCount());

--
Gitblit v1.9.3