Skip to content

李娜 / SO664-AssemblyLine

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 5075635d 由 LN
选项

bug修改

1 个父辈 82c9764f
内嵌 并排
正在显示 5 个修改的文件 包含 13 行增加 和 11 行删除
source/AssemblyLineClient/useControl/AxisMoveControl.cs
...@@ -23,6 +23,7 @@ namespace OnlineStore.AssemblyLine ...@@ -23,6 +23,7 @@ namespace OnlineStore.AssemblyLine
private string PortName = ""; private string PortName = "";
private short SlvAddr = 0; private short SlvAddr = 0;
private bool IsHuiChuan = true; private bool IsHuiChuan = true;
private Color btnBackColor = Color.White;
public AxisMoveControl( ) public AxisMoveControl( )
{ {
InitializeComponent(); InitializeComponent();
...@@ -103,12 +104,12 @@ namespace OnlineStore.AssemblyLine ...@@ -103,12 +104,12 @@ namespace OnlineStore.AssemblyLine
AxisManager.instance.SuddenStop(PortName, SlvAddr); AxisManager.instance.SuddenStop(PortName, SlvAddr);
if (btnAddMove.BackColor == Color.Green) if (btnAddMove.BackColor == Color.Green)
{ {
btnAddMove.BackColor = System.Drawing.SystemColors.Control; btnAddMove.BackColor = btnBackColor;
} }
if (btnDelMove.BackColor == Color.Green) if (btnDelMove.BackColor == Color.Green)
{ {
btnDelMove.BackColor = System.Drawing.SystemColors.Control; btnDelMove.BackColor = btnBackColor;
} }
btnReadPosition_Click(null, null); btnReadPosition_Click(null, null);
} }
...@@ -204,7 +205,7 @@ namespace OnlineStore.AssemblyLine ...@@ -204,7 +205,7 @@ namespace OnlineStore.AssemblyLine
} }
private void btnAddMove_MouseDown(object sender, MouseEventArgs e) private void btnAddMove_MouseDown(object sender, MouseEventArgs e)
{ {
if (btnAddMove.BackColor.Equals(System.Drawing.SystemColors.Control)) if (btnAddMove.BackColor.Equals(btnBackColor))
{ {
int speed = FormUtil.GetIntValue(txtMiddleSpeed); int speed = FormUtil.GetIntValue(txtMiddleSpeed);
if (speed <= 0) if (speed <= 0)
...@@ -221,7 +222,7 @@ namespace OnlineStore.AssemblyLine ...@@ -221,7 +222,7 @@ namespace OnlineStore.AssemblyLine
{ {
if (btnAddMove.BackColor == Color.Green ) if (btnAddMove.BackColor == Color.Green )
{ {
btnAddMove.BackColor = System.Drawing.SystemColors.Control; btnAddMove.BackColor = btnBackColor;
AxisManager.instance.SuddenStop(PortName, SlvAddr); AxisManager.instance.SuddenStop(PortName, SlvAddr);
btnReadPosition_Click(null, null); btnReadPosition_Click(null, null);
} }
...@@ -229,7 +230,7 @@ namespace OnlineStore.AssemblyLine ...@@ -229,7 +230,7 @@ namespace OnlineStore.AssemblyLine
private void btnDelMove_MouseDown(object sender, MouseEventArgs e) private void btnDelMove_MouseDown(object sender, MouseEventArgs e)
{ {
if (btnDelMove.BackColor.Equals(System.Drawing.SystemColors.Control)) if (btnDelMove.BackColor.Equals(btnBackColor))
{ {
int speed = FormUtil.GetIntValue(txtMiddleSpeed); int speed = FormUtil.GetIntValue(txtMiddleSpeed);
if (speed <= 0) if (speed <= 0)
...@@ -246,7 +247,7 @@ namespace OnlineStore.AssemblyLine ...@@ -246,7 +247,7 @@ namespace OnlineStore.AssemblyLine
{ {
if ( btnDelMove.BackColor == Color.Green) if ( btnDelMove.BackColor == Color.Green)
{ {
btnDelMove.BackColor = System.Drawing.SystemColors.Control; btnDelMove.BackColor = btnBackColor;
AxisManager.instance.SuddenStop(PortName, SlvAddr); AxisManager.instance.SuddenStop(PortName, SlvAddr);
btnReadPosition_Click(null, null); btnReadPosition_Click(null, null);
} }
...@@ -323,6 +324,7 @@ namespace OnlineStore.AssemblyLine ...@@ -323,6 +324,7 @@ namespace OnlineStore.AssemblyLine
short value = HCBoardManager.GetHomeStatus(axisNo); short value = HCBoardManager.GetHomeStatus(axisNo);
string homesstr = HCBoardManager.AxisHomeSts(value); string homesstr = HCBoardManager.AxisHomeSts(value);
lblhomeSts.Text = homesstr; lblhomeSts.Text = homesstr;
lblCountPulse.Text = AxisManager.instance.GetActualtPosition(PortName, SlvAddr).ToString();
} }
private void ShowlbSts(Label lbl, int value, bool isAlarm = false) private void ShowlbSts(Label lbl, int value, bool isAlarm = false)
{ {
......
source/DeviceLibrary/LineConfig/Config_Line.csv
...@@ -1101,8 +1101,8 @@ DI,17,D9-2夹料气缸料盘检测,ClampCylinder_Check,526,HC,X526 ...@@ -1101,8 +1101,8 @@ DI,17,D9-2夹料气缸料盘检测,ClampCylinder_Check,526,HC,X526
DI,17,D9-2夹料放松端,ClampCylinder_Relax,527,HC,X527 DI,17,D9-2夹料放松端,ClampCylinder_Relax,527,HC,X527
DI,17,D9-2升降上升端,UpDownCylinder_Up,528,HC,X528 DI,17,D9-2升降上升端,UpDownCylinder_Up,528,HC,X528
DI,17,D9-2升降下降端,UpDownCylinder_Down,529,HC,X529 DI,17,D9-2升降下降端,UpDownCylinder_Down,529,HC,X529
DI,20,D10-1阻挡1托盘检测,StopCheck2,530,HC,X530 DI,20,D10-1阻挡1托盘检测,StopCheck1,530,HC,X530
DI,20,D10-1阻挡2托盘检测,TopCylinder_Up,531,HC,X531 DI,20,D10-1阻挡2托盘检测,StopCheck2,531,HC,X531
DI,20,D10-1顶升上升端,TopCylinder_Up,532,HC,X532 DI,20,D10-1顶升上升端,TopCylinder_Up,532,HC,X532
DI,20,D10-1顶升下降端,TopCylinder_Down,533,HC,X533 DI,20,D10-1顶升下降端,TopCylinder_Down,533,HC,X533
DI,20,D10-1横移前进端,BeforeAfterCylinder_Before,534,HC,X534 DI,20,D10-1横移前进端,BeforeAfterCylinder_Before,534,HC,X534
......
source/DeviceLibrary/LineConfig/HY/Config_HYEquip_10.csv
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,, PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,,
PRO,0,是否使用伺服,UpDownUseAxis,1,, PRO,0,是否使用伺服,UpDownUseAxis,1,,
,,,,,, ,,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,100,HC,,250,1000,1000,60,80,50,10,100,0,0 AXIS,0,移栽上下轴,UpDown_Axis,19,HC,,250,1000,1000,60,80,50,10,100,0,0
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,-11000,, PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,-11000,,
PRO,0,移栽上下轴托盘取料点P2,UpDownP2List,0=80000;12=141200;16=130000;24=110000;32=98000;44=76000;48=73700;56=61000;8=150000,, PRO,0,移栽上下轴托盘取料点P2,UpDownP2List,0=80000;12=141200;16=130000;24=110000;32=98000;44=76000;48=73700;56=61000;8=150000,,
PRO,0,移栽上下轴接驳台放料点P3,UpDownP3List,0=90000;12=157500;16=150800;24=138200;32=116800;44=92500;48=90000;56=95000;8=160000,, PRO,0,移栽上下轴接驳台放料点P3,UpDownP3List,0=90000;12=157500;16=150800;24=138200;32=116800;44=92500;48=90000;56=95000;8=160000,,
......
source/DeviceLibrary/LineConfig/HY/Config_HYEquip_12.csv
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,, PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,,
PRO,0,是否使用伺服,UpDownUseAxis,1,, PRO,0,是否使用伺服,UpDownUseAxis,1,,
,,,,,, ,,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,100,HC,,250,1000,1000,60,80,50,10,100,0,0 AXIS,0,移栽上下轴,UpDown_Axis,21,HC,,250,1000,1000,60,80,50,10,100,0,0
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,-11000,, PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,-11000,,
PRO,0,移栽上下轴托盘取料点P2,UpDownP2List,0=80000;12=141200;16=130000;24=110000;32=98000;44=76000;48=73700;56=61000;8=150000,, PRO,0,移栽上下轴托盘取料点P2,UpDownP2List,0=80000;12=141200;16=130000;24=110000;32=98000;44=76000;48=73700;56=61000;8=150000,,
PRO,0,移栽上下轴接驳台放料点P3,UpDownP3List,0=90000;12=157500;16=150800;24=138200;32=116800;44=92500;48=90000;56=95000;8=160000,, PRO,0,移栽上下轴接驳台放料点P3,UpDownP3List,0=90000;12=157500;16=150800;24=138200;32=116800;44=92500;48=90000;56=95000;8=160000,,
......
source/DeviceLibrary/LineConfig/HY/Config_HYEquip_17.csv
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,, PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,,
PRO,0,是否使用伺服,UpDownUseAxis,1,, PRO,0,是否使用伺服,UpDownUseAxis,1,,
,,,,,, ,,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,100,HC,,250,1000,1000,60,80,50,10,100,0,0 AXIS,0,移栽上下轴,UpDown_Axis,0,HC,,250,1000,1000,60,80,50,10,100,0,0
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,-11000,, PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,-11000,,
PRO,0,移栽上下轴托盘取料点P2,UpDownP2List,0=80000;12=141200;16=130000;24=110000;32=98000;44=76000;48=73700;56=61000;8=150000,, PRO,0,移栽上下轴托盘取料点P2,UpDownP2List,0=80000;12=141200;16=130000;24=110000;32=98000;44=76000;48=73700;56=61000;8=150000,,
PRO,0,移栽上下轴接驳台放料点P3,UpDownP3List,0=90000;12=157500;16=150800;24=138200;32=116800;44=92500;48=90000;56=95000;8=160000,, PRO,0,移栽上下轴接驳台放料点P3,UpDownP3List,0=90000;12=157500;16=150800;24=138200;32=116800;44=92500;48=90000;56=95000;8=160000,,
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!