From 4fafc27775bc8d7ae23fd8d15bae54547d706830 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 15 十一月 2024 09:21:12 +0800
Subject: [PATCH] Merge branch 'liuyang' into clh

---
 SourceCode/Bond/BondEq/Model.h |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/SourceCode/Bond/BondEq/Model.h b/SourceCode/Bond/BondEq/Model.h
index db77ee0..0feb0c9 100644
--- a/SourceCode/Bond/BondEq/Model.h
+++ b/SourceCode/Bond/BondEq/Model.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "Servo.h"
+#include "CBonder.h"
 #include "Configuration.h"
 
 
@@ -15,9 +15,8 @@
 	int init();
 	int term();
 	void onTimer(UINT nTimerid);
-	int createRemoteEqs();
-	CServo& getServo();
-	BEQ::IRemoteEquipment* getBond1();
+	CBonder& getBonder();
+	BEQ::IEquipment* getEquipment();
 
 public:
 	int notify(int code);
@@ -42,9 +41,8 @@
 	CString m_strDataDir;
 
 private:
-	CServo m_servo;
-	BEQ::IServo* m_pServo;
-	BEQ::IRemoteEquipment* m_pEqBond1;
+	CBonder m_bonder;
+	BEQ::IEquipment* m_pEquipment;
 	int m_nTimerID;
 };
 

--
Gitblit v1.9.3