From 5c558a6cea6040c49dfde7a7ab8f61c84d4b11fc Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 06 六月 2025 16:34:15 +0800
Subject: [PATCH] 1.当前搬送任务的人工终止操作。
---
SourceCode/Bond/Servo/CRobotTask.cpp | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/SourceCode/Bond/Servo/CRobotTask.cpp b/SourceCode/Bond/Servo/CRobotTask.cpp
index 3b19a24..a33cc40 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;
@@ -42,10 +42,29 @@
return strOut;
}
+ std::string CRobotTask::getSimpleDescription() const
+ {
+ std::string strOut = "CRobotTask<ID:";
+ strOut = strOut + std::to_string(m_robotCmdParam.sequenceNo);
+ strOut = strOut + ",Arm:";
+ strOut = strOut + std::to_string(m_robotCmdParam.armNo);
+ strOut = strOut + ",GetPossion:";
+ strOut = strOut + std::to_string(m_robotCmdParam.getPosition);
+ strOut = strOut + ",GetSlot:";
+ strOut = strOut + std::to_string(m_robotCmdParam.getSlotNo);
+ strOut = strOut + ",PutPossion:";
+ strOut = strOut + std::to_string(m_robotCmdParam.putPosition);
+ strOut = strOut + ",PutSlot:";
+ strOut = strOut + std::to_string(m_robotCmdParam.putSlotNo);
+ strOut = strOut + ">";
+
+ return strOut;
+ }
+
void CRobotTask::setContext(CContext* pContext)
{
- if (pContext != nullptr) {
- pContext->release();
+ if (m_pContext != nullptr) {
+ m_pContext->release();
}
m_pContext = pContext;
@@ -155,13 +174,25 @@
return m_robotCmdParam.putSlotNo;
}
+ CString CRobotTask::getStateString()
+ {
+ switch (m_state) {
+ case ROBOT_TASK_STATE::Ready: return _T("Ready");
+ case ROBOT_TASK_STATE::Running: return _T("Running");
+ case ROBOT_TASK_STATE::Error: return _T("Error");
+ case ROBOT_TASK_STATE::Abort: return _T("Abort");
+ case ROBOT_TASK_STATE::Completed: return _T("Completed");
+ default: return _T("Unknown");
+ }
+ }
+
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