From 21407e7ee3acce124d761fb562aee9f31033d42a Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期三, 04 六月 2025 12:01:21 +0800
Subject: [PATCH] Merge branch 'clh'
---
SourceCode/Bond/Servo/CBonder.cpp | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/Servo/CBonder.cpp b/SourceCode/Bond/Servo/CBonder.cpp
index 8be694e..c7bd953 100644
--- a/SourceCode/Bond/Servo/CBonder.cpp
+++ b/SourceCode/Bond/Servo/CBonder.cpp
@@ -342,13 +342,13 @@
m_slot[0].enable();
m_slot[0].setPosition(m_nID);
m_slot[0].setNo(1);
- m_slot[0].setName("Slot 1(G1)");
- m_slot[0].setType(MaterialsType::G1);
+ m_slot[0].setName("Slot 1(G2)");
+ m_slot[0].setType(MaterialsType::G2);
m_slot[1].enable();
m_slot[1].setPosition(m_nID);
m_slot[1].setNo(2);
- m_slot[1].setName("Slot 2(G2)");
- m_slot[1].setType(MaterialsType::G2);
+ m_slot[1].setName("Slot 2(G1)");
+ m_slot[1].setType(MaterialsType::G1);
}
void CBonder::onTimer(UINT nTimerid)
--
Gitblit v1.9.3