Commit b4b4aefb 张东亮

1

1 个父辈 c94af2a5
...@@ -243,9 +243,16 @@ namespace OnlineStore.DeviceLibrary ...@@ -243,9 +243,16 @@ namespace OnlineStore.DeviceLibrary
MiddleAxis_B = new AxisBean(Config.MiddleAxis_B, Name); MiddleAxis_B = new AxisBean(Config.MiddleAxis_B, Name);
ComAxis_B = new AxisBean(Config.ComAxis_B, Name); ComAxis_B = new AxisBean(Config.ComAxis_B, Name);
moveAxisArray = new AxisBean[] { moveAxisArray = new AxisBean[] {
MoveAxis,PullAxis_Inout,UpdownAxis,PullAxis_Updown, MoveAxis,
XAxis_A,MiddleAxis_A,ComAxis_A, PullAxis_Inout,
XAxis_B,MiddleAxis_B,ComAxis_B UpdownAxis,
XAxis_A,
MiddleAxis_A,
ComAxis_A,
PullAxis_Updown,
XAxis_B,
MiddleAxis_B,
ComAxis_B
}; };
} }
internal void InitPosititionNumList() internal void InitPosititionNumList()
...@@ -1196,6 +1203,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -1196,6 +1203,7 @@ namespace OnlineStore.DeviceLibrary
CurrSecurityAccess = 0; CurrSecurityAccess = 0;
//MoveStop = false; //MoveStop = false;
ClearSpecifiedAlarm($"被打开,暂停运动");
if (alarmType > (AlarmType.IoSingleTimeOut)) if (alarmType > (AlarmType.IoSingleTimeOut))
{ {
return; return;
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!