Skip to content

李娜 / SO664-HCSingleStore

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

调试问题修改

1 个父辈 45f99b75
内嵌 并排
正在显示 6 个修改的文件 包含 23 行增加 和 21 行删除
source/DeviceLibrary/AXIS/HC/HCAxisManager.cs
...@@ -140,13 +140,16 @@ namespace OnlineStore.DeviceLibrary ...@@ -140,13 +140,16 @@ namespace OnlineStore.DeviceLibrary
{ {
countError = false; countError = false;
bool isOk = HCBoardManager.MoveIsEnd(axisNo); bool isOk = HCBoardManager.MoveIsEnd(axisNo);
if (HCBoardManager.IsInPosition(axisNo, targetPosition, canErrorCount)) if (isOk)
{ {
return true; if (HCBoardManager.IsInPosition(axisNo, targetPosition, canErrorCount))
} {
else return true;
{ }
countError = true; else
{
countError = true;
}
} }
return false; return false;
} }
......
source/HCSingleStore/App.config
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<add key="HumitureControllerType" value="0" /> <add key="HumitureControllerType" value="0" />
<add key ="UseHCBoard" value ="1"/> <add key ="UseHCBoard" value ="1"/>
<!--流水线地址和端口配置--> <!--流水线地址和端口配置-->
<add key="LineServerIp" value="192.168.8.108" /> <!--<add key="LineServerIp" value="192.168.8.108" />-->
<add key="LineServerPort" value="5246" /> <add key="LineServerPort" value="5246" />
<!--是否调试状态--> <!--是否调试状态-->
<add key="IsInDebug" value="1" /> <add key="IsInDebug" value="1" />
......
source/HCSingleStore/FrmBox.Designer.cs
...@@ -302,7 +302,7 @@ ...@@ -302,7 +302,7 @@
this.groupBox1.Controls.Add(this.label43); this.groupBox1.Controls.Add(this.label43);
this.groupBox1.Controls.Add(this.label42); this.groupBox1.Controls.Add(this.label42);
this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox1.Location = new System.Drawing.Point(11, 443); this.groupBox1.Location = new System.Drawing.Point(11, 440);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(476, 136); this.groupBox1.Size = new System.Drawing.Size(476, 136);
this.groupBox1.TabIndex = 217; this.groupBox1.TabIndex = 217;
...@@ -481,7 +481,7 @@ ...@@ -481,7 +481,7 @@
this.groupBox2.Controls.Add(this.button6); this.groupBox2.Controls.Add(this.button6);
this.groupBox2.Controls.Add(this.button3); this.groupBox2.Controls.Add(this.button3);
this.groupBox2.Controls.Add(this.button5); this.groupBox2.Controls.Add(this.button5);
this.groupBox2.Location = new System.Drawing.Point(11, 359); this.groupBox2.Location = new System.Drawing.Point(11, 356);
this.groupBox2.Name = "groupBox2"; this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(476, 78); this.groupBox2.Size = new System.Drawing.Size(476, 78);
this.groupBox2.TabIndex = 276; this.groupBox2.TabIndex = 276;
...@@ -679,7 +679,7 @@ ...@@ -679,7 +679,7 @@
this.groupInout.Enabled = false; this.groupInout.Enabled = false;
this.groupInout.Location = new System.Drawing.Point(5, 6); this.groupInout.Location = new System.Drawing.Point(5, 6);
this.groupInout.Name = "groupInout"; this.groupInout.Name = "groupInout";
this.groupInout.Size = new System.Drawing.Size(508, 579); this.groupInout.Size = new System.Drawing.Size(508, 576);
this.groupInout.TabIndex = 100; this.groupInout.TabIndex = 100;
this.groupInout.TabStop = false; this.groupInout.TabStop = false;
this.groupInout.Text = "料仓操作"; this.groupInout.Text = "料仓操作";
...@@ -1341,10 +1341,10 @@ ...@@ -1341,10 +1341,10 @@
// tabPage1 // tabPage1
// //
this.tabPage1.Controls.Add(this.panel1); this.tabPage1.Controls.Add(this.panel1);
this.tabPage1.Location = new System.Drawing.Point(4, 29); this.tabPage1.Location = new System.Drawing.Point(4, 26);
this.tabPage1.Name = "tabPage1"; this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3); this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(1091, 607); this.tabPage1.Size = new System.Drawing.Size(1091, 610);
this.tabPage1.TabIndex = 0; this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " IO调试 "; this.tabPage1.Text = " IO调试 ";
this.tabPage1.UseVisualStyleBackColor = true; this.tabPage1.UseVisualStyleBackColor = true;
......
source/HCSingleStore/FrmBox.cs
...@@ -521,7 +521,7 @@ namespace OnlineStore.ACSingleStore ...@@ -521,7 +521,7 @@ namespace OnlineStore.ACSingleStore
//更新缓存 //更新缓存
StoreManager.UpdateBoxConfig(boxBean.Config); StoreManager.UpdateBoxConfig(boxBean.Config);
} }
MessageBox.Show("保存位置成功！");
} }
......
source/HCSingleStore/记录.txt
...@@ -55,4 +55,6 @@ ...@@ -55,4 +55,6 @@
位置保存问题. 位置保存问题.
自动复位有问题。
\ No newline at end of file \ No newline at end of file
自动复位有问题。
保存位置弹出提示框。
source/HuichuanLibrary/HCBoardManager_Axis.cs
...@@ -166,7 +166,7 @@ namespace HuichuanLibrary ...@@ -166,7 +166,7 @@ namespace HuichuanLibrary
{ {
//回零状态结束，并且不再忙碌中 //回零状态结束，并且不再忙碌中
AxisSts sts = GetAxisSts(axisNo); AxisSts sts = GetAxisSts(axisNo);
if (sts.BUSY.Equals(0) && sts.INP.Equals(0)) if (sts.BUSY.Equals(0) && sts.INP.Equals(1))
{ {
short homests = GetHomeStatus(axisNo); short homests = GetHomeStatus(axisNo);
...@@ -202,12 +202,9 @@ namespace HuichuanLibrary ...@@ -202,12 +202,9 @@ namespace HuichuanLibrary
public static bool MoveIsEnd(short axisNo ) public static bool MoveIsEnd(short axisNo )
{ {
AxisSts sts = GetAxisSts(axisNo); AxisSts sts = GetAxisSts(axisNo);
if (sts.BUSY.Equals(0) && sts.INP.Equals(0)) if (sts.BUSY.Equals(0) && sts.INP.Equals(1))
{ {
//if (IsInPosition(axisNo, targetPos)) return true;
//{
return true;
//}
} }
return false; return false;
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!