Skip to content

李娜 / SO664-AssemblyLine

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

界面点动速度错误

1 个父辈 c2c13302
内嵌 并排
正在显示 6 个修改的文件 包含 19 行增加 和 16 行删除
source/AssemblyLineClient/App.config
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<!--流水线监听端口--> <!--流水线监听端口-->
<add key="TCPServerPort" value="5246" /> <add key="TCPServerPort" value="5246" />
<!--AGV调度服务器地址--> <!--AGV调度服务器地址-->
<add key="AgvServerIp" value="10.85.199.20" /> <add key="AgvServerIp" value="10.85.162.40" />
<!--IO配置--> <!--IO配置-->
<add key="DIMS" value="60" /> <add key="DIMS" value="60" />
<add key="DOMS" value="300" /> <add key="DOMS" value="300" />
......
source/AssemblyLineClient/FrmFeedingEquip.Designer.cs
...@@ -138,11 +138,11 @@ ...@@ -138,11 +138,11 @@
this.panBase.Controls.SetChildIndex(this.btnStart, 0); this.panBase.Controls.SetChildIndex(this.btnStart, 0);
this.panBase.Controls.SetChildIndex(this.btnOutStore, 0); this.panBase.Controls.SetChildIndex(this.btnOutStore, 0);
this.panBase.Controls.SetChildIndex(this.lblStoreStatus, 0); this.panBase.Controls.SetChildIndex(this.lblStoreStatus, 0);
this.panBase.Controls.SetChildIndex(this.chbDebug, 0);
this.panBase.Controls.SetChildIndex(this.btnScan, 0); this.panBase.Controls.SetChildIndex(this.btnScan, 0);
this.panBase.Controls.SetChildIndex(this.lblName, 0); this.panBase.Controls.SetChildIndex(this.lblName, 0);
this.panBase.Controls.SetChildIndex(this.btnExit, 0); this.panBase.Controls.SetChildIndex(this.btnExit, 0);
this.panBase.Controls.SetChildIndex(this.chbBoxSendShelf, 0); this.panBase.Controls.SetChildIndex(this.chbBoxSendShelf, 0);
this.panBase.Controls.SetChildIndex(this.chbDebug, 0);
// //
// btnExit // btnExit
// //
...@@ -1394,7 +1394,7 @@ ...@@ -1394,7 +1394,7 @@
// //
this.chbBoxSendShelf.AutoSize = true; this.chbBoxSendShelf.AutoSize = true;
this.chbBoxSendShelf.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbBoxSendShelf.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbBoxSendShelf.Location = new System.Drawing.Point(530, 12); this.chbBoxSendShelf.Location = new System.Drawing.Point(524, 12);
this.chbBoxSendShelf.Name = "chbBoxSendShelf"; this.chbBoxSendShelf.Name = "chbBoxSendShelf";
this.chbBoxSendShelf.Size = new System.Drawing.Size(140, 24); this.chbBoxSendShelf.Size = new System.Drawing.Size(140, 24);
this.chbBoxSendShelf.TabIndex = 251; this.chbBoxSendShelf.TabIndex = 251;
......
source/AssemblyLineClient/FrmFeedingEquip.cs
...@@ -433,7 +433,7 @@ namespace OnlineStore.AssemblyLine ...@@ -433,7 +433,7 @@ namespace OnlineStore.AssemblyLine
int position = FormUtil.GetIntValue(txtSizePosition); int position = FormUtil.GetIntValue(txtSizePosition);
int speed = equipBean.Config.UpdownAxis_P2Speed; int speed = equipBean.Config.UpdownAxis_P2Speed;
LogUtil.info("点击【移栽位置P2】，料盘高度【" + cmbSizeList.Text + "】 位置【" + position + "】速度【" + speed + "】"); LogUtil.info(equipBean.Name + "点击【移栽位置P2】，料盘高度【" + cmbSizeList.Text + "】 位置【" + position + "】速度【" + speed + "】");
equipBean.UpdownAxis.AbsMove(null, position, speed); equipBean.UpdownAxis.AbsMove(null, position, speed);
} }
...@@ -443,7 +443,7 @@ namespace OnlineStore.AssemblyLine ...@@ -443,7 +443,7 @@ namespace OnlineStore.AssemblyLine
this.Enabled = false; this.Enabled = false;
equipBean.RunAxis(false, equipBean.BatchAxis); equipBean.RunAxis(false, equipBean.BatchAxis);
this.Enabled = true; this.Enabled = true;
LogUtil.info("伺服运转ON完成"); LogUtil.info(equipBean.Name + "伺服运转ON完成");
} }
...@@ -466,7 +466,7 @@ namespace OnlineStore.AssemblyLine ...@@ -466,7 +466,7 @@ namespace OnlineStore.AssemblyLine
{ {
int position = FormUtil.GetIntValue(txtP1); int position = FormUtil.GetIntValue(txtP1);
int speed = equipBean.Config.UpdownAxis_P1Speed; int speed = equipBean.Config.UpdownAxis_P1Speed;
LogUtil.info("点击【移栽升降轴待机位置P1：】， 位置【" + position + "】速度【" + speed + "】"); LogUtil.info(equipBean.Name + "点击【移栽升降轴待机位置P1：】， 位置【" + position + "】速度【" + speed + "】");
equipBean.UpdownAxis.AbsMove(null, position, speed); equipBean.UpdownAxis.AbsMove(null, position, speed);
} }
...@@ -514,18 +514,21 @@ namespace OnlineStore.AssemblyLine ...@@ -514,18 +514,21 @@ namespace OnlineStore.AssemblyLine
private void btnBP1_Click(object sender, EventArgs e) private void btnBP1_Click(object sender, EventArgs e)
{ {
int position = FormUtil.GetIntValue(txtBp1); int position = FormUtil.GetIntValue(txtBp1);
LogUtil.info(equipBean.Name + "点击【"+btnBP1.Text+"】， 位置【" + position + "】速度【" + equipBean.Config.BatchAxis_P1Speed + "】");
equipBean.BatchAxis.AbsMove(null, position, equipBean.Config.BatchAxis_P1Speed); equipBean.BatchAxis.AbsMove(null, position, equipBean.Config.BatchAxis_P1Speed);
} }
private void btnBP2_Click(object sender, EventArgs e) private void btnBP2_Click(object sender, EventArgs e)
{ {
int position = FormUtil.GetIntValue(txtBP2); int position = FormUtil.GetIntValue(txtBP2);
LogUtil.info(equipBean.Name + "点击【" + btnBP2.Text + "】， 位置【" + position + "】速度【" + equipBean.Config.BatchAxis_P2Speed + "】");
equipBean.BatchAxis.AbsMove(null, position, equipBean.Config.BatchAxis_P2Speed); equipBean.BatchAxis.AbsMove(null, position, equipBean.Config.BatchAxis_P2Speed);
} }
private void btnBP3_Click(object sender, EventArgs e) private void btnBP3_Click(object sender, EventArgs e)
{ {
int position = FormUtil.GetIntValue(txtBP3); int position = FormUtil.GetIntValue(txtBP3);
LogUtil.info(equipBean.Name + "点击【" + btnBP3.Text + "】， 位置【" + position + "】速度【" + equipBean.Config.BatchAxis_P3Speed + "】");
equipBean.BatchAxis.AbsMove(null, position, equipBean.Config.BatchAxis_P3Speed); equipBean.BatchAxis.AbsMove(null, position, equipBean.Config.BatchAxis_P3Speed);
} }
...@@ -573,7 +576,7 @@ namespace OnlineStore.AssemblyLine ...@@ -573,7 +576,7 @@ namespace OnlineStore.AssemblyLine
{ {
int position = FormUtil.GetIntValue(txtUpdownP3); int position = FormUtil.GetIntValue(txtUpdownP3);
int speed = equipBean.Config.UpdownAxis_P3Speed; int speed = equipBean.Config.UpdownAxis_P3Speed;
LogUtil.info("点击【移栽升降轴取料位置P3：】， 位置【" + position + "】速度【" + speed + "】"); LogUtil.info(equipBean.Name + "点击【移栽升降轴取料位置P3：】， 位置【" + position + "】速度【" + speed + "】");
equipBean.UpdownAxis.AbsMove(null, position, speed); equipBean.UpdownAxis.AbsMove(null, position, speed);
} }
......
source/AssemblyLineClient/FrmHYEquip.cs
...@@ -354,7 +354,7 @@ namespace OnlineStore.AssemblyLine ...@@ -354,7 +354,7 @@ namespace OnlineStore.AssemblyLine
if (position != -1) if (position != -1)
{ {
int speed = equipBean.Config.UpdownAxis_P3Speed; int speed = equipBean.Config.UpdownAxis_P3Speed;
LogUtil.info("点击【出料皮带线位置P3】，料盘高度【" + cmbSizeList.Text + "】 位置【" + position + "】速度【" + speed + "】"); LogUtil.info(equipBean.Name+"点击【出料皮带线位置P3】，料盘高度【" + cmbSizeList.Text + "】 位置【" + position + "】速度【" + speed + "】");
equipBase.UpdownAxis.AbsMove(null, position, speed); equipBase.UpdownAxis.AbsMove(null, position, speed);
} }
} }
...@@ -364,7 +364,7 @@ namespace OnlineStore.AssemblyLine ...@@ -364,7 +364,7 @@ namespace OnlineStore.AssemblyLine
if (position != -1) if (position != -1)
{ {
int speed = equipBean.Config.UpdownAxis_P2Speed; int speed = equipBean.Config.UpdownAxis_P2Speed;
LogUtil.info("点击【移栽位置】，料盘高度【" + cmbSizeList.Text + "】 位置【" + position + "】速度【" + speed + "】"); LogUtil.info(equipBean.Name + "点击【移栽位置】，料盘高度【" + cmbSizeList.Text + "】 位置【" + position + "】速度【" + speed + "】");
equipBase.UpdownAxis.AbsMove(null, position, speed); equipBase.UpdownAxis.AbsMove(null, position, speed);
} }
} }
...@@ -374,7 +374,7 @@ namespace OnlineStore.AssemblyLine ...@@ -374,7 +374,7 @@ namespace OnlineStore.AssemblyLine
if (position != -1) if (position != -1)
{ {
int speed = equipBean.Config.UpdownAxis_P1Speed; int speed = equipBean.Config.UpdownAxis_P1Speed;
LogUtil.info("点击【P1点测试】， 位置【" + position + "】速度【" + speed + "】"); LogUtil.info(equipBean.Name+"点击【P1点测试】， 位置【" + position + "】速度【" + speed + "】");
equipBase.UpdownAxis.AbsMove(null, position, speed); equipBase.UpdownAxis.AbsMove(null, position, speed);
} }
} }
......
source/AssemblyLineClient/FrmMoveEquip.cs
...@@ -400,7 +400,7 @@ namespace OnlineStore.AssemblyLine ...@@ -400,7 +400,7 @@ namespace OnlineStore.AssemblyLine
{ {
int position = FormUtil.GetIntValue(txtP2); int position = FormUtil.GetIntValue(txtP2);
int speed = equipBean.Config.UpdownAxis_P2Speed; int speed = equipBean.Config.UpdownAxis_P2Speed;
LogUtil.info("点击【移栽位置】，料盘高度【" + cmbSizeList.Text + "】 位置【" + position + "】速度【" + speed + "】"); LogUtil.info(equipBean.Name+"点击【移栽位置】，料盘高度【" + cmbSizeList.Text + "】 位置【" + position + "】速度【" + speed + "】");
equipBean.UpdownAxis.AbsMove(null, position, speed); equipBean.UpdownAxis.AbsMove(null, position, speed);
} }
...@@ -410,13 +410,13 @@ namespace OnlineStore.AssemblyLine ...@@ -410,13 +410,13 @@ namespace OnlineStore.AssemblyLine
this.Enabled = false; this.Enabled = false;
equipBean.RunAxis(false, equipBase.UpdownAxis); equipBean.RunAxis(false, equipBase.UpdownAxis);
this.Enabled = true; this.Enabled = true;
LogUtil.info("伺服运转ON完成"); LogUtil.info(equipBean.Name+"伺服运转ON完成");
} }
private void btnAxisOff_Click(object sender, EventArgs e) private void btnAxisOff_Click(object sender, EventArgs e)
{ {
equipBean.CloseAxis(equipBase.UpdownAxis); equipBean.CloseAxis(equipBase.UpdownAxis);
LogUtil.info("伺服运转OFF完成"); LogUtil.info(equipBean.Name+"伺服运转OFF完成");
} }
private void btnCloseAll_Click(object sender, EventArgs e) private void btnCloseAll_Click(object sender, EventArgs e)
...@@ -440,7 +440,7 @@ namespace OnlineStore.AssemblyLine ...@@ -440,7 +440,7 @@ namespace OnlineStore.AssemblyLine
int position = FormUtil.GetIntValue(txtP1); int position = FormUtil.GetIntValue(txtP1);
int speed = equipBean.Config.UpdownAxis_P1Speed; int speed = equipBean.Config.UpdownAxis_P1Speed;
LogUtil.info("点击【P1点测试】， 位置【" + position + "】速度【" + speed + "】"); LogUtil.info(equipBean.Name+ "点击【P1点测试】， 位置【" + position + "】速度【" + speed + "】");
equipBean.UpdownAxis.AbsMove(null, position, speed); equipBean.UpdownAxis.AbsMove(null, position, speed);
} }
...@@ -469,7 +469,7 @@ namespace OnlineStore.AssemblyLine ...@@ -469,7 +469,7 @@ namespace OnlineStore.AssemblyLine
int position = FormUtil.GetIntValue(txtP3); int position = FormUtil.GetIntValue(txtP3);
int speed = equipBean.Config.UpdownAxis_P3Speed; int speed = equipBean.Config.UpdownAxis_P3Speed;
LogUtil.info("点击【料仓门口下降位置】，料盘高度【" + cmbSizeList.Text + "】 位置【" + position + "】速度【" + speed + "】"); LogUtil.info(equipBean.Name+"点击【料仓门口下降位置】，料盘高度【" + cmbSizeList.Text + "】 位置【" + position + "】速度【" + speed + "】");
equipBean.UpdownAxis.AbsMove(null, position, speed); equipBean.UpdownAxis.AbsMove(null, position, speed);
} }
......
source/DeviceLibrary/baan/AxisBean.cs
...@@ -234,7 +234,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -234,7 +234,7 @@ namespace OnlineStore.DeviceLibrary
return; return;
} }
LastPosition = -1; LastPosition = -1;
if (targetSpeed > Config.TargetSpeed || targetSpeed <= 0) if (targetSpeed > (Config.TargetSpeed * 10) || targetSpeed <= 0)
{ {
targetSpeed = Config.TargetSpeed; targetSpeed = Config.TargetSpeed;
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!