From 94e388265ca97ba07b102c295529fd40b04b419d Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 26 五月 2025 15:26:09 +0800
Subject: [PATCH] 1.增加顶部工具条; 2.Robot cmd测试页面增加Robot命令的响应结果; 3.CMaster增加start, stop函数,准备编写调试逻辑;
---
SourceCode/Bond/Servo/Model.cpp | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index 95183ef..959277e 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
@@ -182,6 +191,7 @@
m_hsmsPassive.term();
CLog::GetLog()->SetOnLogCallback(nullptr);
m_master.term();
+ m_glassPool.term();
return 0;
}
--
Gitblit v1.9.3