From 258d9d2d72bbf199cd86fd3e7bd824e1f117bab8 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 29 五月 2025 17:49:46 +0800
Subject: [PATCH] 1.放片物流控制和模拟测试；
---
SourceCode/Bond/Servo/Model.cpp | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index 95183ef..c991c64 100644
--- a/SourceCode/Bond/Servo/Model.cpp
+++ b/SourceCode/Bond/Servo/Model.cpp
@@ -5,6 +5,7 @@
#include "ToolUnits.h"
#include "CEqAlarmStep.h"
#include "AlarmManager.h"
+#include "CGlassPool.h"
CModel::CModel()
@@ -28,6 +29,11 @@
return m_pObservable;
}
+SERVO::CMaster& CModel::getMaster()
+{
+ return m_master;
+}
+
void CModel::setWorkDir(const char* pszWorkDir)
{
m_strWorkDir = pszWorkDir;
@@ -45,6 +51,9 @@
CString strModeType = _T("Master");
CString strSoftRev = _T("1.0.2");
+
+ // CGlassPool
+ m_glassPool.initPool();
// Log
@@ -94,6 +103,10 @@
SERVO::MasterListener masterListener;
+ masterListener.onMasterStateChanged = [&](void* pMaster, SERVO::MASTERSTATE state) -> void {
+ LOGI("<CModel>Master state changed(%d)", (int)state);
+ notify(RX_CODE_MASTER_STATE_CHANGED);
+ };
masterListener.onEqAlive = [&](void* pMaster, SERVO::CEquipment* pEquipment, BOOL bAlive) -> void {
LOGI("<CModel>Equipment onAlive:%s(%s).\n", pEquipment->getName().c_str(),
bAlive ? _T("ON") : _T("OFF"));
@@ -182,6 +195,7 @@
m_hsmsPassive.term();
CLog::GetLog()->SetOnLogCallback(nullptr);
m_master.term();
+ m_glassPool.term();
return 0;
}
--
Gitblit v1.9.3