Commit 2128f57a 刘韬

修改安全提示,将"Device is in automatic" 改为"Safety interlock activated"

1 个父辈 af778d55
...@@ -170,7 +170,7 @@ namespace TheMachine ...@@ -170,7 +170,7 @@ namespace TheMachine
CylinderButton.IsSafe += () => CylinderButton.IsSafe += () =>
{ {
if(RobotManage.isRunning) if(RobotManage.isRunning)
return (false, "Device is in automatic"); return (false, "Safety interlock activated");
if (!RobotManage.mainMachine.IsAllDoorClosed()) if (!RobotManage.mainMachine.IsAllDoorClosed())
return (false, "Safe door was not closed"); return (false, "Safe door was not closed");
......
...@@ -143,7 +143,7 @@ namespace TheMachine ...@@ -143,7 +143,7 @@ namespace TheMachine
public (bool,string) IsSafe() { public (bool,string) IsSafe() {
if (RobotManage.isRunning) if (RobotManage.isRunning)
return (false, "Device is in automatic"); return (false, "Safety interlock activated");
if (!RobotManage.mainMachine.IsAllDoorClosed()) if (!RobotManage.mainMachine.IsAllDoorClosed())
return (false, "Safe door was not closed"); return (false, "Safe door was not closed");
......
...@@ -213,7 +213,7 @@ namespace TheMachine ...@@ -213,7 +213,7 @@ namespace TheMachine
{ {
if (RobotManage.isRunning) { if (RobotManage.isRunning) {
MessageBox.Show(crc.GetString("Res0029","系统正在运行,不能手动控制伺服")); MessageBox.Show("Safety interlock activated");
return; return;
} }
var cc = tableLayoutPanel1.Controls.Find(((Button)sender).Name, false); var cc = tableLayoutPanel1.Controls.Find(((Button)sender).Name, false);
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!