From 6dc80508b1c0f431007f8a8c947c152ec00c3d15 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 08 九月 2025 09:24:05 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/Model.h | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.h b/SourceCode/Bond/Servo/Model.h
index acba736..98f5e49 100644
--- a/SourceCode/Bond/Servo/Model.h
+++ b/SourceCode/Bond/Servo/Model.h
@@ -1,4 +1,9 @@
#pragma once
+#include "Configuration.h"
+#include "HsmsPassive.h"
+#include "CMaster.h"
+#include "CGlassPool.h"
+
class CModel
{
public:
@@ -6,7 +11,39 @@
~CModel();
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();
+
+public:
+ int notify(int code);
+ int notifyPtr(int code, void* ptr = NULL);
+ int notifyObj(int code, IRxObject* pObj);
+ int notifyObjAndPtr(int code, IRxObject* pObj, void* ptr);
+ int notifyObjAndInt(int code, IRxObject* pObj1, IRxObject* pObj2, int exCode);
+ int notifyInt(int code, int exCode);
+ int notifyInt2(int code, int exCode, int exCode2);
+ int notifyDouble(int code, double dValue);
+ int notifyText(int code, const char* pszText);
+ int notifyPtrAndInt(int code, void* ptr1, void* ptr2, int exCode);
+ int notifyTextAndInt(int code, const char* pszText, int exCode);
+ int notifyMesMsg(int code, int stream, int function, const char* pszText);
+
+public:
+ CConfiguration m_configuration;
+ CHsmsPassive m_hsmsPassive;
+ SERVO::CGlassPool m_glassPool;
+ SERVO::CMaster m_master;
+
+private:
+ IObservable* m_pObservable;
+ IObservableEmitter* m_pObservableEmitter;
+ CString m_strWorkDir;
+ CString m_strDataDir;
};
--
Gitblit v1.9.3