From 95ab46e7acc80e11494f3c3796c571f77c83ed41 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期三, 04 六月 2025 11:53:22 +0800
Subject: [PATCH] 1. 添加搬运数据到数据库 2. 添加秒级的时间戳(毫秒级使用time_t可能是负数,因为有符号),防止使用strftime闪退 3. 实时更新搬运记录界面
---
SourceCode/Bond/Servo/Model.h | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.h b/SourceCode/Bond/Servo/Model.h
index 3b92364..a9e5369 100644
--- a/SourceCode/Bond/Servo/Model.h
+++ b/SourceCode/Bond/Servo/Model.h
@@ -2,6 +2,7 @@
#include "Configuration.h"
#include "HsmsPassive.h"
#include "CMaster.h"
+#include "CGlassPool.h"
class CModel
{
@@ -11,10 +12,10 @@
public:
IObservable* getObservable();
+ SERVO::CMaster& getMaster();
void setWorkDir(const char* pszWorkDir);
int init();
int term();
- bool isAlarmStep(SERVO::CStep* pStep);
public:
int notify(int code);
@@ -33,6 +34,7 @@
public:
CConfiguration m_configuration;
CHsmsPassive m_hsmsPassive;
+ SERVO::CGlassPool m_glassPool;
SERVO::CMaster m_master;
private:
--
Gitblit v1.9.3