Skip to content

孙克 / ACSingleStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit c7a1d128 由 几米阳光
选项

1.界面调整。2.入库时先定位气缸下降。

1 个父辈 c63e8bb9
全部展开
内嵌 并排
正在显示 4 个修改的文件 包含 51 行增加 和 51 行删除
source/ACSingleStore/FrmAxisDebug.Designer.cs
...@@ -223,7 +223,7 @@ ...@@ -223,7 +223,7 @@
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(737, 318); this.ClientSize = new System.Drawing.Size(707, 318);
this.Controls.Add(this.label6); this.Controls.Add(this.label6);
this.Controls.Add(this.label5); this.Controls.Add(this.label5);
this.Controls.Add(this.txtInOutPosition); this.Controls.Add(this.txtInOutPosition);
......
source/ACSingleStore/FrmStoreBox.cs
...@@ -1026,56 +1026,56 @@ namespace OnlineStore.ACSingleStore ...@@ -1026,56 +1026,56 @@ namespace OnlineStore.ACSingleStore
public List<WaitResultInfo> waitResultList = new List<WaitResultInfo>(); public List<WaitResultInfo> waitResultList = new List<WaitResultInfo>();
private void btnStart_Click(object sender, EventArgs e) //private void btnStart_Click(object sender, EventArgs e)
{ //{
waitResultList = new List<WaitResultInfo>(); // waitResultList = new List<WaitResultInfo>();
string deviceName = ""; // string deviceName = "";
short slvAddr = 0; // short slvAddr = 0;
int position=0; // int position=0;
if (chb1.Checked) // if (chb1.Checked)
{ // {
position=FormUtil.GetIntValue(txtPosition1); // position=FormUtil.GetIntValue(txtPosition1);
deviceName = store.Config.Middle_Axis.DeviceName; // deviceName = store.Config.Middle_Axis.DeviceName;
slvAddr = store.Config.Middle_Axis.GetAxisValue(); // slvAddr = store.Config.Middle_Axis.GetAxisValue();
if (ACServerManager.ServerOnStatus(deviceName, slvAddr)) // if (ACServerManager.ServerOnStatus(deviceName, slvAddr))
{ // {
ACServerManager.AbsMove(deviceName, slvAddr, position); // ACServerManager.AbsMove(deviceName, slvAddr, position);
waitResultList.Add(WaitResultInfo.WaitAxis(store.Config.Middle_Axis,position,store.Config.Middle_Axis.TargetSpeed)); // waitResultList.Add(WaitResultInfo.WaitAxis(store.Config.Middle_Axis,position,store.Config.Middle_Axis.TargetSpeed));
} // }
} // }
if (chb2.Checked) // if (chb2.Checked)
{ // {
position = FormUtil.GetIntValue(txtPosition2); // position = FormUtil.GetIntValue(txtPosition2);
deviceName = store.Config.UpDown_Axis.DeviceName; // deviceName = store.Config.UpDown_Axis.DeviceName;
slvAddr = store.Config.UpDown_Axis.GetAxisValue(); // slvAddr = store.Config.UpDown_Axis.GetAxisValue();
if (ACServerManager.ServerOnStatus(deviceName, slvAddr)) // if (ACServerManager.ServerOnStatus(deviceName, slvAddr))
{ // {
ACServerManager.AbsMove(deviceName, slvAddr, position); // ACServerManager.AbsMove(deviceName, slvAddr, position);
waitResultList.Add(WaitResultInfo.WaitAxis(store.Config.UpDown_Axis, position, store.Config.UpDown_Axis.TargetSpeed)); // waitResultList.Add(WaitResultInfo.WaitAxis(store.Config.UpDown_Axis, position, store.Config.UpDown_Axis.TargetSpeed));
} // }
} // }
if (chb3.Checked) // if (chb3.Checked)
{ // {
position = FormUtil.GetIntValue(txtPosition3); // position = FormUtil.GetIntValue(txtPosition3);
deviceName = store.Config.InOut_Axis.DeviceName; // deviceName = store.Config.InOut_Axis.DeviceName;
slvAddr = store.Config.InOut_Axis.GetAxisValue(); // slvAddr = store.Config.InOut_Axis.GetAxisValue();
if (ACServerManager.ServerOnStatus(deviceName, slvAddr)) // if (ACServerManager.ServerOnStatus(deviceName, slvAddr))
{ // {
ACServerManager.AbsMove(deviceName, slvAddr, position); // ACServerManager.AbsMove(deviceName, slvAddr, position);
waitResultList.Add(WaitResultInfo.WaitAxis(store.Config.UpDown_Axis, position, store.Config.UpDown_Axis.TargetSpeed)); // waitResultList.Add(WaitResultInfo.WaitAxis(store.Config.UpDown_Axis, position, store.Config.UpDown_Axis.TargetSpeed));
} // }
} // }
if (waitResultList.Count > 0) // if (waitResultList.Count > 0)
{ // {
LOGGER.Info("运动开始"); // LOGGER.Info("运动开始");
// MessageBox.Show("运动开始！"); // // MessageBox.Show("运动开始！");
} // }
else // else
{ // {
MessageBox.Show("未选择运动轴或伺服未打开"); // MessageBox.Show("未选择运动轴或伺服未打开");
} // }
} //}
private int GetSlaveAddr() private int GetSlaveAddr()
{ {
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
...@@ -268,7 +268,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -268,7 +268,7 @@ namespace OnlineStore.DeviceLibrary
{ {
InStoreLog("入库：SI_01 定位气缸下降"); InStoreLog("入库：SI_01 定位气缸下降");
StoreMove.NextMoveStep(StoreMoveStep.SI_01_LocationCylinderDown); StoreMove.NextMoveStep(StoreMoveStep.SI_01_LocationCylinderDown);
LocationUpAndWait(); LocationDownAndWait();
} }
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!