From cbe189228810812547d16a3211ab0b174831f609 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 24 三月 2025 11:56:04 +0800
Subject: [PATCH] 1.修复一个闪退问题(Glass列表为空仍要下传导致)； 2.在CEquipment派生类中实现限制上游移动（如下在加工且加工数量有限制）；
---
SourceCode/Bond/Servo/Model.h | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.h b/SourceCode/Bond/Servo/Model.h
index b6b954f..3b92364 100644
--- a/SourceCode/Bond/Servo/Model.h
+++ b/SourceCode/Bond/Servo/Model.h
@@ -1,5 +1,7 @@
#pragma once
#include "Configuration.h"
+#include "HsmsPassive.h"
+#include "CMaster.h"
class CModel
{
@@ -12,6 +14,7 @@
void setWorkDir(const char* pszWorkDir);
int init();
int term();
+ bool isAlarmStep(SERVO::CStep* pStep);
public:
int notify(int code);
@@ -29,6 +32,8 @@
public:
CConfiguration m_configuration;
+ CHsmsPassive m_hsmsPassive;
+ SERVO::CMaster m_master;
private:
IObservable* m_pObservable;
--
Gitblit v1.9.3