Skip to content

李娜 / SO664-HCSingleStore

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

点位调试增加报警日志

1 个父辈 b1b24648
全部展开
内嵌 并排
正在显示 4 个修改的文件 包含 25 行增加 和 25 行删除
source/HCSingleStore/positionTool/FrmTool.Designer.cs
...@@ -35,6 +35,8 @@ ...@@ -35,6 +35,8 @@
this.lblFileP = new System.Windows.Forms.Label(); this.lblFileP = new System.Windows.Forms.Label();
this.btnOpenFolder = new System.Windows.Forms.Button(); this.btnOpenFolder = new System.Windows.Forms.Button();
this.group2 = new System.Windows.Forms.GroupBox(); this.group2 = new System.Windows.Forms.GroupBox();
this.txtUpdownStart = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label();
this.txtTargetPosition = new System.Windows.Forms.TextBox(); this.txtTargetPosition = new System.Windows.Forms.TextBox();
this.label14 = new System.Windows.Forms.Label(); this.label14 = new System.Windows.Forms.Label();
this.btnUpdownP = new System.Windows.Forms.Button(); this.btnUpdownP = new System.Windows.Forms.Button();
...@@ -69,8 +71,6 @@ ...@@ -69,8 +71,6 @@
this.panel1 = new System.Windows.Forms.Panel(); this.panel1 = new System.Windows.Forms.Panel();
this.axisJogControl1 = new OnlineStore.ACSingleStore.AxisJogControl(); this.axisJogControl1 = new OnlineStore.ACSingleStore.AxisJogControl();
this.timer1 = new System.Windows.Forms.Timer(this.components); this.timer1 = new System.Windows.Forms.Timer(this.components);
this.txtUpdownStart = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label();
this.panelAll.SuspendLayout(); this.panelAll.SuspendLayout();
this.group6.SuspendLayout(); this.group6.SuspendLayout();
this.group2.SuspendLayout(); this.group2.SuspendLayout();
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
this.lblMoveInfo.ForeColor = System.Drawing.Color.Blue; this.lblMoveInfo.ForeColor = System.Drawing.Color.Blue;
this.lblMoveInfo.Location = new System.Drawing.Point(422, 379); this.lblMoveInfo.Location = new System.Drawing.Point(422, 379);
this.lblMoveInfo.Name = "lblMoveInfo"; this.lblMoveInfo.Name = "lblMoveInfo";
this.lblMoveInfo.Size = new System.Drawing.Size(498, 67); this.lblMoveInfo.Size = new System.Drawing.Size(498, 94);
this.lblMoveInfo.TabIndex = 324; this.lblMoveInfo.TabIndex = 324;
this.lblMoveInfo.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.lblMoveInfo.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
// //
...@@ -158,6 +158,25 @@ ...@@ -158,6 +158,25 @@
this.group2.TabStop = false; this.group2.TabStop = false;
this.group2.Text = "第二步：确认（轴二）升降轴最高位置："; this.group2.Text = "第二步：确认（轴二）升降轴最高位置：";
// //
// txtUpdownStart
//
this.txtUpdownStart.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownStart.Location = new System.Drawing.Point(126, 23);
this.txtUpdownStart.MaxLength = 30;
this.txtUpdownStart.Name = "txtUpdownStart";
this.txtUpdownStart.Size = new System.Drawing.Size(105, 26);
this.txtUpdownStart.TabIndex = 260;
//
// label1
//
this.label1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.Location = new System.Drawing.Point(8, 27);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(110, 20);
this.label1.TabIndex = 261;
this.label1.Text = "升降轴开始位置：";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtTargetPosition // txtTargetPosition
// //
this.txtTargetPosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtTargetPosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
...@@ -533,25 +552,6 @@ ...@@ -533,25 +552,6 @@
this.timer1.Interval = 1000; this.timer1.Interval = 1000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick); this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
// //
// txtUpdownStart
//
this.txtUpdownStart.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownStart.Location = new System.Drawing.Point(126, 23);
this.txtUpdownStart.MaxLength = 30;
this.txtUpdownStart.Name = "txtUpdownStart";
this.txtUpdownStart.Size = new System.Drawing.Size(105, 26);
this.txtUpdownStart.TabIndex = 260;
//
// label1
//
this.label1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.Location = new System.Drawing.Point(8, 27);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(110, 20);
this.label1.TabIndex = 261;
this.label1.Text = "升降轴开始位置：";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// FrmTool // FrmTool
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
......
source/HCSingleStore/positionTool/FrmTool.cs
...@@ -167,7 +167,7 @@ namespace OnlineStore.ACSingleStore ...@@ -167,7 +167,7 @@ namespace OnlineStore.ACSingleStore
if (group1.Enabled.Equals(true)) if (group1.Enabled.Equals(true))
{ {
workMoveStatus(true); workMoveStatus(true);
} }
lblMoveInfo.Text = autoP.CurrStr(); lblMoveInfo.Text = autoP.CurrStr();
} }
......
source/HuichuanLibrary/HCBoardManager_Axis.cs
...@@ -152,7 +152,7 @@ namespace HuichuanLibrary ...@@ -152,7 +152,7 @@ namespace HuichuanLibrary
} }
else else
{ {
ShowLog(" Axis[" + axisNo + "] FinishHoming OK！"); DebugLog(" Axis[" + axisNo + "] FinishHoming OK！");
return true; return true;
} }
} }
...@@ -296,7 +296,7 @@ namespace HuichuanLibrary ...@@ -296,7 +296,7 @@ namespace HuichuanLibrary
} }
else else
{ {
ShowLog(" Axis[" + axisNo + "] MoveStop OK"); DebugLog(" Axis[" + axisNo + "] MoveStop OK");
return true; return true;
} }
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!