From da96e6da0b677c6a4e96308aaecd3d619a8e4db2 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 26 六月 2025 08:46:11 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/Model.h | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.h b/SourceCode/Bond/Servo/Model.h
index 00733d2..d2c4e0c 100644
--- a/SourceCode/Bond/Servo/Model.h
+++ b/SourceCode/Bond/Servo/Model.h
@@ -1,6 +1,8 @@
#pragma once
#include "Configuration.h"
#include "HsmsPassive.h"
+#include "CMaster.h"
+#include "CGlassPool.h"
class CModel
{
@@ -10,7 +12,9 @@
public:
IObservable* getObservable();
+ SERVO::CMaster& getMaster();
void setWorkDir(const char* pszWorkDir);
+ void loadPortParams();
int init();
int term();
@@ -31,6 +35,8 @@
public:
CConfiguration m_configuration;
CHsmsPassive m_hsmsPassive;
+ SERVO::CGlassPool m_glassPool;
+ SERVO::CMaster m_master;
private:
IObservable* m_pObservable;
--
Gitblit v1.9.3