Skip to content

孙克 / ACSingleStore

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

删除中轴P3，升降轴P9参数

1 个父辈 6a1ec70f
全部展开
内嵌 并排
正在显示 9 个修改的文件 包含 39 行增加 和 63 行删除
source/ACSingleStore/FrmStoreBox.cs
...@@ -92,12 +92,12 @@ namespace OnlineStore.ACSingleStore ...@@ -92,12 +92,12 @@ namespace OnlineStore.ACSingleStore
if (ktkPosition != null) if (ktkPosition != null)
{ {
txtMiddleP2.Text = ktkPosition.MiddleAxis_Position_P2.ToString(); txtMiddleP2.Text = ktkPosition.MiddleAxis_Position_P2.ToString();
txtMiddleP3.Text = ktkPosition.MiddleAxis_Position_P3.ToString(); //txtMiddleP3.Text = ktkPosition.MiddleAxis_Position_P3.ToString();
txtUpDownP3.Text = ktkPosition.UpDownAxis_IHPosition_P3.ToString(); txtUpDownP3.Text = ktkPosition.UpDownAxis_IHPosition_P3.ToString();
txtUpDownP4.Text = ktkPosition.UpDownAxis_ILPosition_P4.ToString(); txtUpDownP4.Text = ktkPosition.UpDownAxis_ILPosition_P4.ToString();
txtUpDownP5.Text = ktkPosition.UpDownAxis_OLPosition_P5.ToString(); txtUpDownP5.Text = ktkPosition.UpDownAxis_OLPosition_P5.ToString();
txtUpDownP6.Text = ktkPosition.UpDownAxis_OHPosition_P6.ToString(); txtUpDownP6.Text = ktkPosition.UpDownAxis_OHPosition_P6.ToString();
txtUpDownP9.Text = ktkPosition.UpDownAxis_Position_P9.ToString(); //txtUpDownP9.Text = ktkPosition.UpDownAxis_Position_P9.ToString();
txtComP2.Text = ktkPosition.CompressAxis_Position_P2.ToString(); txtComP2.Text = ktkPosition.CompressAxis_Position_P2.ToString();
txtComP3.Text = ktkPosition.CompressAxis_CPosition_P3.ToString(); txtComP3.Text = ktkPosition.CompressAxis_CPosition_P3.ToString();
txtInOutP3.Text = ktkPosition.InOutAxis_Position_P3.ToString(); txtInOutP3.Text = ktkPosition.InOutAxis_Position_P3.ToString();
...@@ -410,7 +410,7 @@ namespace OnlineStore.ACSingleStore ...@@ -410,7 +410,7 @@ namespace OnlineStore.ACSingleStore
ktk.InOut_P3 = FormUtil.GetIntValue(txtInOutP3); ktk.InOut_P3 = FormUtil.GetIntValue(txtInOutP3);
ktk.Middle_P1 = FormUtil.GetIntValue(txtMiddleP1); ktk.Middle_P1 = FormUtil.GetIntValue(txtMiddleP1);
ktk.Middle_P2 = FormUtil.GetIntValue(txtMiddleP2); ktk.Middle_P2 = FormUtil.GetIntValue(txtMiddleP2);
ktk.Middle_P3 = FormUtil.GetIntValue(txtMiddleP3); //ktk.Middle_P3 = FormUtil.GetIntValue(txtMiddleP3);
ktk.UpDown_P1 = FormUtil.GetIntValue(txtUpDownP1); ktk.UpDown_P1 = FormUtil.GetIntValue(txtUpDownP1);
ktk.UpDown_P2 = FormUtil.GetIntValue(txtUpDownP2); ktk.UpDown_P2 = FormUtil.GetIntValue(txtUpDownP2);
...@@ -420,7 +420,7 @@ namespace OnlineStore.ACSingleStore ...@@ -420,7 +420,7 @@ namespace OnlineStore.ACSingleStore
ktk.UpDown_P6 = FormUtil.GetIntValue(txtUpDownP6); ktk.UpDown_P6 = FormUtil.GetIntValue(txtUpDownP6);
ktk.UpDown_P7 = FormUtil.GetIntValue(txtUpDownP7); ktk.UpDown_P7 = FormUtil.GetIntValue(txtUpDownP7);
ktk.UpDown_P8 = FormUtil.GetIntValue(txtUpDownP8); ktk.UpDown_P8 = FormUtil.GetIntValue(txtUpDownP8);
ktk.UpDown_P9 = FormUtil.GetIntValue(txtUpDownP9); // ktk.UpDown_P9 = FormUtil.GetIntValue(txtUpDownP9);
return ktk; return ktk;
} }
private void btnComAlarmClear_Click(object sender, EventArgs e) private void btnComAlarmClear_Click(object sender, EventArgs e)
...@@ -443,12 +443,12 @@ namespace OnlineStore.ACSingleStore ...@@ -443,12 +443,12 @@ namespace OnlineStore.ACSingleStore
if (ktkPosition != null) if (ktkPosition != null)
{ {
txtMiddleP2.Text = ktkPosition.MiddleAxis_Position_P2.ToString(); txtMiddleP2.Text = ktkPosition.MiddleAxis_Position_P2.ToString();
txtMiddleP3.Text = ktkPosition.MiddleAxis_Position_P3.ToString(); //txtMiddleP3.Text = ktkPosition.MiddleAxis_Position_P3.ToString();
txtUpDownP3.Text = ktkPosition.UpDownAxis_IHPosition_P3.ToString(); txtUpDownP3.Text = ktkPosition.UpDownAxis_IHPosition_P3.ToString();
txtUpDownP4.Text = ktkPosition.UpDownAxis_ILPosition_P4.ToString(); txtUpDownP4.Text = ktkPosition.UpDownAxis_ILPosition_P4.ToString();
txtUpDownP5.Text = ktkPosition.UpDownAxis_OLPosition_P5.ToString(); txtUpDownP5.Text = ktkPosition.UpDownAxis_OLPosition_P5.ToString();
txtUpDownP6.Text = ktkPosition.UpDownAxis_OHPosition_P6.ToString(); txtUpDownP6.Text = ktkPosition.UpDownAxis_OHPosition_P6.ToString();
txtUpDownP9.Text = ktkPosition.UpDownAxis_Position_P9.ToString(); //txtUpDownP9.Text = ktkPosition.UpDownAxis_Position_P9.ToString();
txtComP2.Text = ktkPosition.CompressAxis_Position_P2.ToString(); txtComP2.Text = ktkPosition.CompressAxis_Position_P2.ToString();
txtComP3.Text = ktkPosition.CompressAxis_CPosition_P3.ToString(); txtComP3.Text = ktkPosition.CompressAxis_CPosition_P3.ToString();
txtInOutP3.Text = ktkPosition.InOutAxis_Position_P3.ToString(); txtInOutP3.Text = ktkPosition.InOutAxis_Position_P3.ToString();
...@@ -613,13 +613,13 @@ namespace OnlineStore.ACSingleStore ...@@ -613,13 +613,13 @@ namespace OnlineStore.ACSingleStore
if (ktkPosition != null) if (ktkPosition != null)
{ {
ktkPosition.MiddleAxis_Position_P2 = FormUtil.GetIntValue(txtMiddleP2); ktkPosition.MiddleAxis_Position_P2 = FormUtil.GetIntValue(txtMiddleP2);
ktkPosition.MiddleAxis_Position_P3 = FormUtil.GetIntValue(txtMiddleP3); // ktkPosition.MiddleAxis_Position_P3 = FormUtil.GetIntValue(txtMiddleP3);
ktkPosition.UpDownAxis_IHPosition_P3 = FormUtil.GetIntValue(txtUpDownP3); ktkPosition.UpDownAxis_IHPosition_P3 = FormUtil.GetIntValue(txtUpDownP3);
ktkPosition.UpDownAxis_ILPosition_P4 = FormUtil.GetIntValue(txtUpDownP4); ktkPosition.UpDownAxis_ILPosition_P4 = FormUtil.GetIntValue(txtUpDownP4);
ktkPosition.UpDownAxis_OLPosition_P5 = FormUtil.GetIntValue(txtUpDownP5); ktkPosition.UpDownAxis_OLPosition_P5 = FormUtil.GetIntValue(txtUpDownP5);
ktkPosition.UpDownAxis_OHPosition_P6 = FormUtil.GetIntValue(txtUpDownP6); ktkPosition.UpDownAxis_OHPosition_P6 = FormUtil.GetIntValue(txtUpDownP6);
ktkPosition.UpDownAxis_Position_P9 = FormUtil.GetIntValue(txtUpDownP9); //ktkPosition.UpDownAxis_Position_P9 = FormUtil.GetIntValue(txtUpDownP9);
ktkPosition.InOutAxis_Position_P3 = FormUtil.GetIntValue(txtInOutP3); ktkPosition.InOutAxis_Position_P3 = FormUtil.GetIntValue(txtInOutP3);
ktkPosition.CompressAxis_CPosition_P3 = FormUtil.GetIntValue(txtComP3); ktkPosition.CompressAxis_CPosition_P3 = FormUtil.GetIntValue(txtComP3);
...@@ -809,14 +809,14 @@ namespace OnlineStore.ACSingleStore ...@@ -809,14 +809,14 @@ namespace OnlineStore.ACSingleStore
AxisABSMove(store.Config.UpDown_Axis, value, store.Config.UpDownAxis_P6_Speed); AxisABSMove(store.Config.UpDown_Axis, value, store.Config.UpDownAxis_P6_Speed);
} }
} }
private void btnUpDownP9_Click(object sender, EventArgs e) //private void btnUpDownP9_Click(object sender, EventArgs e)
{ //{
if (InOutIsIsP1()) // if (InOutIsIsP1())
{ // {
int value = FormUtil.GetIntValue(txtUpDownP9); // int value = FormUtil.GetIntValue(txtUpDownP9);
AxisABSMove(store.Config.UpDown_Axis, value, store.Config.UpDownAxis_P5_Speed); // AxisABSMove(store.Config.UpDown_Axis, value, store.Config.UpDownAxis_P5_Speed);
} // }
} //}
private void btnMiddleP1_Click(object sender, EventArgs e) private void btnMiddleP1_Click(object sender, EventArgs e)
{ {
if (InOutIsIsP1()) if (InOutIsIsP1())
...@@ -839,8 +839,8 @@ namespace OnlineStore.ACSingleStore ...@@ -839,8 +839,8 @@ namespace OnlineStore.ACSingleStore
{ {
if (InOutIsIsP1()) if (InOutIsIsP1())
{ {
int value = FormUtil.GetIntValue(txtMiddleP3); //int value = FormUtil.GetIntValue(txtMiddleP3);
AxisABSMove(store.Config.Middle_Axis, value, store.Config.MiddleAxis_P2_Speed); // AxisABSMove(store.Config.Middle_Axis, value, store.Config.MiddleAxis_P2_Speed);
} }
} }
......
source/DeviceLibrary/StoreConfig/AC/StoreConfig.csv
...@@ -71,7 +71,6 @@ PRO,ᣨ2P5ٶ,UpDownAxis_P5_Speed,1000,,,,,,,,,,, ...@@ -71,7 +71,6 @@ PRO,ᣨ2P5ٶ,UpDownAxis_P5_Speed,1000,,,,,,,,,,,
PRO,升降轴（轴2）P6速度,UpDownAxis_P6_Speed,100,,,,,,,,,,, PRO,升降轴（轴2）P6速度,UpDownAxis_P6_Speed,100,,,,,,,,,,,
PRO,升降轴（轴2）P7速度,UpDownAxis_P7_Speed,100,,,,,, ,,,,, PRO,升降轴（轴2）P7速度,UpDownAxis_P7_Speed,100,,,,,, ,,,,,
PRO,升降轴（轴2）P8速度,UpDownAxis_P8_Speed,100,,,,,,,,,,, PRO,升降轴（轴2）P8速度,UpDownAxis_P8_Speed,100,,,,,,,,,,,
PRO,升降轴（轴2）P9速度,UpDownAxis_P9_Speed,50,,,,,,,,,,,
PRO,旋转轴（轴1）P1速度,MiddleAxis_P1_Speed,500,,,,,,,,,,, PRO,旋转轴（轴1）P1速度,MiddleAxis_P1_Speed,500,,,,,,,,,,,
PRO,旋转轴（轴1）P2速度,MiddleAxis_P2_Speed,500,,,,,,,,,,, PRO,旋转轴（轴1）P2速度,MiddleAxis_P2_Speed,500,,,,,,,,,,,
PRO,进出轴（轴3）P1速度,InOutAxis_P1_Speed,500,,,,,,,,,,, PRO,进出轴（轴3）P1速度,InOutAxis_P1_Speed,500,,,,,,,,,,,
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Inventory.cs
...@@ -27,25 +27,25 @@ namespace OnlineStore.DeviceLibrary ...@@ -27,25 +27,25 @@ namespace OnlineStore.DeviceLibrary
{ {
StoreMove.NextMoveStep(StoreMoveStep.SC_04_Inventory);//直接跑到库位点，不使用盘点信号 StoreMove.NextMoveStep(StoreMoveStep.SC_04_Inventory);//直接跑到库位点，不使用盘点信号
// StoreMove.NextMoveStep(StoreMoveStep.SC_02_MoveToLBag); // StoreMove.NextMoveStep(StoreMoveStep.SC_02_MoveToLBag);
ACAxisMove(Config.Middle_Axis, moveP.Middle_P3, Config.MiddleAxis_P2_Speed); // ACAxisMove(Config.Middle_Axis, moveP.Middle_P3, Config.MiddleAxis_P2_Speed);
int outCount = ACServerManager.GetActualtPosition(Config.UpDown_Axis.DeviceName, Config.UpDown_Axis.GetAxisValue()); // int outCount = ACServerManager.GetActualtPosition(Config.UpDown_Axis.DeviceName, Config.UpDown_Axis.GetAxisValue());
int disCount = Math.Abs(outCount - moveP.UpDown_P5); // int disCount = Math.Abs(outCount - moveP.UpDown_P5);
if (disCount > 150000) // if (disCount > 150000)
{ // {
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P5, Config.UpDownAxis_P5_Speed); // ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P5, Config.UpDownAxis_P5_Speed);
CheckPositionLog(" 旋转轴 至P3（料叉背向库位点）升降轴到P5(库位低点) UpDownAxis_P5_Speed=" + Config.UpDownAxis_P5_Speed.ToString()); // CheckPositionLog(" 旋转轴 至P3（料叉背向库位点）升降轴到P5(库位低点) UpDownAxis_P5_Speed=" + Config.UpDownAxis_P5_Speed.ToString());
} // }
else // else
{ // {
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P5, Config.UpDownAxis_P6_Speed); // ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P5, Config.UpDownAxis_P6_Speed);
CheckPositionLog(" 旋转轴 至P3（料叉背向库位点）升降轴到P5(库位低点) UpDownAxis_P6_Speed=" + Config.UpDownAxis_P6_Speed.ToString()); // CheckPositionLog(" 旋转轴 至P3（料叉背向库位点）升降轴到P5(库位低点) UpDownAxis_P6_Speed=" + Config.UpDownAxis_P6_Speed.ToString());
} // }
} //}
else if (StoreMove.MoveStep == StoreMoveStep.SC_02_MoveToLBag) //else if (StoreMove.MoveStep == StoreMoveStep.SC_02_MoveToLBag)
{ //{
StoreMove.NextMoveStep(StoreMoveStep.SC_03_MoveToHBag); // StoreMove.NextMoveStep(StoreMoveStep.SC_03_MoveToHBag);
CheckPositionLog(" 升降轴到库位高点P9, UpDownAxis_P9_Speed=" + Config.UpDownAxis_P9_Speed.ToString()); // CheckPositionLog(" 升降轴到库位高点P9, UpDownAxis_P9_Speed=" + Config.UpDownAxis_P9_Speed.ToString());
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P9, Config.UpDownAxis_P9_Speed); // ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P9, Config.UpDownAxis_P9_Speed);
} }
else if (StoreMove.MoveStep == StoreMoveStep.SC_03_MoveToHBag) else if (StoreMove.MoveStep == StoreMoveStep.SC_03_MoveToHBag)
{ {
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
...@@ -68,12 +68,12 @@ namespace OnlineStore.DeviceLibrary ...@@ -68,12 +68,12 @@ namespace OnlineStore.DeviceLibrary
p.ComPress_P3 = position.CompressAxis_CPosition_P3; p.ComPress_P3 = position.CompressAxis_CPosition_P3;
p.InOut_P3 = position.InOutAxis_Position_P3; p.InOut_P3 = position.InOutAxis_Position_P3;
p.Middle_P2 = position.MiddleAxis_Position_P2; p.Middle_P2 = position.MiddleAxis_Position_P2;
p.Middle_P3 = position.MiddleAxis_Position_P3; // p.Middle_P3 = position.MiddleAxis_Position_P3;
p.UpDown_P3 = position.UpDownAxis_IHPosition_P3; p.UpDown_P3 = position.UpDownAxis_IHPosition_P3;
p.UpDown_P4 = position.UpDownAxis_ILPosition_P4; p.UpDown_P4 = position.UpDownAxis_ILPosition_P4;
p.UpDown_P5 = position.UpDownAxis_OLPosition_P5; p.UpDown_P5 = position.UpDownAxis_OLPosition_P5;
p.UpDown_P6 = position.UpDownAxis_OHPosition_P6; p.UpDown_P6 = position.UpDownAxis_OHPosition_P6;
p.UpDown_P9 = position.UpDownAxis_Position_P9; //p.UpDown_P9 = position.UpDownAxis_Position_P9;
param.MoveP = p; param.MoveP = p;
if (param.PosInfo.PlateH <= 0) if (param.PosInfo.PlateH <= 0)
......
source/DeviceLibrary/store/LineMoveP.cs
...@@ -45,10 +45,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -45,10 +45,6 @@ namespace OnlineStore.DeviceLibrary
/// </summary> /// </summary>
public int UpDown_P8 { get; set; } public int UpDown_P8 { get; set; }
/// <summary> /// <summary>
/// 升降轴库位盘点点P9
/// </summary>
public int UpDown_P9 { get; set; }
/// <summary>
/// 轴1旋转轴 待机原位点 P1 /// 轴1旋转轴 待机原位点 P1
/// </summary> /// </summary>
public int Middle_P1 { get; set; } public int Middle_P1 { get; set; }
...@@ -57,10 +53,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -57,10 +53,6 @@ namespace OnlineStore.DeviceLibrary
/// </summary> /// </summary>
public int Middle_P2 { get; set; } public int Middle_P2 { get; set; }
/// <summary> /// <summary>
/// 轴1旋转轴 库位点 P3(料叉背面指向的库位位置)
/// </summary>
public int Middle_P3 { get; set; }
/// <summary>
/// 轴3进出轴 待机原位点P1 /// 轴3进出轴 待机原位点P1
/// </summary> /// </summary>
public int InOut_P1 { get; set; } public int InOut_P1 { get; set; }
......
source/LoadCVSLibrary/position/ACStorePosition.cs
...@@ -19,10 +19,6 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -19,10 +19,6 @@ namespace OnlineStore.LoadCSVLibrary
/// </summary> /// </summary>
[CSVAttribute("中轴位置P2")] [CSVAttribute("中轴位置P2")]
public int MiddleAxis_Position_P2 { get; set; } public int MiddleAxis_Position_P2 { get; set; }
/// <summary>
/// 中轴位置（旋转轴料叉背面库位点）P3
/// </summary>
[CSVAttribute("中轴位置P3")]
public int MiddleAxis_Position_P3 { get; set; } public int MiddleAxis_Position_P3 { get; set; }
/// <summary> /// <summary>
/// 升降轴（库位出料前点）P5 /// 升降轴（库位出料前点）P5
...@@ -44,12 +40,6 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -44,12 +40,6 @@ namespace OnlineStore.LoadCSVLibrary
/// </summary> /// </summary>
[CSVAttribute("升降轴库位入料缓冲点P4")] [CSVAttribute("升降轴库位入料缓冲点P4")]
public int UpDownAxis_ILPosition_P4 { get; set; } public int UpDownAxis_ILPosition_P4 { get; set; }
/// <summary>
/// 升降轴库位盘点点P9
/// </summary>
[CSVAttribute("升降轴库位盘点点P9")]
public int UpDownAxis_Position_P9 { get; set; }
/// <summary> /// <summary>
/// 进出轴（库位点取料点）P3 /// 进出轴（库位点取料点）P3
......
source/LoadCVSLibrary/storeConfig/config/AC_SA_Config.cs
...@@ -209,11 +209,6 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -209,11 +209,6 @@ namespace OnlineStore.LoadCSVLibrary
public int UpDownAxis_P8_Speed { get; set; } public int UpDownAxis_P8_Speed { get; set; }
/// <summary> /// <summary>
/// PRO 升降轴（轴2）P9速度 UpDownAxis_P9_Speed
/// </summary>
[ConfigProAttribute("UpDownAxis_P9_Speed")]
public int UpDownAxis_P9_Speed { get; set; }
/// <summary>
/// PRO 旋转轴（轴1）P1速度 MiddleAxis_P1_Speed /// PRO 旋转轴（轴1）P1速度 MiddleAxis_P1_Speed
/// </summary> /// </summary>
[ConfigProAttribute("MiddleAxis_P1_Speed")] [ConfigProAttribute("MiddleAxis_P1_Speed")]
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!