From 35199ad4aaa3f35ff82da77d7108a4e9f136443e Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期五, 06 十二月 2024 17:49:56 +0800
Subject: [PATCH] 1.修改配方管理模块，定位点等参数有最大值最小值 2.同步修改合并轴管理界面3.IO界面显示16个，16个为一组

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

diff --git a/SourceCode/Bond/BondEq/Model.h b/SourceCode/Bond/BondEq/Model.h
index 9a74296..1d243a3 100644
--- a/SourceCode/Bond/BondEq/Model.h
+++ b/SourceCode/Bond/BondEq/Model.h
@@ -1,6 +1,8 @@
 #pragma once
-#include "Bonder.h"
+#include "CBonder.h"
 #include "Configuration.h"
+#include "CPanel.h"
+#include "GB2860SQLite.h"
 
 
 class CModel
@@ -15,9 +17,8 @@
 	int init();
 	int term();
 	void onTimer(UINT nTimerid);
-	int createRemoteEqs();
 	CBonder& getBonder();
-	BEQ::IRemoteEquipment* getBond1();
+	BEQ::IEquipment* getEquipment();
 
 public:
 	int notify(int code);
@@ -31,6 +32,9 @@
 	int notifyTextAndInt(int code, const char* pszText, int exCode);
 	int notifyMesMsg(int code, int stream, int function, const char* pszText);
 
+private:
+	int savePanel(CPanel* pPanel, CComponent* pComponent);
+
 public:
 	CConfiguration m_configuration;
 
@@ -43,8 +47,8 @@
 
 private:
 	CBonder m_bonder;
-	BEQ::IServo* m_pServo;
-	BEQ::IRemoteEquipment* m_pEqBond1;
+	BEQ::IEquipment* m_pEquipment;
 	int m_nTimerID;
+	CGB2860SQLite m_sqlite;
 };
 

--
Gitblit v1.9.3