From f5c4a7f3bce165fe2c8c6d934f0f49a363a2ea60 Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期五, 15 十一月 2024 09:19:31 +0800
Subject: [PATCH] Merge branch 'master' into liuyang

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

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

--
Gitblit v1.9.3