From 016703bb359382dc1de4ac204da47b6f29c55c81 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 12 十二月 2024 11:09:10 +0800
Subject: [PATCH] Merge branch 'liuyang' into clh
---
SourceCode/Bond/BondEq/FileManager/RecipeManager.cpp | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/SourceCode/Bond/BondEq/FileManager/RecipeManager.cpp b/SourceCode/Bond/BondEq/FileManager/RecipeManager.cpp
index 004463c..86c978d 100644
--- a/SourceCode/Bond/BondEq/FileManager/RecipeManager.cpp
+++ b/SourceCode/Bond/BondEq/FileManager/RecipeManager.cpp
@@ -37,6 +37,8 @@
axisInfo.number = axisNode.attribute("number").value();
axisInfo.description = axisNode.attribute("description").value();
axisInfo.startAddress = axisNode.attribute("start_address").value();
+ //axisInfo.maxPositioningSpeed = axisNode.attribute("maxPositioningSpeed").as_double();
+ //axisInfo.maxManualSpeed = axisNode.attribute("maxManualSpeed").as_double();
// 加载 ValueRange 值
axisInfo.jogDistance = ValueRange(
@@ -66,7 +68,9 @@
);
// 加载 PositionRange 值
+ axisInfo.positioningPointCount = axisNode.child("Positions").attribute("positioningPointCount").as_int();
for (auto positionNode : axisNode.child("Positions").children("Position")) {
+ bool isEnable = positionNode.attribute("isEnable").as_bool();
std::string description = positionNode.attribute("description").value();
ValueRange positionRange(
positionNode.attribute("min").as_double(),
@@ -74,7 +78,7 @@
positionNode.attribute("current").as_double()
);
- axisInfo.positions.emplace_back(PositionRange(description, positionRange));
+ axisInfo.positions.emplace_back(PositionRange(isEnable, description, positionRange));
}
m_axes[axisInfo.id] = axisInfo;
@@ -111,6 +115,8 @@
axisNode.append_attribute("number") = axisInfo.number.c_str();
axisNode.append_attribute("description") = axisInfo.description.c_str();
axisNode.append_attribute("start_address") = axisInfo.startAddress.c_str();
+ //axisNode.append_attribute("maxPositioningSpeed") = axisInfo.maxPositioningSpeed;
+ //axisNode.append_attribute("maxManualSpeed") = axisInfo.maxManualSpeed;
// 保存 ValueRange 值
auto jog_distance = axisNode.append_child("jog_distance");
@@ -140,8 +146,10 @@
// 保存 PositionRange 值
auto positionsNode = axisNode.append_child("Positions");
+ positionsNode.append_attribute("positioningPointCount") = axisInfo.positioningPointCount;
for (const auto& position : axisInfo.positions) {
auto positionNode = positionsNode.append_child("Position");
+ positionNode.append_attribute("isEnable") = position.isEnable;
positionNode.append_attribute("description") = position.description.c_str();
positionNode.append_attribute("min") = position.range.minValue;
positionNode.append_attribute("max") = position.range.maxValue;
@@ -160,6 +168,9 @@
for (int axisId = 1; axisId <= 12; ++axisId) {
AxisInfo axisInfo;
axisInfo.id = axisId;
+ axisInfo.positioningPointCount = 25;
+ //axisInfo.maxPositioningSpeed = 100.0;
+ //axisInfo.maxManualSpeed = 100.0;
axisInfo.number = "M100-M" + std::to_string(axisId);
axisInfo.description = "Default_Axis" + std::to_string(axisId);
axisInfo.startAddress = "ZR" + std::to_string(10000 + (axisId - 1) * 300);
@@ -172,10 +183,10 @@
axisInfo.decelerationTime = ValueRange(1.0, 10.0, 1.0);
// 添加定位点并设置默认的最小值和最大值
- for (int posId = 1; posId <= 25; ++posId) {
- double minPos = posId * 5.0;
- double maxPos = posId * 20.0;
- axisInfo.positions.emplace_back(PositionRange("Position " + std::to_string(posId), ValueRange(minPos, maxPos, posId * 10.0)));
+ for (int posId = 0; posId < axisInfo.positioningPointCount; ++posId) {
+ double minPos = (posId + 1) * 5.0;
+ double maxPos = (posId + 1) * 20.0;
+ axisInfo.positions.emplace_back(PositionRange(TRUE, "Position " + std::to_string(posId + 1), ValueRange(minPos, maxPos, (posId + 1) * 10.0)));
}
m_axes[axisId] = axisInfo;
@@ -195,7 +206,7 @@
}
// 如果没有找到该轴，返回一个默认的无效 AxisInfo
- return AxisInfo{ -1, "", "", "", ValueRange(), ValueRange(), ValueRange(), ValueRange(), ValueRange(), {} };
+ return AxisInfo{ -1, 0, /*0.0, 0.0,*/ "", "", "", ValueRange(), ValueRange(), ValueRange(), ValueRange(), ValueRange(), {} };
}
// 更新轴信息
--
Gitblit v1.9.3