Skip to content

刘韬 / 1069_MIMO_PlUS

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 44964e7b 由 张东亮
选项

翻译添加，添加可配置按reset按钮手动出料串

1 个父辈 99db120b
内嵌 并排
正在显示 7 个修改的文件 包含 68 行增加 和 6 行删除
Common/Setting_Init.cs
......@@ -183,6 +183,10 @@ namespace OnlineStore.Common
[MyConfigComment("启用折叠门提示音")]
public static MyConfig<bool> Enable_DoorSound = true;
[MyConfigComment("启用料串按Reset按钮流出")]
public static MyConfig<bool> Enable_StringAutoOut = false;
[MyConfigComment("压紧轴回原失败重试最大次数")]
public static MyConfig<int> Comp_Axis_HomeResetTimes = 999;
[MyConfigComment("大于7寸料盘高度补偿(mm),进而调整压紧轴压紧点")]
......
DeviceLibrary/theMachine/MainMachine_AGV.cs
......@@ -302,7 +302,7 @@ namespace DeviceLibrary
{
AGVMoveInfo.NextMoveStep(MoveStep.AGV_In03);
RobotManage.mainMachine.SetStatus(NodeStatus.MayEnter);
CylinderMove(StringMoveInfo, IO_Type.StringFix_Bottom, IO_Type.StringFix_Top, IO_VALUE.LOW);
CylinderMove(AGVMoveInfo, IO_Type.StringFix_Bottom, IO_Type.StringFix_Top, IO_VALUE.LOW);
Line.LineRun("n", false, 2);
AGVMoveInfo.log($"收到AGV的{NodeStatus.RequestEnter}信号，无料串，允许进料");
}
......@@ -310,7 +310,7 @@ namespace DeviceLibrary
{
AGVMoveInfo.NextMoveStep(MoveStep.AGV_Out03);
RobotManage.mainMachine.SetStatus(NodeStatus.MayLeave);
CylinderMove(StringMoveInfo, IO_Type.StringFix_Bottom, IO_Type.StringFix_Top, IO_VALUE.LOW);
CylinderMove(AGVMoveInfo, IO_Type.StringFix_Bottom, IO_Type.StringFix_Top, IO_VALUE.LOW);
Line.LineRun("n", true, 2);
AGVMoveInfo.log($"收到AGV的{NodeStatus.RequestLeave}信号，有料串，允许出料");
}
......
DeviceLibrary/theMachine/MainMachine_String.cs
using AGVLib;
using CodeLibrary;
using OnlineStore;
using OnlineStore.Common;
......@@ -482,6 +483,12 @@ namespace DeviceLibrary
StringMoveInfo.log($"料串已离开");
StringMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(5000));
}
if (Setting_Init.Enable_StringAutoOut && IOValue(IO_Type.Reset_BTN).Equals(IO_VALUE.HIGH))
{
StringMoveInfo.NextMoveStep(MoveStep.StringOut_08);
StringMoveInfo.log($"复位按钮触发，手动出料串：打开折叠门");
CylinderMove(StringMoveInfo, IO_Type.StringDoor_Close, IO_Type.StringDoor_Open, IO_VALUE.HIGH);
}
break;
case MoveStep.StringOut_05:
if (Setting_Init.Disable_StringDoor || IOValue(IO_Type.StringDoor_Close).Equals(IO_VALUE.HIGH))
......@@ -517,6 +524,34 @@ namespace DeviceLibrary
//CylinderMove(StringMoveInfo, IO_Type.StringDoor_Close, IO_Type.StringDoor_Open, IO_VALUE.LOW);
StringMoveInfo.EndMove();
break;
//马壮建议：手动料串流出流程
case MoveStep.StringOut_08:
if (IOValue(IO_Type.Reset_BTN).Equals(IO_VALUE.HIGH))
{
StringMoveInfo.NextMoveStep(MoveStep.StringOut_09);
CylinderMove(StringMoveInfo, IO_Type.StringFix_Bottom, IO_Type.StringFix_Top, IO_VALUE.LOW);
Line.LineRun("n", true, 30);
StringMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(2000));
AGVMoveInfo.log($"复位按钮触发，手动出料串：料串出料");
}
break;
case MoveStep.StringOut_09:
if (IOValue(IO_Type.Reset_BTN).Equals(IO_VALUE.HIGH))
{
StringMoveInfo.NextMoveStep(MoveStep.StringOut_10);
Line.LineStop("n");
CylinderMove(StringMoveInfo, IO_Type.StringDoor_Close, IO_Type.StringDoor_Open, IO_VALUE.LOW);
AGVMoveInfo.log($"复位按钮触发，手动出料串：关门");
}
break;
case MoveStep.StringOut_10:
StringMoveInfo.NextMoveStep(MoveStep.StringOut_11);
AGVMoveInfo.log($"手动出料串完成");
break;
case MoveStep.StringOut_11:
StringMoveInfo.EndMove();
break;
default:
StringMoveInfo.log($"未找到对应步骤:{StringMoveInfo.MoveStep}");
break;
......@@ -730,7 +765,7 @@ namespace DeviceLibrary
}
public void StringDoorClose(MoveInfo moveInfo)
{
if(Setting_Init.Disable_StringDoor)
if (Setting_Init.Disable_StringDoor)
{
LogUtil.info($"料串门已屏蔽，不关闭");
return;
......
DeviceLibrary/theMachine/MoveStep.cs
......@@ -125,6 +125,11 @@ namespace DeviceLibrary
StringOut_06,
StringOut_07,
StringOut_08,
StringOut_09,
StringOut_10,
StringOut_11,
ReelClamp_01,
ReelClamp_02,
ReelClamp_03,
......
TheMachine/resources/en-US.lngres
......@@ -491,4 +491,10 @@ trayOpenAxis 第{0}次尝试打开轴:{1} {0}th attempt to open axis: {1}
TrayClearAxisAlarm ...尝试清除报警第{0}次 ...Attempting to clear alarm for the {0}th time
TrayServoNoAxis ...尝试使能成功 ...Attempt to enable successful
TrayServoAxisFailed ...尝试使能失败 ...Attempt to enable failed
NitrogenValve 氮气阀门开启 Nitrogen valve on
NGDoor_Open 单料口门上升 Single material port door lifting
NGDoor_Close 单料口门下降 Single material port door lowering end
StringFix_Bottom 进料线体料串固定下降 Fixed lowering of material string on feeding line
Clamping_Relax 夹爪气缸放松 Gripper cylinder release
StringPosChecker_Home 上料定位旋转气缸避让 Avoidance of feeding positioning rotary cylinder
StringDoor_Axis_Break 上料机构折叠门刹车解除 Brake release of feeding mechanism folding door
\ No newline at end of file
TheMachine/resources/ja-JP.lngres
......@@ -491,5 +491,10 @@ trayOpenAxis 第{0}次尝试打开轴:{1} {0}回目の軸{1}を開く試行
TrayClearAxisAlarm ...尝试清除报警第{0}次 ...{0}回目のアラームクリアを試行中
TrayServoNoAxis ...尝试使能成功 ...イネーブル試行成功
TrayServoAxisFailed ...尝试使能失败 ...イネーブル試行失敗
NitrogenValve 氮气阀门开启 窒素バルブオン
NGDoor_Open 单料口门上升 単一料口ドア上昇
NGDoor_Close 单料口门下降 単一料口ドア下降
StringFix_Bottom 进料线体料串固定下降 フィードライン料串固定下降
Clamping_Relax 夹爪气缸放松 グリッパーシリンダーリリース
StringPosChecker_Home 上料定位旋转气缸避让 上料位置決め回転シリンダー回避
StringDoor_Axis_Break 上料机构折叠门刹车解除 上料機構折りたたみドアブレーキ解除
\ No newline at end of file
TheMachine/resources/zh-CN.lngres
......@@ -491,3 +491,10 @@ trayOpenAxis 第{0}次尝试打开轴:{1}
TrayClearAxisAlarm ...尝试清除报警第{0}次
TrayServoNoAxis ...尝试使能成功
TrayServoAxisFailed ...尝试使能失败
NitrogenValve 氮气阀门开启
NGDoor_Open 单料口门上升
NGDoor_Close 单料口门下降
StringFix_Bottom 进料线体料串固定下降
Clamping_Relax 夹爪气缸放松
StringPosChecker_Home 上料定位旋转气缸避让
StringDoor_Axis_Break 上料机构折叠门刹车解除
\ No newline at end of file
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!