From 58b5bb07de4bcbf670db5ad79ff8b9bd7afc1e28 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期二, 17 六月 2025 11:35:47 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/Model.cpp | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index 30793da..27056bd 100644
--- a/SourceCode/Bond/Servo/Model.cpp
+++ b/SourceCode/Bond/Servo/Model.cpp
@@ -40,6 +40,18 @@
m_strWorkDir = pszWorkDir;
}
+void CModel::loadPortParams()
+{
+ BOOL portEnable, autoChangeEnable;
+ int portType, portMode, cassetteType, transferMode;
+ for (int i = 0; i < 4; i++) {
+ m_configuration.getPortParms(i, portEnable, portType, portMode,
+ cassetteType, transferMode, autoChangeEnable);
+ m_master.setPortType(i, portEnable, portType, portMode, cassetteType,
+ transferMode, autoChangeEnable);
+ }
+}
+
int CModel::init()
{
CString strIniFile;
@@ -188,7 +200,6 @@
break;
case ROBOT_EVENT_FINISH:
LOGI("<CModel>onRobotTaskEvent: 任务完成(%s, ClassID=%s).", strDesc.c_str(), strClassID.c_str());
- pTask->completed();
break;
case ROBOT_EVENT_ERROR:
LOGE("<CModel>onRobotTaskEvent: 任务错误(%s, ClassID=%s).", strDesc.c_str(), strClassID.c_str());
@@ -233,7 +244,7 @@
// 状态映射
static const char* STATUS_STR[] = {
- "Unknown", "Ready", "Running", "Error", "Abort", "Completed"
+ "Unknown", "Ready", "Running", "Picking", "Placing", "Restoring", "Error", "Abort", "Completed"
};
auto state = pTask->getState();
int index = static_cast<int>(state);
@@ -248,7 +259,7 @@
int nRecordId = 0;
TransferManager::getInstance().addTransferRecord(data, nRecordId);
- notifyPtr(RX_CODE_EQ_ROBOT_TASK, pTask);
+ notifyPtrAndInt(RX_CODE_EQ_ROBOT_TASK, pTask, nullptr, code);
LOGI("<CModel>onRobotTaskEvent: 任务记录已保存，RecordID=%d", nRecordId);
};
m_master.setListener(masterListener);
--
Gitblit v1.9.3