From da96e6da0b677c6a4e96308aaecd3d619a8e4db2 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 26 六月 2025 08:46:11 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CEquipmentPage1.cpp | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipmentPage1.cpp b/SourceCode/Bond/Servo/CEquipmentPage1.cpp
index 56c8cbd..684c23b 100644
--- a/SourceCode/Bond/Servo/CEquipmentPage1.cpp
+++ b/SourceCode/Bond/Servo/CEquipmentPage1.cpp
@@ -180,7 +180,7 @@
for (int nRow = 0; nRow < SIGNAL_GRID_ROWS; ++nRow) {
for (int nCol = 0; nCol < SIGNAL_GRID_COLS; ++nCol) {
- BOOL bCurrentState = m_pEquipment->isLinkSignalOn(nRow, nCol);
+ BOOL bCurrentState = m_pEquipment->isLinkSignalUpstreamOn(nRow, nCol);
UpdateSignalState(nRow, nCol, bCurrentState);
}
}
@@ -210,8 +210,8 @@
int index = nRow * SIGNAL_GRID_COLS + nCol;
if (index >= 0 && index < (int)m_vSignalList.size() && m_vSignalList[index].bClickable && m_pEquipment != nullptr) {
// 璇诲彇褰撳墠鐘舵�佸苟鍒囨崲
- const BOOL bCurrentState = m_pEquipment->isLinkSignalOn(nRow, nCol);
- m_pEquipment->setLinkSignal(nRow, nCol, !bCurrentState);
+ const BOOL bCurrentState = m_pEquipment->isLinkSignalUpstreamOn(nRow, nCol);
+ m_pEquipment->setLinkSignalUpstream(nRow, nCol, !bCurrentState);
}
});
--
Gitblit v1.9.3