From fc8d367963a16de61dfbc4a0ff34c78c91ec2cfe Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 05 九月 2025 09:21:28 +0800
Subject: [PATCH] Merge branch 'liuyang' into clh
---
SourceCode/Bond/Servo/Model.h | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.h b/SourceCode/Bond/Servo/Model.h
index 00733d2..98f5e49 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,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();
@@ -31,6 +37,8 @@
public:
CConfiguration m_configuration;
CHsmsPassive m_hsmsPassive;
+ SERVO::CGlassPool m_glassPool;
+ SERVO::CMaster m_master;
private:
IObservable* m_pObservable;
--
Gitblit v1.9.3