From 726f0553fa435809d10c8a33abe46473ee975db1 Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期二, 10 十二月 2024 16:37:00 +0800
Subject: [PATCH] 1. 完善axis细部设定人机交互(数据填充和文件保存)
---
SourceCode/Bond/BondEq/FileManager/RecipeManager.cpp | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/SourceCode/Bond/BondEq/FileManager/RecipeManager.cpp b/SourceCode/Bond/BondEq/FileManager/RecipeManager.cpp
index dcd0554..86c978d 100644
--- a/SourceCode/Bond/BondEq/FileManager/RecipeManager.cpp
+++ b/SourceCode/Bond/BondEq/FileManager/RecipeManager.cpp
@@ -37,8 +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();
+ //axisInfo.maxPositioningSpeed = axisNode.attribute("maxPositioningSpeed").as_double();
+ //axisInfo.maxManualSpeed = axisNode.attribute("maxManualSpeed").as_double();
// 加载 ValueRange 值
axisInfo.jogDistance = ValueRange(
@@ -115,8 +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;
+ //axisNode.append_attribute("maxPositioningSpeed") = axisInfo.maxPositioningSpeed;
+ //axisNode.append_attribute("maxManualSpeed") = axisInfo.maxManualSpeed;
// 保存 ValueRange 值
auto jog_distance = axisNode.append_child("jog_distance");
@@ -169,8 +169,8 @@
AxisInfo axisInfo;
axisInfo.id = axisId;
axisInfo.positioningPointCount = 25;
- axisInfo.maxPositioningSpeed = 100.0;
- axisInfo.maxManualSpeed = 100.0;
+ //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);
@@ -206,7 +206,7 @@
}
// 如果没有找到该轴,返回一个默认的无效 AxisInfo
- return AxisInfo{ -1, 0, 0.0, 0.0, "", "", "", ValueRange(), ValueRange(), ValueRange(), ValueRange(), ValueRange(), {} };
+ return AxisInfo{ -1, 0, /*0.0, 0.0,*/ "", "", "", ValueRange(), ValueRange(), ValueRange(), ValueRange(), ValueRange(), {} };
}
// 更新轴信息
--
Gitblit v1.9.3