From 4849a5172d454dd2f95a956f4662606f5f3a68ff Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 08 九月 2025 09:43:08 +0800
Subject: [PATCH] 1. 代码合并冲突，重新提交

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

diff --git a/SourceCode/Bond/Servo/Model.h b/SourceCode/Bond/Servo/Model.h
index a4985ed..98f5e49 100644
--- a/SourceCode/Bond/Servo/Model.h
+++ b/SourceCode/Bond/Servo/Model.h
@@ -12,7 +12,11 @@
 
 public:
 	IObservable* getObservable();
+	SERVO::CMaster& getMaster();
 	void setWorkDir(const char* pszWorkDir);
+	void loadPortParams();
+	void setPortCassetteType(unsigned int index, SERVO::CassetteType type);
+	void setPortEnable(unsigned int index, BOOL bEnable);
 	int init();
 	int term();
 

--
Gitblit v1.9.3