From 21407e7ee3acce124d761fb562aee9f31033d42a Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期三, 04 六月 2025 12:01:21 +0800
Subject: [PATCH] Merge branch 'clh'
---
SourceCode/Bond/Servo/CRobotTask.cpp | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/CRobotTask.cpp b/SourceCode/Bond/Servo/CRobotTask.cpp
index 6a223de..a7e7760 100644
--- a/SourceCode/Bond/Servo/CRobotTask.cpp
+++ b/SourceCode/Bond/Servo/CRobotTask.cpp
@@ -8,7 +8,7 @@
{
generateId(m_strId);
m_state = ROBOT_TASK_STATE::Ready;
- m_timeCreate = CToolUnits::getTimestamp();
+ m_timeCreate = CToolUnits::getUnixTimestamp();
m_timeFetchOut = 0;
m_timeStored = 0;
m_timeFinish = 0;
@@ -176,11 +176,11 @@
void CRobotTask::fetchOut()
{
- m_timeFetchOut = CToolUnits::getTimestamp();;
+ m_timeFetchOut = CToolUnits::getUnixTimestamp();;
}
void CRobotTask::stored()
{
- m_timeStored = CToolUnits::getTimestamp();;
+ m_timeStored = CToolUnits::getUnixTimestamp();;
}
}
--
Gitblit v1.9.3