From 7c35ff8d9a626f69a8a8b7de3d73dc9d73de9dd7 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期六, 13 九月 2025 10:51:32 +0800
Subject: [PATCH] 1. 解决读取报警文件错误的问题，提高兼容性（可能文件是在MacOS编辑的，导致换行符不一样）
---
SourceCode/Bond/Servo/Model.h | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.h b/SourceCode/Bond/Servo/Model.h
index b6b954f..98f5e49 100644
--- a/SourceCode/Bond/Servo/Model.h
+++ b/SourceCode/Bond/Servo/Model.h
@@ -1,5 +1,8 @@
#pragma once
#include "Configuration.h"
+#include "HsmsPassive.h"
+#include "CMaster.h"
+#include "CGlassPool.h"
class CModel
{
@@ -9,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();
@@ -29,6 +36,9 @@
public:
CConfiguration m_configuration;
+ CHsmsPassive m_hsmsPassive;
+ SERVO::CGlassPool m_glassPool;
+ SERVO::CMaster m_master;
private:
IObservable* m_pObservable;
--
Gitblit v1.9.3