Skip to content

刘韬 / SO815-AutoInOutStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit aa170659 由 刘韬
选项

优化批量轴逻辑,发货前版本

1 个父辈 9ecc8e31
内嵌 并排
正在显示 16 个修改的文件 包含 217 行增加 和 953 行删除
source/ACSingleStore/App.config
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
<conversionPattern value="[%date][%t] %m%n" /> <conversionPattern value="[%date][%t] %m%n" />
</layout> </layout>
</appender> </appender>
<logger name="RollingLogFileAppender"> <logger name="RollingLogFileAppender1">
<level value="ALL" /> <level value="ALL" />
<appender-ref ref="RollingLogFileAppender" /> <appender-ref ref="RollingLogFileAppender" />
</logger> </logger>
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
<level value="ALL" /> <level value="ALL" />
<appender-ref ref="AIOBOX" /> <appender-ref ref="AIOBOX" />
</logger> </logger>
<logger name="HCBOARD"> <logger name="HCBOARD" additivity="false">
<level value="ALL" /> <level value="ALL" />
<appender-ref ref="HCBOARD" /> <appender-ref ref="HCBOARD" />
</logger> </logger>
......
source/ACSingleStore/AutoInOutStore.csproj
...@@ -38,8 +38,9 @@ ...@@ -38,8 +38,9 @@
<ApplicationIcon>box.ico</ApplicationIcon> <ApplicationIcon>box.ico</ApplicationIcon>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="CodeLibrary"> <Reference Include="CodeLibrary, Version=1.0.7635.28877, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\dll\CodeLibrary.dll</HintPath> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\GeneralClassLibrary\CodeLibraryProject\CodeLibrary\bin\Debug\CodeLibrary.dll</HintPath>
</Reference> </Reference>
<Reference Include="halcondotnet"> <Reference Include="halcondotnet">
<HintPath>..\..\dll\halcondotnet.dll</HintPath> <HintPath>..\..\dll\halcondotnet.dll</HintPath>
...@@ -48,8 +49,9 @@ ...@@ -48,8 +49,9 @@
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\HuichuanLibrary\HuichuanLibrary\bin\Debug\HuichuanLibrary.dll</HintPath> <HintPath>..\..\..\HuichuanLibrary\HuichuanLibrary\bin\Debug\HuichuanLibrary.dll</HintPath>
</Reference> </Reference>
<Reference Include="log4net"> <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\..\dll\log4net.dll</HintPath> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\增广夹爪\log4net.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
......
source/ACSingleStore/FrmBase.cs
...@@ -135,5 +135,17 @@ namespace OnlineStore.AutoInOutStore ...@@ -135,5 +135,17 @@ namespace OnlineStore.AutoInOutStore
LanguageProcess(); LanguageProcess();
} }
} }
protected override void OnPaint(PaintEventArgs e)
{
try
{
base.OnPaint(e);
}
catch
{
Invalidate();
}
}
} }
} }
source/ACSingleStore/FrmStoreBox.Designer.cs
...@@ -67,6 +67,7 @@ ...@@ -67,6 +67,7 @@
this.chbAuto = new System.Windows.Forms.CheckBox(); this.chbAuto = new System.Windows.Forms.CheckBox();
this.lblWarnMsg = new System.Windows.Forms.Label(); this.lblWarnMsg = new System.Windows.Forms.Label();
this.tabPage2 = new System.Windows.Forms.TabPage(); this.tabPage2 = new System.Windows.Forms.TabPage();
this.axisMoveControl1 = new OnlineStore.AutoCountClient.AxisMoveControl();
this.picAxis4 = new System.Windows.Forms.PictureBox(); this.picAxis4 = new System.Windows.Forms.PictureBox();
this.picPPoint = new System.Windows.Forms.PictureBox(); this.picPPoint = new System.Windows.Forms.PictureBox();
this.groupBox7 = new System.Windows.Forms.GroupBox(); this.groupBox7 = new System.Windows.Forms.GroupBox();
...@@ -79,50 +80,6 @@ ...@@ -79,50 +80,6 @@
this.label27 = new System.Windows.Forms.Label(); this.label27 = new System.Windows.Forms.Label();
this.btnTempClose = new System.Windows.Forms.Button(); this.btnTempClose = new System.Windows.Forms.Button();
this.btnTempInit = new System.Windows.Forms.Button(); this.btnTempInit = new System.Windows.Forms.Button();
this.groupAxis = new System.Windows.Forms.GroupBox();
this.label24 = new System.Windows.Forms.Label();
this.label26 = new System.Windows.Forms.Label();
this.txtLimit2 = new System.Windows.Forms.TextBox();
this.label22 = new System.Windows.Forms.Label();
this.label23 = new System.Windows.Forms.Label();
this.txtLimit1 = new System.Windows.Forms.TextBox();
this.label6 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
this.txtHomeSingle = new System.Windows.Forms.TextBox();
this.chbAutoRead = new System.Windows.Forms.CheckBox();
this.label16 = new System.Windows.Forms.Label();
this.label15 = new System.Windows.Forms.Label();
this.label14 = new System.Windows.Forms.Label();
this.label11 = new System.Windows.Forms.Label();
this.txtHomeStatus = new System.Windows.Forms.TextBox();
this.label10 = new System.Windows.Forms.Label();
this.txtBusyStatus = new System.Windows.Forms.TextBox();
this.label2 = new System.Windows.Forms.Label();
this.txtAlarmStatus = new System.Windows.Forms.TextBox();
this.btnGetAlarm = new System.Windows.Forms.Button();
this.lblServerOn = new System.Windows.Forms.Label();
this.label7 = new System.Windows.Forms.Label();
this.label8 = new System.Windows.Forms.Label();
this.btnOpenAxis = new System.Windows.Forms.Button();
this.btnCloseAxis = new System.Windows.Forms.Button();
this.lblCountPulse = new System.Windows.Forms.TextBox();
this.txtASpeed = new System.Windows.Forms.TextBox();
this.lblOutPulse = new System.Windows.Forms.TextBox();
this.label47 = new System.Windows.Forms.Label();
this.btnAxisVMove = new System.Windows.Forms.Button();
this.btnAxisRMove = new System.Windows.Forms.Button();
this.btnAxisReturnHome = new System.Windows.Forms.Button();
this.btnAxisAMove = new System.Windows.Forms.Button();
this.btnComAlarmClear = new System.Windows.Forms.Button();
this.txtAPosition = new System.Windows.Forms.TextBox();
this.label48 = new System.Windows.Forms.Label();
this.btnAxisStop = new System.Windows.Forms.Button();
this.txtAxisValue = new System.Windows.Forms.TextBox();
this.txtAxisDeviceName = new System.Windows.Forms.TextBox();
this.label45 = new System.Windows.Forms.Label();
this.label46 = new System.Windows.Forms.Label();
this.cmbAxisList = new System.Windows.Forms.ComboBox();
this.label49 = new System.Windows.Forms.Label();
this.groupInout = new System.Windows.Forms.GroupBox(); this.groupInout = new System.Windows.Forms.GroupBox();
this.txtInoutP4 = new System.Windows.Forms.TextBox(); this.txtInoutP4 = new System.Windows.Forms.TextBox();
this.btnInOutP4 = new System.Windows.Forms.Button(); this.btnInOutP4 = new System.Windows.Forms.Button();
...@@ -212,7 +169,6 @@ ...@@ -212,7 +169,6 @@
this.英文ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.英文ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator22 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator22 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripMenuItem6 = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem6 = new System.Windows.Forms.ToolStripMenuItem();
this.axisMoveControl1 = new OnlineStore.AutoCountClient.AxisMoveControl();
this.contextMenuStrip1.SuspendLayout(); this.contextMenuStrip1.SuspendLayout();
this.groupAuto.SuspendLayout(); this.groupAuto.SuspendLayout();
this.groupBox6.SuspendLayout(); this.groupBox6.SuspendLayout();
...@@ -224,7 +180,6 @@ ...@@ -224,7 +180,6 @@
((System.ComponentModel.ISupportInitialize)(this.picAxis4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picAxis4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picPPoint)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picPPoint)).BeginInit();
this.groupBox7.SuspendLayout(); this.groupBox7.SuspendLayout();
this.groupAxis.SuspendLayout();
this.groupInout.SuspendLayout(); this.groupInout.SuspendLayout();
this.menuStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
...@@ -436,7 +391,7 @@ ...@@ -436,7 +391,7 @@
this.lblTemp.AutoSize = true; this.lblTemp.AutoSize = true;
this.lblTemp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblTemp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblTemp.ForeColor = System.Drawing.Color.Black; this.lblTemp.ForeColor = System.Drawing.Color.Black;
this.lblTemp.Location = new System.Drawing.Point(584, 638); this.lblTemp.Location = new System.Drawing.Point(582, 604);
this.lblTemp.Name = "lblTemp"; this.lblTemp.Name = "lblTemp";
this.lblTemp.Size = new System.Drawing.Size(136, 17); this.lblTemp.Size = new System.Drawing.Size(136, 17);
this.lblTemp.TabIndex = 270; this.lblTemp.TabIndex = 270;
...@@ -612,14 +567,14 @@ ...@@ -612,14 +567,14 @@
// //
// tabPage4 // tabPage4
// //
this.tabPage4.BackColor = System.Drawing.Color.White;
this.tabPage4.Controls.Add(this.richTextBox1); this.tabPage4.Controls.Add(this.richTextBox1);
this.tabPage4.Controls.Add(this.btnClearLog); this.tabPage4.Controls.Add(this.btnClearLog);
this.tabPage4.Location = new System.Drawing.Point(4, 30); this.tabPage4.Location = new System.Drawing.Point(4, 30);
this.tabPage4.Name = "tabPage4"; this.tabPage4.Name = "tabPage4";
this.tabPage4.Size = new System.Drawing.Size(1249, 659); this.tabPage4.Size = new System.Drawing.Size(1320, 659);
this.tabPage4.TabIndex = 4; this.tabPage4.TabIndex = 4;
this.tabPage4.Text = "日志"; this.tabPage4.Text = "日志";
this.tabPage4.UseVisualStyleBackColor = true;
// //
// richTextBox1 // richTextBox1
// //
...@@ -647,14 +602,14 @@ ...@@ -647,14 +602,14 @@
// //
// tabPage5 // tabPage5
// //
this.tabPage5.BackColor = System.Drawing.Color.White;
this.tabPage5.Controls.Add(this.groupBox6); this.tabPage5.Controls.Add(this.groupBox6);
this.tabPage5.Controls.Add(this.groupBox3); this.tabPage5.Controls.Add(this.groupBox3);
this.tabPage5.Location = new System.Drawing.Point(4, 30); this.tabPage5.Location = new System.Drawing.Point(4, 30);
this.tabPage5.Name = "tabPage5"; this.tabPage5.Name = "tabPage5";
this.tabPage5.Size = new System.Drawing.Size(1249, 659); this.tabPage5.Size = new System.Drawing.Size(1320, 659);
this.tabPage5.TabIndex = 5; this.tabPage5.TabIndex = 5;
this.tabPage5.Text = "设备信息"; this.tabPage5.Text = "设备信息";
this.tabPage5.UseVisualStyleBackColor = true;
// //
// groupBox3 // groupBox3
// //
...@@ -715,12 +670,12 @@ ...@@ -715,12 +670,12 @@
// //
// tabPage2 // tabPage2
// //
this.tabPage2.BackColor = System.Drawing.Color.White;
this.tabPage2.Controls.Add(this.axisMoveControl1); this.tabPage2.Controls.Add(this.axisMoveControl1);
this.tabPage2.Controls.Add(this.picAxis4); this.tabPage2.Controls.Add(this.picAxis4);
this.tabPage2.Controls.Add(this.lblTemp); this.tabPage2.Controls.Add(this.lblTemp);
this.tabPage2.Controls.Add(this.picPPoint); this.tabPage2.Controls.Add(this.picPPoint);
this.tabPage2.Controls.Add(this.groupBox7); this.tabPage2.Controls.Add(this.groupBox7);
this.tabPage2.Controls.Add(this.groupAxis);
this.tabPage2.Controls.Add(this.groupAuto); this.tabPage2.Controls.Add(this.groupAuto);
this.tabPage2.Controls.Add(this.groupInout); this.tabPage2.Controls.Add(this.groupInout);
this.tabPage2.Location = new System.Drawing.Point(4, 30); this.tabPage2.Location = new System.Drawing.Point(4, 30);
...@@ -729,7 +684,13 @@ ...@@ -729,7 +684,13 @@
this.tabPage2.Size = new System.Drawing.Size(1320, 659); this.tabPage2.Size = new System.Drawing.Size(1320, 659);
this.tabPage2.TabIndex = 1; this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "伺服调试"; this.tabPage2.Text = "伺服调试";
this.tabPage2.UseVisualStyleBackColor = true; //
// axisMoveControl1
//
this.axisMoveControl1.Location = new System.Drawing.Point(588, 1);
this.axisMoveControl1.Name = "axisMoveControl1";
this.axisMoveControl1.Size = new System.Drawing.Size(699, 402);
this.axisMoveControl1.TabIndex = 306;
// //
// picAxis4 // picAxis4
// //
...@@ -863,523 +824,6 @@ ...@@ -863,523 +824,6 @@
this.btnTempInit.UseVisualStyleBackColor = true; this.btnTempInit.UseVisualStyleBackColor = true;
this.btnTempInit.Click += new System.EventHandler(this.btnTempInit_Click); this.btnTempInit.Click += new System.EventHandler(this.btnTempInit_Click);
// //
// groupAxis
//
this.groupAxis.Controls.Add(this.label24);
this.groupAxis.Controls.Add(this.label26);
this.groupAxis.Controls.Add(this.txtLimit2);
this.groupAxis.Controls.Add(this.label22);
this.groupAxis.Controls.Add(this.label23);
this.groupAxis.Controls.Add(this.txtLimit1);
this.groupAxis.Controls.Add(this.label6);
this.groupAxis.Controls.Add(this.label5);
this.groupAxis.Controls.Add(this.txtHomeSingle);
this.groupAxis.Controls.Add(this.chbAutoRead);
this.groupAxis.Controls.Add(this.label16);
this.groupAxis.Controls.Add(this.label15);
this.groupAxis.Controls.Add(this.label14);
this.groupAxis.Controls.Add(this.label11);
this.groupAxis.Controls.Add(this.txtHomeStatus);
this.groupAxis.Controls.Add(this.label10);
this.groupAxis.Controls.Add(this.txtBusyStatus);
this.groupAxis.Controls.Add(this.label2);
this.groupAxis.Controls.Add(this.txtAlarmStatus);
this.groupAxis.Controls.Add(this.btnGetAlarm);
this.groupAxis.Controls.Add(this.lblServerOn);
this.groupAxis.Controls.Add(this.label7);
this.groupAxis.Controls.Add(this.label8);
this.groupAxis.Controls.Add(this.btnOpenAxis);
this.groupAxis.Controls.Add(this.btnCloseAxis);
this.groupAxis.Controls.Add(this.lblCountPulse);
this.groupAxis.Controls.Add(this.txtASpeed);
this.groupAxis.Controls.Add(this.lblOutPulse);
this.groupAxis.Controls.Add(this.label47);
this.groupAxis.Controls.Add(this.btnAxisVMove);
this.groupAxis.Controls.Add(this.btnAxisRMove);
this.groupAxis.Controls.Add(this.btnAxisReturnHome);
this.groupAxis.Controls.Add(this.btnAxisAMove);
this.groupAxis.Controls.Add(this.btnComAlarmClear);
this.groupAxis.Controls.Add(this.txtAPosition);
this.groupAxis.Controls.Add(this.label48);
this.groupAxis.Controls.Add(this.btnAxisStop);
this.groupAxis.Controls.Add(this.txtAxisValue);
this.groupAxis.Controls.Add(this.txtAxisDeviceName);
this.groupAxis.Controls.Add(this.label45);
this.groupAxis.Controls.Add(this.label46);
this.groupAxis.Controls.Add(this.cmbAxisList);
this.groupAxis.Controls.Add(this.label49);
this.groupAxis.Enabled = false;
this.groupAxis.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupAxis.Location = new System.Drawing.Point(788, 83);
this.groupAxis.Name = "groupAxis";
this.groupAxis.Size = new System.Drawing.Size(653, 320);
this.groupAxis.TabIndex = 216;
this.groupAxis.TabStop = false;
this.groupAxis.Text = "伺服调试";
this.groupAxis.Visible = false;
//
// label24
//
this.label24.Location = new System.Drawing.Point(365, 267);
this.label24.Name = "label24";
this.label24.Size = new System.Drawing.Size(141, 17);
this.label24.TabIndex = 308;
this.label24.Text = "负极限信号:";
this.label24.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// label26
//
this.label26.AutoSize = true;
this.label26.Location = new System.Drawing.Point(539, 267);
this.label26.Name = "label26";
this.label26.Size = new System.Drawing.Size(94, 17);
this.label26.TabIndex = 307;
this.label26.Text = "1=ON，0=OFF";
//
// txtLimit2
//
this.txtLimit2.Enabled = false;
this.txtLimit2.Location = new System.Drawing.Point(509, 264);
this.txtLimit2.Name = "txtLimit2";
this.txtLimit2.Size = new System.Drawing.Size(25, 23);
this.txtLimit2.TabIndex = 305;
//
// label22
//
this.label22.Location = new System.Drawing.Point(365, 235);
this.label22.Name = "label22";
this.label22.Size = new System.Drawing.Size(141, 17);
this.label22.TabIndex = 304;
this.label22.Text = "正极限信号:";
this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// label23
//
this.label23.AutoSize = true;
this.label23.Location = new System.Drawing.Point(539, 235);
this.label23.Name = "label23";
this.label23.Size = new System.Drawing.Size(94, 17);
this.label23.TabIndex = 303;
this.label23.Text = "1=ON，0=OFF";
//
// txtLimit1
//
this.txtLimit1.Enabled = false;
this.txtLimit1.Location = new System.Drawing.Point(509, 232);
this.txtLimit1.Name = "txtLimit1";
this.txtLimit1.Size = new System.Drawing.Size(25, 23);
this.txtLimit1.TabIndex = 301;
//
// label6
//
this.label6.Location = new System.Drawing.Point(365, 200);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(141, 17);
this.label6.TabIndex = 300;
this.label6.Text = "原点信号:";
this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(539, 200);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(94, 17);
this.label5.TabIndex = 299;
this.label5.Text = "1=ON，0=OFF";
//
// txtHomeSingle
//
this.txtHomeSingle.Enabled = false;
this.txtHomeSingle.Location = new System.Drawing.Point(509, 197);
this.txtHomeSingle.Name = "txtHomeSingle";
this.txtHomeSingle.Size = new System.Drawing.Size(25, 23);
this.txtHomeSingle.TabIndex = 297;
//
// chbAutoRead
//
this.chbAutoRead.AutoSize = true;
this.chbAutoRead.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbAutoRead.Location = new System.Drawing.Point(113, 167);
this.chbAutoRead.Name = "chbAutoRead";
this.chbAutoRead.Size = new System.Drawing.Size(99, 21);
this.chbAutoRead.TabIndex = 296;
this.chbAutoRead.Text = "位置自动更新";
this.chbAutoRead.UseVisualStyleBackColor = true;
//
// label16
//
this.label16.AutoSize = true;
this.label16.Location = new System.Drawing.Point(187, 267);
this.label16.Name = "label16";
this.label16.Size = new System.Drawing.Size(112, 17);
this.label16.TabIndex = 295;
this.label16.Text = "1=完成，0=未完成";
//
// label15
//
this.label15.AutoSize = true;
this.label15.Location = new System.Drawing.Point(187, 235);
this.label15.Name = "label15";
this.label15.Size = new System.Drawing.Size(124, 17);
this.label15.TabIndex = 294;
this.label15.Text = "1=执行中，0=未执行";
//
// label14
//
this.label14.AutoSize = true;
this.label14.Location = new System.Drawing.Point(187, 200);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(100, 17);
this.label14.TabIndex = 293;
this.label14.Text = "1=报警，0=正常";
//
// label11
//
this.label11.Location = new System.Drawing.Point(12, 267);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(141, 17);
this.label11.TabIndex = 292;
this.label11.Text = "HOME-CMP状态:";
this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtHomeStatus
//
this.txtHomeStatus.Enabled = false;
this.txtHomeStatus.Location = new System.Drawing.Point(157, 264);
this.txtHomeStatus.Name = "txtHomeStatus";
this.txtHomeStatus.Size = new System.Drawing.Size(25, 23);
this.txtHomeStatus.TabIndex = 291;
//
// label10
//
this.label10.Location = new System.Drawing.Point(12, 235);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(141, 17);
this.label10.TabIndex = 289;
this.label10.Text = "BUSY状态:";
this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtBusyStatus
//
this.txtBusyStatus.Enabled = false;
this.txtBusyStatus.Location = new System.Drawing.Point(157, 232);
this.txtBusyStatus.Name = "txtBusyStatus";
this.txtBusyStatus.Size = new System.Drawing.Size(25, 23);
this.txtBusyStatus.TabIndex = 288;
//
// label2
//
this.label2.Location = new System.Drawing.Point(12, 200);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(141, 17);
this.label2.TabIndex = 286;
this.label2.Text = "报警状态:";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtAlarmStatus
//
this.txtAlarmStatus.Enabled = false;
this.txtAlarmStatus.Location = new System.Drawing.Point(157, 197);
this.txtAlarmStatus.Name = "txtAlarmStatus";
this.txtAlarmStatus.Size = new System.Drawing.Size(25, 23);
this.txtAlarmStatus.TabIndex = 285;
//
// btnGetAlarm
//
this.btnGetAlarm.Location = new System.Drawing.Point(499, 130);
this.btnGetAlarm.Name = "btnGetAlarm";
this.btnGetAlarm.Size = new System.Drawing.Size(142, 33);
this.btnGetAlarm.TabIndex = 284;
this.btnGetAlarm.Text = "读取伺服状态";
this.btnGetAlarm.UseVisualStyleBackColor = true;
this.btnGetAlarm.Click += new System.EventHandler(this.btnGetAlarm_Click);
//
// lblServerOn
//
this.lblServerOn.AutoSize = true;
this.lblServerOn.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblServerOn.ForeColor = System.Drawing.Color.Red;
this.lblServerOn.Location = new System.Drawing.Point(370, 168);
this.lblServerOn.Name = "lblServerOn";
this.lblServerOn.Size = new System.Drawing.Size(0, 19);
this.lblServerOn.TabIndex = 268;
//
// label7
//
this.label7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label7.Location = new System.Drawing.Point(6, 107);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(124, 26);
this.label7.TabIndex = 254;
this.label7.Text = "输出脉冲值:";
this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// label8
//
this.label8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label8.Location = new System.Drawing.Point(6, 137);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(124, 26);
this.label8.TabIndex = 255;
this.label8.Text = "编码器计数:";
this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// btnOpenAxis
//
this.btnOpenAxis.BackColor = System.Drawing.SystemColors.Control;
this.btnOpenAxis.Cursor = System.Windows.Forms.Cursors.Default;
this.btnOpenAxis.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenAxis.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnOpenAxis.Location = new System.Drawing.Point(499, 16);
this.btnOpenAxis.Name = "btnOpenAxis";
this.btnOpenAxis.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnOpenAxis.Size = new System.Drawing.Size(142, 33);
this.btnOpenAxis.TabIndex = 253;
this.btnOpenAxis.Text = "打开伺服";
this.btnOpenAxis.UseVisualStyleBackColor = true;
this.btnOpenAxis.Click += new System.EventHandler(this.btnOpenAxis_Click);
//
// btnCloseAxis
//
this.btnCloseAxis.BackColor = System.Drawing.SystemColors.Control;
this.btnCloseAxis.Cursor = System.Windows.Forms.Cursors.Default;
this.btnCloseAxis.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseAxis.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnCloseAxis.Location = new System.Drawing.Point(499, 54);
this.btnCloseAxis.Name = "btnCloseAxis";
this.btnCloseAxis.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnCloseAxis.Size = new System.Drawing.Size(142, 33);
this.btnCloseAxis.TabIndex = 252;
this.btnCloseAxis.Text = "关闭伺服";
this.btnCloseAxis.UseVisualStyleBackColor = true;
this.btnCloseAxis.Click += new System.EventHandler(this.btnCloseAxis_Click);
//
// lblCountPulse
//
this.lblCountPulse.Location = new System.Drawing.Point(134, 135);
this.lblCountPulse.Name = "lblCountPulse";
this.lblCountPulse.ReadOnly = true;
this.lblCountPulse.Size = new System.Drawing.Size(87, 23);
this.lblCountPulse.TabIndex = 38;
//
// txtASpeed
//
this.txtASpeed.AcceptsReturn = true;
this.txtASpeed.BackColor = System.Drawing.SystemColors.Window;
this.txtASpeed.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtASpeed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtASpeed.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtASpeed.Location = new System.Drawing.Point(287, 79);
this.txtASpeed.MaxLength = 12;
this.txtASpeed.Name = "txtASpeed";
this.txtASpeed.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtASpeed.Size = new System.Drawing.Size(66, 23);
this.txtASpeed.TabIndex = 251;
this.txtASpeed.Text = "30";
//
// lblOutPulse
//
this.lblOutPulse.Location = new System.Drawing.Point(134, 107);
this.lblOutPulse.Name = "lblOutPulse";
this.lblOutPulse.ReadOnly = true;
this.lblOutPulse.Size = new System.Drawing.Size(87, 23);
this.lblOutPulse.TabIndex = 30;
//
// label47
//
this.label47.Cursor = System.Windows.Forms.Cursors.Default;
this.label47.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label47.ForeColor = System.Drawing.SystemColors.ControlText;
this.label47.Location = new System.Drawing.Point(205, 82);
this.label47.Name = "label47";
this.label47.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label47.Size = new System.Drawing.Size(80, 17);
this.label47.TabIndex = 250;
this.label47.Text = "速度:";
this.label47.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// btnAxisVMove
//
this.btnAxisVMove.BackColor = System.Drawing.SystemColors.Control;
this.btnAxisVMove.Cursor = System.Windows.Forms.Cursors.Default;
this.btnAxisVMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisVMove.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnAxisVMove.Location = new System.Drawing.Point(363, 54);
this.btnAxisVMove.Name = "btnAxisVMove";
this.btnAxisVMove.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisVMove.Size = new System.Drawing.Size(133, 33);
this.btnAxisVMove.TabIndex = 249;
this.btnAxisVMove.Text = "匀速运动";
this.btnAxisVMove.UseVisualStyleBackColor = true;
this.btnAxisVMove.Click += new System.EventHandler(this.btnAxisVMove_Click);
//
// btnAxisRMove
//
this.btnAxisRMove.BackColor = System.Drawing.SystemColors.Control;
this.btnAxisRMove.Cursor = System.Windows.Forms.Cursors.Default;
this.btnAxisRMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisRMove.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnAxisRMove.Location = new System.Drawing.Point(363, 92);
this.btnAxisRMove.Name = "btnAxisRMove";
this.btnAxisRMove.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisRMove.Size = new System.Drawing.Size(133, 33);
this.btnAxisRMove.TabIndex = 248;
this.btnAxisRMove.Text = "相对运动";
this.btnAxisRMove.UseVisualStyleBackColor = true;
this.btnAxisRMove.Click += new System.EventHandler(this.btnAxisRMove_Click);
//
// btnAxisReturnHome
//
this.btnAxisReturnHome.BackColor = System.Drawing.SystemColors.Control;
this.btnAxisReturnHome.Cursor = System.Windows.Forms.Cursors.Default;
this.btnAxisReturnHome.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisReturnHome.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnAxisReturnHome.Location = new System.Drawing.Point(363, 130);
this.btnAxisReturnHome.Name = "btnAxisReturnHome";
this.btnAxisReturnHome.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisReturnHome.Size = new System.Drawing.Size(133, 33);
this.btnAxisReturnHome.TabIndex = 247;
this.btnAxisReturnHome.Text = "原点返回";
this.btnAxisReturnHome.UseVisualStyleBackColor = true;
this.btnAxisReturnHome.Click += new System.EventHandler(this.btnAxisReturnHome_Click);
//
// btnAxisAMove
//
this.btnAxisAMove.BackColor = System.Drawing.SystemColors.Control;
this.btnAxisAMove.Cursor = System.Windows.Forms.Cursors.Default;
this.btnAxisAMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisAMove.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnAxisAMove.Location = new System.Drawing.Point(363, 16);
this.btnAxisAMove.Name = "btnAxisAMove";
this.btnAxisAMove.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisAMove.Size = new System.Drawing.Size(133, 33);
this.btnAxisAMove.TabIndex = 245;
this.btnAxisAMove.Text = "绝对运动";
this.btnAxisAMove.UseVisualStyleBackColor = true;
this.btnAxisAMove.Click += new System.EventHandler(this.btnAxisAMove_Click);
//
// btnComAlarmClear
//
this.btnComAlarmClear.Location = new System.Drawing.Point(228, 130);
this.btnComAlarmClear.Name = "btnComAlarmClear";
this.btnComAlarmClear.Size = new System.Drawing.Size(133, 33);
this.btnComAlarmClear.TabIndex = 50;
this.btnComAlarmClear.Text = "清除报警";
this.btnComAlarmClear.UseVisualStyleBackColor = true;
this.btnComAlarmClear.Click += new System.EventHandler(this.btnComAlarmClear_Click);
//
// txtAPosition
//
this.txtAPosition.BackColor = System.Drawing.SystemColors.Window;
this.txtAPosition.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtAPosition.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtAPosition.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtAPosition.Location = new System.Drawing.Point(287, 51);
this.txtAPosition.MaxLength = 12;
this.txtAPosition.Name = "txtAPosition";
this.txtAPosition.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtAPosition.Size = new System.Drawing.Size(66, 23);
this.txtAPosition.TabIndex = 244;
this.txtAPosition.Text = "3000";
//
// label48
//
this.label48.Cursor = System.Windows.Forms.Cursors.Default;
this.label48.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label48.ForeColor = System.Drawing.SystemColors.ControlText;
this.label48.Location = new System.Drawing.Point(205, 54);
this.label48.Name = "label48";
this.label48.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label48.Size = new System.Drawing.Size(80, 17);
this.label48.TabIndex = 243;
this.label48.Text = "位置:";
this.label48.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// btnAxisStop
//
this.btnAxisStop.BackColor = System.Drawing.SystemColors.Control;
this.btnAxisStop.Cursor = System.Windows.Forms.Cursors.Default;
this.btnAxisStop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisStop.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnAxisStop.Location = new System.Drawing.Point(499, 92);
this.btnAxisStop.Name = "btnAxisStop";
this.btnAxisStop.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisStop.Size = new System.Drawing.Size(142, 33);
this.btnAxisStop.TabIndex = 246;
this.btnAxisStop.Text = " 停止运动";
this.btnAxisStop.UseVisualStyleBackColor = true;
this.btnAxisStop.Click += new System.EventHandler(this.btnAxisStop_Click);
//
// txtAxisValue
//
this.txtAxisValue.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtAxisValue.Location = new System.Drawing.Point(134, 79);
this.txtAxisValue.MaxLength = 10;
this.txtAxisValue.Name = "txtAxisValue";
this.txtAxisValue.Size = new System.Drawing.Size(66, 23);
this.txtAxisValue.TabIndex = 242;
this.txtAxisValue.Text = "0";
//
// txtAxisDeviceName
//
this.txtAxisDeviceName.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtAxisDeviceName.Location = new System.Drawing.Point(134, 51);
this.txtAxisDeviceName.MaxLength = 10;
this.txtAxisDeviceName.Name = "txtAxisDeviceName";
this.txtAxisDeviceName.Size = new System.Drawing.Size(66, 23);
this.txtAxisDeviceName.TabIndex = 241;
this.txtAxisDeviceName.Text = "0";
//
// label45
//
this.label45.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label45.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label45.Location = new System.Drawing.Point(6, 49);
this.label45.Name = "label45";
this.label45.Size = new System.Drawing.Size(124, 26);
this.label45.TabIndex = 240;
this.label45.Text = "端口号:";
this.label45.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// label46
//
this.label46.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label46.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label46.Location = new System.Drawing.Point(6, 77);
this.label46.Name = "label46";
this.label46.Size = new System.Drawing.Size(124, 26);
this.label46.TabIndex = 239;
this.label46.Text = "伺服地址:";
this.label46.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// cmbAxisList
//
this.cmbAxisList.DisplayMember = "ProName";
this.cmbAxisList.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawVariable;
this.cmbAxisList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbAxisList.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbAxisList.FormattingEnabled = true;
this.cmbAxisList.ItemHeight = 22;
this.cmbAxisList.Location = new System.Drawing.Point(134, 18);
this.cmbAxisList.Name = "cmbAxisList";
this.cmbAxisList.Size = new System.Drawing.Size(220, 28);
this.cmbAxisList.TabIndex = 234;
this.cmbAxisList.ValueMember = "ProName";
this.cmbAxisList.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.cmbAxisList_DrawItem);
this.cmbAxisList.SelectedIndexChanged += new System.EventHandler(this.cmbAxisList_SelectedIndexChanged);
//
// label49
//
this.label49.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label49.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label49.Location = new System.Drawing.Point(6, 17);
this.label49.Name = "label49";
this.label49.Size = new System.Drawing.Size(124, 26);
this.label49.TabIndex = 233;
this.label49.Text = "选择伺服:";
this.label49.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// groupInout // groupInout
// //
this.groupInout.Controls.Add(this.txtInoutP4); this.groupInout.Controls.Add(this.txtInoutP4);
...@@ -2355,13 +1799,6 @@ ...@@ -2355,13 +1799,6 @@
this.toolStripMenuItem6.Text = "日语"; this.toolStripMenuItem6.Text = "日语";
this.toolStripMenuItem6.Click += new System.EventHandler(this.toolStripMenuItem6_Click); this.toolStripMenuItem6.Click += new System.EventHandler(this.toolStripMenuItem6_Click);
// //
// axisMoveControl1
//
this.axisMoveControl1.Location = new System.Drawing.Point(588, 1);
this.axisMoveControl1.Name = "axisMoveControl1";
this.axisMoveControl1.Size = new System.Drawing.Size(699, 402);
this.axisMoveControl1.TabIndex = 306;
//
// FrmStoreBox // FrmStoreBox
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
...@@ -2395,8 +1832,6 @@ ...@@ -2395,8 +1832,6 @@
((System.ComponentModel.ISupportInitialize)(this.picPPoint)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.picPPoint)).EndInit();
this.groupBox7.ResumeLayout(false); this.groupBox7.ResumeLayout(false);
this.groupBox7.PerformLayout(); this.groupBox7.PerformLayout();
this.groupAxis.ResumeLayout(false);
this.groupAxis.PerformLayout();
this.groupInout.ResumeLayout(false); this.groupInout.ResumeLayout(false);
this.groupInout.PerformLayout(); this.groupInout.PerformLayout();
this.menuStrip1.ResumeLayout(false); this.menuStrip1.ResumeLayout(false);
...@@ -2417,10 +1852,6 @@ ...@@ -2417,10 +1852,6 @@
public System.Windows.Forms.Button btnUpDownP4; public System.Windows.Forms.Button btnUpDownP4;
public System.Windows.Forms.Label label21; public System.Windows.Forms.Label label21;
private System.Windows.Forms.ComboBox cmbPosition; private System.Windows.Forms.ComboBox cmbPosition;
private System.Windows.Forms.TextBox lblOutPulse;
private System.Windows.Forms.TextBox lblCountPulse;
private System.Windows.Forms.Button btnComAlarmClear;
private System.Windows.Forms.GroupBox groupAxis;
public System.Windows.Forms.Button btnComP1; public System.Windows.Forms.Button btnComP1;
public System.Windows.Forms.TextBox txtComP1; public System.Windows.Forms.TextBox txtComP1;
public System.Windows.Forms.Button btnInOutP2; public System.Windows.Forms.Button btnInOutP2;
...@@ -2443,27 +1874,8 @@ ...@@ -2443,27 +1874,8 @@
public System.Windows.Forms.TextBox txtUpDownP5; public System.Windows.Forms.TextBox txtUpDownP5;
public System.Windows.Forms.Button btnUpDownP6; public System.Windows.Forms.Button btnUpDownP6;
public System.Windows.Forms.TextBox txtUpDownP6; public System.Windows.Forms.TextBox txtUpDownP6;
private System.Windows.Forms.TextBox txtAxisValue;
private System.Windows.Forms.TextBox txtAxisDeviceName;
private System.Windows.Forms.Label label45;
private System.Windows.Forms.Label label46;
private System.Windows.Forms.ComboBox cmbAxisList;
private System.Windows.Forms.Label label49;
public System.Windows.Forms.TextBox txtASpeed;
public System.Windows.Forms.Label label47;
public System.Windows.Forms.Button btnAxisVMove;
public System.Windows.Forms.Button btnAxisRMove;
public System.Windows.Forms.Button btnAxisReturnHome;
public System.Windows.Forms.Button btnAxisAMove;
public System.Windows.Forms.TextBox txtAPosition;
public System.Windows.Forms.Label label48;
public System.Windows.Forms.Button btnAxisStop;
private System.Windows.Forms.Label lblThisSta; private System.Windows.Forms.Label lblThisSta;
private System.Windows.Forms.Button btnSavePosition; private System.Windows.Forms.Button btnSavePosition;
public System.Windows.Forms.Button btnCloseAxis;
public System.Windows.Forms.Button btnOpenAxis;
private System.Windows.Forms.Label label7;
private System.Windows.Forms.Label label8;
private System.Windows.Forms.RichTextBox richTextBox1; private System.Windows.Forms.RichTextBox richTextBox1;
private System.Windows.Forms.MenuStrip menuStrip1; private System.Windows.Forms.MenuStrip menuStrip1;
private System.Windows.Forms.ToolStripMenuItem 料仓操作ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 料仓操作ToolStripMenuItem;
...@@ -2488,19 +1900,7 @@ ...@@ -2488,19 +1900,7 @@
private System.Windows.Forms.ToolStripMenuItem 打开舱门ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 打开舱门ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem 关闭仓门ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 关闭仓门ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem 回待机点ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 回待机点ToolStripMenuItem;
private System.Windows.Forms.Label lblServerOn;
private System.Windows.Forms.Label label16;
private System.Windows.Forms.Label label15;
private System.Windows.Forms.Label label14;
private System.Windows.Forms.Label label11;
private System.Windows.Forms.TextBox txtHomeStatus;
private System.Windows.Forms.Label label10;
private System.Windows.Forms.TextBox txtBusyStatus;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.TextBox txtAlarmStatus;
private System.Windows.Forms.Button btnGetAlarm;
private System.Windows.Forms.GroupBox groupBox3; private System.Windows.Forms.GroupBox groupBox3;
private System.Windows.Forms.CheckBox chbAutoRead;
private System.Windows.Forms.Label lblTemp; private System.Windows.Forms.Label lblTemp;
private System.Windows.Forms.CheckBox chbAuto; private System.Windows.Forms.CheckBox chbAuto;
private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
...@@ -2521,9 +1921,6 @@ ...@@ -2521,9 +1921,6 @@
private System.Windows.Forms.ToolStripSeparator toolStripSeparator3; private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator12; private System.Windows.Forms.ToolStripSeparator toolStripSeparator12;
private System.Windows.Forms.TextBox txtHomeSingle;
private System.Windows.Forms.Label label5;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.TabControl tabControl1; private System.Windows.Forms.TabControl tabControl1;
private System.Windows.Forms.TabPage tabPage2; private System.Windows.Forms.TabPage tabPage2;
private System.Windows.Forms.GroupBox groupBox6; private System.Windows.Forms.GroupBox groupBox6;
...@@ -2534,12 +1931,6 @@ ...@@ -2534,12 +1931,6 @@
private System.Windows.Forms.Button btnBatchOutTest; private System.Windows.Forms.Button btnBatchOutTest;
private System.Windows.Forms.Label lblBatchStatus; private System.Windows.Forms.Label lblBatchStatus;
private UserFromControl.IOStatusControl axis_5_Alarm; private UserFromControl.IOStatusControl axis_5_Alarm;
private System.Windows.Forms.Label label24;
private System.Windows.Forms.Label label26;
private System.Windows.Forms.TextBox txtLimit2;
private System.Windows.Forms.Label label22;
private System.Windows.Forms.Label label23;
private System.Windows.Forms.TextBox txtLimit1;
private System.Windows.Forms.ToolStripMenuItem 批量上下轴ONToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 批量上下轴ONToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem 批量上下轴OFFToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 批量上下轴OFFToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator14; private System.Windows.Forms.ToolStripSeparator toolStripSeparator14;
......
source/ACSingleStore/FrmStoreBox.cs
...@@ -50,10 +50,6 @@ namespace OnlineStore.AutoInOutStore ...@@ -50,10 +50,6 @@ namespace OnlineStore.AutoInOutStore
return; return;
} }
cmbAxisList.DataSource = new List<ConfigMoveAxis>(store.moveAxisList);
cmbAxisList.DisplayMember = "Explain";
cmbAxisList.ValueMember = "Explain";
cmbAxisList.SelectedIndex = 0;
AutoStorePosition Position = null; AutoStorePosition Position = null;
if (store.PositionNumList.Count > 0) if (store.PositionNumList.Count > 0)
...@@ -143,6 +139,7 @@ namespace OnlineStore.AutoInOutStore ...@@ -143,6 +139,7 @@ namespace OnlineStore.AutoInOutStore
} }
} }
} }
/*
if (groupAxis.Enabled) if (groupAxis.Enabled)
{ {
出入库调试ToolStripMenuItem.Text = ResourceCulture.GetString("禁用调试", "禁用调试"); 出入库调试ToolStripMenuItem.Text = ResourceCulture.GetString("禁用调试", "禁用调试");
...@@ -150,7 +147,7 @@ namespace OnlineStore.AutoInOutStore ...@@ -150,7 +147,7 @@ namespace OnlineStore.AutoInOutStore
else else
{ {
出入库调试ToolStripMenuItem.Text = ResourceCulture.GetString("启用调试", "启用调试"); 出入库调试ToolStripMenuItem.Text = ResourceCulture.GetString("启用调试", "启用调试");
} }*/
if (tabControl1.TabPages.Contains(tabPage4)) if (tabControl1.TabPages.Contains(tabPage4))
{ {
打开日志ToolStripMenuItem.Text = closeLog; 打开日志ToolStripMenuItem.Text = closeLog;
...@@ -165,7 +162,8 @@ namespace OnlineStore.AutoInOutStore ...@@ -165,7 +162,8 @@ namespace OnlineStore.AutoInOutStore
notifyIcon1.Text = this.Text; notifyIcon1.Text = this.Text;
if (CurrLanguage.Equals(ResourceCulture.China)) if (CurrLanguage.Equals(ResourceCulture.China))
{ {
LogUtil.logBox = this.richTextBox1; //LogUtil.logBox = this.richTextBox1;
//LogUtil.showLogEvent += LogUtil_showLogEvent;
} }
else else
{ {
...@@ -175,6 +173,23 @@ namespace OnlineStore.AutoInOutStore ...@@ -175,6 +173,23 @@ namespace OnlineStore.AutoInOutStore
} }
SetImage(); SetImage();
} }
int showCount = 100;
int count = 0;
private void LogUtil_showLogEvent(string msg, Color color)
{
this.Invoke(new Action(()=> {
if (count > showCount)
{
count = 0;
richTextBox1.Clear();
}
//logBox.SelectionColor = color;
System.DateTime now = System.DateTime.Now;
richTextBox1.AppendText(now.ToLongTimeString() + " " + msg + Environment.NewLine);
richTextBox1.ScrollToCaret();
count++;
}));
}
private void start_button_Click(object sender, EventArgs e) private void start_button_Click(object sender, EventArgs e)
{ {
...@@ -225,7 +240,8 @@ namespace OnlineStore.AutoInOutStore ...@@ -225,7 +240,8 @@ namespace OnlineStore.AutoInOutStore
} }
// ResourceCulture.LoaAllRes(); // ResourceCulture.LoaAllRes();
GetVersion(); GetVersion();
LogUtil.logBox = this.richTextBox1; //LogUtil.logBox = this.richTextBox1;
LogUtil.showLogEvent += LogUtil_showLogEvent;
this.ShowInTaskbar = true; this.ShowInTaskbar = true;
this.Text = ConfigAppSettings.GetValue(Setting_Init.App_Title); this.Text = ConfigAppSettings.GetValue(Setting_Init.App_Title);
HideForm(); HideForm();
...@@ -296,29 +312,6 @@ namespace OnlineStore.AutoInOutStore ...@@ -296,29 +312,6 @@ namespace OnlineStore.AutoInOutStore
lblBatchMsg.Text = AutomaticBaiting.WarnObj.WarnMsg; lblBatchMsg.Text = AutomaticBaiting.WarnObj.WarnMsg;
lblWarnMsg.Text = store.WarnObj.WarnMsg; lblWarnMsg.Text = store.WarnObj.WarnMsg;
BatchInoutStatus(); BatchInoutStatus();
//忙碌状态不读取状态
if (!store.storeRunStatus.Equals(StoreRunStatus.Busy))
{
if (chbAutoRead.Checked)
{
string portName = GetPortName();
short SlvAddr = GetSlaveAddr();
//判断私服是否打开、
if (ACServerManager.ServerOnStatus(portName, SlvAddr))
{
lblServerOn.Text = ResourceCulture.GetString(ResourceCulture.servoON, "伺服ON");
int lOutPulse = ACServerManager.GetTargetPosition(portName, SlvAddr);
lblOutPulse.Text = string.Format("{0:d}", lOutPulse);
int lCountPulse = ACServerManager.GetActualtPosition(portName, SlvAddr);
lblCountPulse.Text = string.Format("{0:d}", lCountPulse);
}
else
{
lblServerOn.Text = ResourceCulture.GetString(ResourceCulture.ServoOff, "伺服OFF");
}
}
}
lblBatchStatus.Text = store.GetRunStr(AutomaticBaiting.AutoBaitingStatus, false); lblBatchStatus.Text = store.GetRunStr(AutomaticBaiting.AutoBaitingStatus, false);
...@@ -544,16 +537,6 @@ namespace OnlineStore.AutoInOutStore ...@@ -544,16 +537,6 @@ namespace OnlineStore.AutoInOutStore
return ktk; return ktk;
} }
private void btnComAlarmClear_Click(object sender, EventArgs e)
{
string portName = txtAxisDeviceName.Text;
short slvAddr = FormUtil.GetShortValue(txtAxisValue);
LogUtil.info("点击【清理报警】，端口号【" + portName + "】地址【" + slvAddr + "】 ");
ACServerManager.AlarmClear(portName, slvAddr);
Thread.Sleep(100);
ACServerManager.ServoOn(portName, slvAddr);
}
private void cmbPosition_SelectedIndexChanged(object sender, EventArgs e) private void cmbPosition_SelectedIndexChanged(object sender, EventArgs e)
{ {
if (cmbPosition.SelectedIndex >= 0) if (cmbPosition.SelectedIndex >= 0)
...@@ -595,99 +578,8 @@ namespace OnlineStore.AutoInOutStore ...@@ -595,99 +578,8 @@ namespace OnlineStore.AutoInOutStore
int HomeHighSpeed = 0; int HomeHighSpeed = 0;
int HomeLowSpeed = 0; int HomeLowSpeed = 0;
int HomeAddSpeed = 0; int HomeAddSpeed = 0;
private void cmbAxisList_SelectedIndexChanged(object sender, EventArgs e)
{
if (this.cmbAxisList.SelectedIndex >= 0)
{
ConfigMoveAxis SlvAddr = store.moveAxisList[cmbAxisList.SelectedIndex];
txtAxisDeviceName.Text = SlvAddr.DeviceName;
txtAxisValue.Text = SlvAddr.GetAxisValue().ToString();
txtASpeed.Text = SlvAddr.TargetSpeed.ToString();
addSpeed = SlvAddr.AddSpeed;
delSpeed = SlvAddr.DelSpeed;
HomeHighSpeed = SlvAddr.HomeHighSpeed;
HomeLowSpeed = SlvAddr.HomeLowSpeed;
HomeAddSpeed = SlvAddr.HomeAddSpeed;
}
}
private void btnAxisAMove_Click(object sender, EventArgs e)
{
//ConfigMoveAxis axisC = store.moveAxisList[cmbAxisList.SelectedIndex];
string portName = txtAxisDeviceName.Text;
short SlvAddr = FormUtil.GetShortValue(txtAxisValue);
int position = FormUtil.GetIntValue(txtAPosition);
int speed = FormUtil.GetIntValue(txtASpeed);
if ( store.Config.Middle_Axis.IsSameAxis(portName,SlvAddr ) || store.Config.UpDown_Axis.IsSameAxis(portName,SlvAddr))
{
if (!InOutIsIsP1())
{
return;
}
}
LogUtil.info("点击【绝对运动】，端口号【" + portName + "】地址【" + SlvAddr + "】位置【" + position + "】速度【" + speed + "】");
ACServerManager.AbsMove(portName, SlvAddr, position, speed, addSpeed,delSpeed);
}
private void btnAxisVMove_Click(object sender, EventArgs e)
{
//ConfigMoveAxis axisC = store.moveAxisList[cmbAxisList.SelectedIndex];
string portName = txtAxisDeviceName.Text;
short SlvAddr = FormUtil.GetShortValue(txtAxisValue);
int speed = FormUtil.GetIntValue(txtASpeed);
if (store.Config.Middle_Axis.IsSameAxis(portName, SlvAddr) || store.Config.UpDown_Axis.IsSameAxis(portName, SlvAddr))
{
if (!InOutIsIsP1())
{
return;
}
}
LogUtil.info("点击【匀速运动】，端口号【" + portName + "】地址【" + SlvAddr + "】 速度【" + speed + "】");
ACServerManager.SpeedMove(portName, SlvAddr, speed);
}
private void btnAxisRMove_Click(object sender, EventArgs e)
{
//ConfigMoveAxis axisC = store.moveAxisList[cmbAxisList.SelectedIndex];
string portName = txtAxisDeviceName.Text;
short SlvAddr = FormUtil.GetShortValue(txtAxisValue);
int position = FormUtil.GetIntValue(txtAPosition);
int speed = FormUtil.GetIntValue(txtASpeed);
if (store.Config.Middle_Axis.IsSameAxis(portName, SlvAddr) || store.Config.UpDown_Axis.IsSameAxis(portName, SlvAddr))
{
if (!InOutIsIsP1())
{
return;
}
}
LogUtil.info("点击【相对运动】，端口号【" + portName + "】地址【" + SlvAddr + "】位置【" + position + "】速度【" + speed + "】");
ACServerManager.RelMove(portName, SlvAddr, position, speed, addSpeed, delSpeed);
}
private void btnAxisStop_Click(object sender, EventArgs e)
{
string portName = txtAxisDeviceName.Text;
short SlvAddr = FormUtil.GetShortValue(txtAxisValue);
LogUtil.info("点击【停止运动】，端口号【" + portName + "】地址【" + SlvAddr + "】 ");
ACServerManager.SuddenStop(portName, SlvAddr);
}
private void cmbAxisList_DrawItem(object sender, DrawItemEventArgs e)
{
if (e.Index < 0)
{
return;
}
e.DrawBackground();
e.DrawFocusRectangle();
if (this.cmbAxisList.Items.Count > e.Index)
{
ConfigMoveAxis SlvAddr = (ConfigMoveAxis)cmbAxisList.Items[e.Index];
e.Graphics.DrawString(SlvAddr.DisplayStr, e.Font, new SolidBrush(e.ForeColor), e.Bounds.X, e.Bounds.Y + 3);
}
}
private void btnSavePosition_Click(object sender, EventArgs e) private void btnSavePosition_Click(object sender, EventArgs e)
{ {
//料仓格子位置保存 //料仓格子位置保存
...@@ -781,18 +673,6 @@ namespace OnlineStore.AutoInOutStore ...@@ -781,18 +673,6 @@ namespace OnlineStore.AutoInOutStore
} }
private void btnOpenAxis_Click(object sender, EventArgs e)
{
string portName = txtAxisDeviceName.Text;
short SlvAddr = FormUtil.GetShortValue(txtAxisValue);
LogUtil.info("点击【打开伺服】，端口号【" + portName + "】地址【" + SlvAddr + "】 ");
ACServerManager.OpenPort(portName);
//ACServerManager.InitSlvAddr(portName, SlvAddr);
//Thread.Sleep(100);
ACServerManager.AlarmClear(portName, SlvAddr);
Thread.Sleep(100);
ACServerManager.ServoOn(portName, SlvAddr);
}
/// <summary> /// <summary>
/// 判断进出轴是否在P1点 /// 判断进出轴是否在P1点
/// </summary> /// </summary>
...@@ -812,13 +692,6 @@ namespace OnlineStore.AutoInOutStore ...@@ -812,13 +692,6 @@ namespace OnlineStore.AutoInOutStore
ResourceCulture.GetString(ResourceCulture.InoutWarn,"警告（叉子在待机位时，才能移动升降轴和旋转轴）" ), MessageBoxButtons.OK, MessageBoxIcon.Exclamation); ResourceCulture.GetString(ResourceCulture.InoutWarn,"警告（叉子在待机位时，才能移动升降轴和旋转轴）" ), MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
return false; return false;
} }
private void btnCloseAxis_Click(object sender, EventArgs e)
{
string portName = txtAxisDeviceName.Text;
short SlvAddr = FormUtil.GetShortValue(txtAxisValue);
LogUtil.info("点击【关闭伺服】，端口号【" + portName + "】地址【" + SlvAddr + "】 ");
ACServerManager.ServoOff(portName, SlvAddr);
}
private void AxisABSMove(ConfigMoveAxis moveAxis, int targetPosition, int targetSpeed) private void AxisABSMove(ConfigMoveAxis moveAxis, int targetPosition, int targetSpeed)
{ {
moveAxis.TargetPosition = targetPosition; moveAxis.TargetPosition = targetPosition;
...@@ -1138,49 +1011,6 @@ namespace OnlineStore.AutoInOutStore ...@@ -1138,49 +1011,6 @@ namespace OnlineStore.AutoInOutStore
} }
return false; return false;
} }
private short GetSlaveAddr()
{
return FormUtil.GetShortValue(txtAxisValue);
}
private string GetPortName()
{
return txtAxisDeviceName.Text;
}
private void btnAxisReturnHome_Click(object sender, EventArgs e)
{
string portName = txtAxisDeviceName.Text;
short SlvAddr = FormUtil.GetShortValue(txtAxisValue);
if (store.Config.Middle_Axis.IsSameAxis(portName, SlvAddr) || store.Config.UpDown_Axis.IsSameAxis(portName, SlvAddr))
{
if (!InOutIsIsP1())
{
return;
}
}
int speed = FormUtil.GetIntValue(txtASpeed);
LogUtil.info("点击【原点返回】，端口号【" + portName + "】地址【" + SlvAddr + "】 速度【" + speed + "】");
ACServerManager.HomeMove(portName, SlvAddr, HomeHighSpeed, HomeLowSpeed, HomeAddSpeed);
}
private void btnGetAlarm_Click(object sender, EventArgs e)
{
int value = ACServerManager.GetAlarmStatus(GetPortName(), GetSlaveAddr());
this.txtAlarmStatus.Text = value.ToString();
value = ACServerManager.GetBusyStatus(GetPortName(), GetSlaveAddr());
this.txtBusyStatus.Text = value.ToString();
value = ACServerManager.GetHomeEndStatus(GetPortName(), GetSlaveAddr());
this.txtHomeStatus.Text = value.ToString();
btnReadHomeSingle_Click(null, null);
btnReadLimit1_Click(null, null);
btnReadLimit2_Click(null, null);
//ACServerManager.GetAxisSts(slvAddr)
//LogUtil.info()
}
private void chbAuto_CheckedChanged(object sender, EventArgs e) private void chbAuto_CheckedChanged(object sender, EventArgs e)
{ {
...@@ -1282,12 +1112,7 @@ namespace OnlineStore.AutoInOutStore ...@@ -1282,12 +1112,7 @@ namespace OnlineStore.AutoInOutStore
frm.ShowDialog(); frm.ShowDialog();
IOManager.IOMove(IO_Type.CameraLight_Power, IO_VALUE.LOW); IOManager.IOMove(IO_Type.CameraLight_Power, IO_VALUE.LOW);
} }
private void btnReadHomeSingle_Click(object sender, EventArgs e)
{
int value = ACServerManager.GetHomeSingle(GetPortName(), GetSlaveAddr());
this.txtHomeSingle.Text = value.ToString();
}
private void btnBatchOutTest_Click(object sender, EventArgs e) private void btnBatchOutTest_Click(object sender, EventArgs e)
{ {
if (store.storeRunStatus >= StoreRunStatus.HomeMoving) if (store.storeRunStatus >= StoreRunStatus.HomeMoving)
...@@ -1301,19 +1126,6 @@ namespace OnlineStore.AutoInOutStore ...@@ -1301,19 +1126,6 @@ namespace OnlineStore.AutoInOutStore
MessageBox.Show(ResourceCulture.GetString(ResourceCulture.PleaseStartStore, "请先启动料仓！")); MessageBox.Show(ResourceCulture.GetString(ResourceCulture.PleaseStartStore, "请先启动料仓！"));
} }
} }
private void btnReadLimit1_Click(object sender, EventArgs e)
{
int value = ACServerManager.GetLimitPositiveSingle(GetPortName(), GetSlaveAddr());
this.txtLimit1.Text = value.ToString();
}
private void btnReadLimit2_Click(object sender, EventArgs e)
{
int value = ACServerManager.GetLimitNegativeSingle(GetPortName(), GetSlaveAddr());
this.txtLimit2.Text = value.ToString();
}
private void 批量上下轴ONToolStripMenuItem_Click(object sender, EventArgs e) private void 批量上下轴ONToolStripMenuItem_Click(object sender, EventArgs e)
{ {
...@@ -1434,13 +1246,6 @@ namespace OnlineStore.AutoInOutStore ...@@ -1434,13 +1246,6 @@ namespace OnlineStore.AutoInOutStore
txtHum.Text = param.Humidity.ToString(); txtHum.Text = param.Humidity.ToString();
} }
private void btnUpdateSpeed_Click(object sender, EventArgs e)
{
string portName = txtAxisDeviceName.Text;
int SlvAddr = FormUtil.GetIntValue(txtAxisValue);
int speed = FormUtil.GetIntValue(txtASpeed);
//ACServerManager.SetSpeed(portName, SlvAddr, speed);
}
private void btnInOutP4_Click(object sender, EventArgs e) private void btnInOutP4_Click(object sender, EventArgs e)
{ {
...@@ -1512,7 +1317,8 @@ namespace OnlineStore.AutoInOutStore ...@@ -1512,7 +1317,8 @@ namespace OnlineStore.AutoInOutStore
{ {
出入库调试ToolStripMenuItem.Text = ResourceCulture.GetString("启用调试", "启用调试"); 出入库调试ToolStripMenuItem.Text = ResourceCulture.GetString("启用调试", "启用调试");
} }
groupAxis.Enabled = status; //groupAxis.Enabled = status;
axisMoveControl1.Enabled = status;
// groupComAxis.Enabled = status; // groupComAxis.Enabled = status;
//groupInout.Enabled = status; //groupInout.Enabled = status;
if (!status) if (!status)
......
source/ACSingleStore/ResourceCulture.cs
...@@ -19,7 +19,7 @@ namespace OnlineStore.AutoInOutStore ...@@ -19,7 +19,7 @@ namespace OnlineStore.AutoInOutStore
{ {
public class ResourceCulture public class ResourceCulture
{ {
public static bool ShowLog = true ; public static bool ShowLog = false ;
public static string China = "zh-CN"; public static string China = "zh-CN";
public static string English = "en-US"; public static string English = "en-US";
public static string German = "ge-DE"; public static string German = "ge-DE";
......
source/Common/Common.csproj
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OnlineStore.Common</RootNamespace> <RootNamespace>OnlineStore.Common</RootNamespace>
<AssemblyName>Common</AssemblyName> <AssemblyName>Common</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
...@@ -33,9 +33,9 @@ ...@@ -33,9 +33,9 @@
<Prefer32Bit>false</Prefer32Bit> <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL"> <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\dll\log4net.dll</HintPath> <HintPath>..\..\..\增广夹爪\log4net.dll</HintPath>
</Reference> </Reference>
<Reference Include="Newtonsoft.Json"> <Reference Include="Newtonsoft.Json">
<HintPath>..\..\dll\Newtonsoft.Json.dll</HintPath> <HintPath>..\..\dll\Newtonsoft.Json.dll</HintPath>
......
source/Common/Setting_Init.cs
...@@ -75,7 +75,7 @@ namespace OnlineStore.Common ...@@ -75,7 +75,7 @@ namespace OnlineStore.Common
/// <summary> /// <summary>
/// 是否是代码运行，不需要连接设备 /// 是否是代码运行，不需要连接设备
/// </summary> /// </summary>
public static string CodeRun = "CodeRun"; //public static string CodeRun = "CodeRun";
public static string ComAxisChangeValue = "ComAxisChangeValue"; public static string ComAxisChangeValue = "ComAxisChangeValue";
...@@ -96,7 +96,7 @@ namespace OnlineStore.Common ...@@ -96,7 +96,7 @@ namespace OnlineStore.Common
/// </summary> /// </summary>
public static string SinglePosId = "SinglePosId"; public static string SinglePosId = "SinglePosId";
public static string DeCodeType = "DeCodeType"; //public static string DeCodeType = "DeCodeType";
public static string LibNameType = "LibNameType"; public static string LibNameType = "LibNameType";
public static string DefaultPWD = "DefaultPWD"; public static string DefaultPWD = "DefaultPWD";
......
source/Common/util/LogUtil.cs
...@@ -5,20 +5,22 @@ using System.Text; ...@@ -5,20 +5,22 @@ using System.Text;
using log4net; using log4net;
using System.Reflection; using System.Reflection;
using System.Drawing; using System.Drawing;
using System.Threading;
namespace OnlineStore.Common namespace OnlineStore.Common
{ {
public class LogUtil public class LogUtil
{ {
private static LogUtil instance = new LogUtil(); private static LogUtil instance = new LogUtil();
public delegate void ShowLog(string msg, Color color); public delegate void ShowLog(string msg, Color color);
public static readonly ILog LOGGER = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); public static readonly ILog LOGGER = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
// public static readonly ILog AIOLog = LogManager.GetLogger("AIOBOX"); // public static readonly ILog AIOLog = LogManager.GetLogger("AIOBOX");
public static Dictionary<int, DateTime> lastErrorLogTime = new Dictionary<int, DateTime>(); public static Dictionary<int, DateTime> lastErrorLogTime = new Dictionary<int, DateTime>();
public static System.Windows.Forms.RichTextBox logBox = null; public static System.Windows.Forms.RichTextBox logBox = null;
public static event ShowLog showLogEvent;
public static int showCount = 100; public static int showCount = 100;
public static bool debug_opened = false; public static bool debug_opened = false;
...@@ -30,7 +32,8 @@ namespace OnlineStore.Common ...@@ -30,7 +32,8 @@ namespace OnlineStore.Common
return; return;
} }
log.Info( " - " + msg); log.Info( " - " + msg);
showLogEvent?.Invoke(msg,Color.Black);
if (logBox == null) if (logBox == null)
{ {
return; return;
...@@ -112,14 +115,17 @@ namespace OnlineStore.Common ...@@ -112,14 +115,17 @@ namespace OnlineStore.Common
} }
private static void AddToBox(string msg, Color color) private static void AddToBox(string msg, Color color)
{ {
try try
{ {
ShowLogPro(msg);
} ShowLogPro(msg);
catch (Exception ex)
{ }
LOGGER.Error("出错：" + ex.StackTrace); catch (Exception ex)
} {
LOGGER.Error("出错：" + ex.StackTrace);
}
} }
private static int count = 0; private static int count = 0;
private static void ShowLogPro(string msg ) private static void ShowLogPro(string msg )
...@@ -165,7 +171,10 @@ namespace OnlineStore.Common ...@@ -165,7 +171,10 @@ namespace OnlineStore.Common
public static void info(string msg) public static void info(string msg)
{ {
info(LOGGER,msg ); info(LOGGER,msg );
} }
public static void info_noshow(string msg)
{
LOGGER.Info(" - " + msg);
}
} }
} }
source/DeviceLibrary/DeviceLibrary.csproj
...@@ -40,8 +40,9 @@ ...@@ -40,8 +40,9 @@
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\dll\Asa.IOModule.AIOBOX.dll</HintPath> <HintPath>..\..\dll\Asa.IOModule.AIOBOX.dll</HintPath>
</Reference> </Reference>
<Reference Include="CodeLibrary"> <Reference Include="CodeLibrary, Version=1.0.7635.28877, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\dll\CodeLibrary.dll</HintPath> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\GeneralClassLibrary\CodeLibraryProject\CodeLibrary\bin\Debug\CodeLibrary.dll</HintPath>
</Reference> </Reference>
<Reference Include="halcondotnet"> <Reference Include="halcondotnet">
<HintPath>..\..\dll\halcondotnet.dll</HintPath> <HintPath>..\..\dll\halcondotnet.dll</HintPath>
...@@ -49,9 +50,9 @@ ...@@ -49,9 +50,9 @@
<Reference Include="HuichuanLibrary"> <Reference Include="HuichuanLibrary">
<HintPath>..\..\..\HuichuanLibrary\HuichuanLibrary\bin\Debug\HuichuanLibrary.dll</HintPath> <HintPath>..\..\..\HuichuanLibrary\HuichuanLibrary\bin\Debug\HuichuanLibrary.dll</HintPath>
</Reference> </Reference>
<Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL"> <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\dll\log4net.dll</HintPath> <HintPath>..\..\..\增广夹爪\log4net.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
......
source/DeviceLibrary/DeviceLibrary/halcon/CodeManager.cs
...@@ -11,12 +11,13 @@ using System.Windows.Forms; ...@@ -11,12 +11,13 @@ using System.Windows.Forms;
using CodeLibrary; using CodeLibrary;
using System.Drawing.Imaging; using System.Drawing.Imaging;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading.Tasks;
namespace OnlineStore.DeviceLibrary namespace OnlineStore.DeviceLibrary
{ {
public class CodeManager public class CodeManager
{ {
public static int DeCodeType = ConfigAppSettings.GetIntValue(Setting_Init.DeCodeType); //public static int DeCodeType = ConfigAppSettings.GetIntValue(Setting_Init.DeCodeType);
private static int QRCodeCount = ConfigAppSettings.GetIntValue(Setting_Init.QRCodeCount); private static int QRCodeCount = ConfigAppSettings.GetIntValue(Setting_Init.QRCodeCount);
public static List<string> cameraNameList = new List<string>(); public static List<string> cameraNameList = new List<string>();
...@@ -141,74 +142,111 @@ namespace OnlineStore.DeviceLibrary ...@@ -141,74 +142,111 @@ namespace OnlineStore.DeviceLibrary
{ {
return codeList; return codeList;
} }
try try
{ {
foreach (string cameraName in cameraNameList) //Task[] cameraTask = new Task[cameraNameList.Count()];
for(int i= 0;i < cameraNameList.Count();i++)
{ {
if (cameraName.Trim().Equals(""))
{ var cameraName = cameraNameList[i];
continue; //cameraTask[i] = Task.Run(() =>
} //{
DateTime startTime = DateTime.Now; if (cameraName.Trim().Equals(""))
LogUtil.info( " 【" + cameraName + "】开始取图片");
HalconDotNet.HObject ho_Image = null;
try
{
ho_Image = Camera._cam.CaptureOnImage(cameraName);
if (ho_Image == null)
{ {
LogUtil.error( " 【" + cameraName + "】取图片失败[" + Camera._cam.ErrInfo + "]，关闭相机");
CloseCamera(cameraName);
continue; continue;
} }
LogUtil.info( " 【" + cameraName + "】取图片完成，开始扫码"); DateTime startTime = DateTime.Now;
List<CodeInfo> cc = new List<CodeInfo>(); LogUtil.info(" 【" + cameraName + "】开始取图片");
string r = ""; HalconDotNet.HObject ho_Image = null;
foreach (string codeType in codeTypeList) Bitmap bmp = null;
try
{ {
//判断是否是一维码 bool nohalcon = true;
if (codeType.ToLower().Equals("barcode")) ho_Image = Camera._cam.CaptureOnImage(cameraName, out bmp, nohalcon);
if (ho_Image == null && !nohalcon)
{ {
cc = HDCodeHelper.DecodeBarCode(ho_Image); LogUtil.error(" 【" + cameraName + "】取图片失败[" + Camera._cam.ErrInfo + "]，关闭相机");
CloseCamera(cameraName);
continue;
} }
else LogUtil.info(" 【" + cameraName + "】取图片完成，开始扫码");
string r = "";
List<CodeInfo> tlci = EyemDecode.Decoder(ref bmp);
foreach (CodeInfo code in tlci)
{ {
cc = HDCodeHelper.DecodeCode(ho_Image, codeType, GetCodeParamFilePath(codeType), codeCount, 2000); LogUtil.info(" 【" + cameraName + "】[eyemDecode]" + code.CodeType + "(X: " + code.X + "，Y: " + code.Y + ") " + code.CodeStr);
string str = CodeManager.ReplaceCode(code.CodeStr);
lock (codeList)
{
if (!codeList.Contains(str))
{
codeList.Add(str);
r = r + "##" + str;
}
}
} }
foreach (CodeInfo c in cc)
/*
* List<CodeInfo> cc = new List<CodeInfo>();
foreach (string codeType in codeTypeList)
{ {
string str = CodeManager.ReplaceCode(c.CodeStr); //判断是否是一维码
if (!codeList.Contains(str)) if (codeType.ToLower().Equals("barcode"))
{
cc = HDCodeHelper.DecodeBarCode(ho_Image);
}
else
{
cc = HDCodeHelper.DecodeCode(ho_Image, codeType, GetCodeParamFilePath(codeType), codeCount, 2000);
}
foreach (CodeInfo c in cc)
{ {
codeList.Add(str); string str = CodeManager.ReplaceCode(c.CodeStr);
r = r + "##" + str; lock (codeList)
{
if (!codeList.Contains(str))
{
codeList.Add(str);
r = r + "##" + str;
}
}
} }
} }
*/
if (codeList.Count()==0)
{
SaveImageToFile("mimo", cameraName, bmp);
}
LogUtil.info(" 【" + cameraName + "】" + " 扫码完成【" + FormUtil.GetSpanStr(DateTime.Now - startTime) + "】 ：" + r);
} }
if (String.IsNullOrEmpty(r)) catch (AccessViolationException e)
{ {
// SaveImageToFile(deviceName, cameraName, bit); LogUtil.error(" 扫码出现AccessViolationException异常，关闭相机【" + cameraName + "】：" + e.ToString());
Camera._cam.Close(cameraName);
// GC.Collect();
} }
LogUtil.info(" 【" + cameraName + "】" + " 扫码完成【" + FormUtil.GetSpanStr(DateTime.Now - startTime) + "】 ：" + r); catch (Exception ex)
}
catch (AccessViolationException e)
{
LogUtil.error( " 扫码出现AccessViolationException异常，关闭相机【" + cameraName + "】：" + e.ToString());
Camera._cam.Close(cameraName);
// GC.Collect();
}
catch (Exception ex)
{
LogUtil.error( " 扫码出错：" + ex.ToString());
}
finally
{
if (ho_Image != null)
{ {
ho_Image.Dispose(); LogUtil.error(" 扫码出错：" + ex.ToString());
} }
} finally
{
if (ho_Image != null)
{
ho_Image.Dispose();
}
if (bmp != null)
bmp.Dispose();
}
// });
//cameraTask[i].Wait();
} }
//Task.WaitAll(cameraTask);
} }
catch (AccessViolationException e) catch (AccessViolationException e)
{ {
...@@ -234,6 +272,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -234,6 +272,7 @@ namespace OnlineStore.DeviceLibrary
Directory.CreateDirectory(dire); Directory.CreateDirectory(dire);
} }
bit.Save(dire + iamgeName, ImageFormat.Bmp); bit.Save(dire + iamgeName, ImageFormat.Bmp);
bit.Dispose();
LogUtil.info(deviceName + " 【" + cameraName + "】扫码失败，保存图片到【" + dire + iamgeName + "】成功"); LogUtil.info(deviceName + " 【" + cameraName + "】扫码失败，保存图片到【" + dire + iamgeName + "】成功");
} }
catch (Exception ex) catch (Exception ex)
......
source/DeviceLibrary/StoreConfig/AC/StoreConfig.csv
...@@ -52,9 +52,9 @@ AXIS,(轴五)批量上下料轴,Batch_Axis,4,HC,0,,,,, ...@@ -52,9 +52,9 @@ AXIS,(轴五)批量上下料轴,Batch_Axis,4,HC,0,,,,,
,,,,,,,,,, ,,,,,,,,,,
PRO,升降轴 仓门位置P7(人工拿走盘的位置),UpDownAxis_Door_P7,3473,,,,,,, PRO,升降轴 仓门位置P7(人工拿走盘的位置),UpDownAxis_Door_P7,3473,,,,,,,
PRO,升降轴 出库高点P2,UpDownAxis_OutHigh_P2,2276,,,,,,, PRO,升降轴 出库高点P2,UpDownAxis_OutHigh_P2,2276,,,,,,,
PRO,升降轴 出库低点P8,UpDownAxis_OutLow_P8,2113,,,,,,, PRO,升降轴 出库低点P8,UpDownAxis_OutLow_P8,2073,,,,,,,
PRO,升降轴从吸盘下方接料后下降的高度,UpDownAxis_DownValue,100,,,,,,, PRO,升降轴从吸盘下方接料后下降的高度,UpDownAxis_DownValue,100,,,,,,,
PRO,升降轴 入库P1点集合,UpDownAxis_P1_List,8#3926;12#3884;16#3840;20#3800;24#3759;,,,,,,, PRO,升降轴 入库P1点集合,UpDownAxis_P1_List,8#3926;12#3884;16#3840;20#3800;24#3789;,,,,,,,
PRO,旋转轴(轴一)P1 待机原位点,MiddleAxis_P1_Position,3060,,,,,,, PRO,旋转轴(轴一)P1 待机原位点,MiddleAxis_P1_Position,3060,,,,,,,
PRO,进出轴(轴三)P1待机原位点,InOutAxis_P1_Position,100,,,,,,, PRO,进出轴(轴三)P1待机原位点,InOutAxis_P1_Position,100,,,,,,,
PRO,压紧轴(轴四)P1待机原位点,CompressAxis_P1_Position,7000,,,,,,, PRO,压紧轴(轴四)P1待机原位点,CompressAxis_P1_Position,7000,,,,,,,
...@@ -68,15 +68,15 @@ PRO,气压检测IO关闭需要持续的时间,AirCheckSeconds,180,,,,,,, ...@@ -68,15 +68,15 @@ PRO,气压检测IO关闭需要持续的时间,AirCheckSeconds,180,,,,,,,
,,,,,,,,,, ,,,,,,,,,,
PRO,预警温度,WarnTemperate,80,,,,,,, PRO,预警温度,WarnTemperate,80,,,,,,,
PRO,预警湿度,WarnHumidity,80,,,,,,, PRO,预警湿度,WarnHumidity,80,,,,,,,
PRO,(轴一)旋转轴目标速度,MiddleAxis_TargetSpeed,100,,,,,,, PRO,(轴一)旋转轴目标速度,MiddleAxis_TargetSpeed,800,,,,,,,
PRO,(轴一)旋转轴加速度,MiddleAxis_AddSpeed,400,,,,,,, PRO,(轴一)旋转轴加速度,MiddleAxis_AddSpeed,2400,,,,,,,
PRO,(轴一)旋转轴减速度,MiddleAxis_DelSpeed,400,,,,,,, PRO,(轴一)旋转轴减速度,MiddleAxis_DelSpeed,2400,,,,,,,
PRO,(轴一)旋转轴原点低速度,MiddleAxis_HomeLowSpeed,90,,,,,,, PRO,(轴一)旋转轴原点低速度,MiddleAxis_HomeLowSpeed,100,,,,,,,
PRO,(轴一)旋转轴原点高速,MiddleAxis_HomeHighSpeed,100,,,,,,, PRO,(轴一)旋转轴原点高速,MiddleAxis_HomeHighSpeed,100,,,,,,,
PRO,(轴一)旋转轴原点加速度,MiddleAxis_HomeAddSpeed,500,,,,,,, PRO,(轴一)旋转轴原点加速度,MiddleAxis_HomeAddSpeed,500,,,,,,,
PRO,(轴二)升降轴轴目标速度,UpdownAxis_TargetSpeed,400,,,,,,, PRO,(轴二)升降轴轴目标速度,UpdownAxis_TargetSpeed,2000,,,,,,,
PRO,(轴二)升降轴轴加速度,UpdownAxis_AddSpeed,1200,,,,,,, PRO,(轴二)升降轴轴加速度,UpdownAxis_AddSpeed,6000,,,,,,,
PRO,(轴二)升降轴轴减速度,UpdownAxis_DelSpeed,1200,,,,,,, PRO,(轴二)升降轴轴减速度,UpdownAxis_DelSpeed,6000,,,,,,,
PRO,(轴二)升降轴轴原点低速度,UpdownAxis_HomeLowSpeed,20,,,,,,, PRO,(轴二)升降轴轴原点低速度,UpdownAxis_HomeLowSpeed,20,,,,,,,
PRO,(轴二)升降轴轴原点高速,UpdownAxis_HomeHighSpeed,250,,,,,,, PRO,(轴二)升降轴轴原点高速,UpdownAxis_HomeHighSpeed,250,,,,,,,
PRO,(轴二)升降轴轴原点加速度,UpdownAxis_HomeAddSpeed,3000,,,,,,, PRO,(轴二)升降轴轴原点加速度,UpdownAxis_HomeAddSpeed,3000,,,,,,,
...@@ -96,9 +96,9 @@ PRO,升降轴(轴二)到仓门P7速度,UpDownAxis_P7_Speed,2000,,,,,,, ...@@ -96,9 +96,9 @@ PRO,升降轴(轴二)到仓门P7速度,UpDownAxis_P7_Speed,2000,,,,,,,
PRO,升降轴(轴二)P8速度,UpDownAxis_P8_Speed,100,,,,,,, PRO,升降轴(轴二)P8速度,UpDownAxis_P8_Speed,100,,,,,,,
PRO,旋转轴(轴一)P1速度,MiddleAxis_P1_Speed,800,,,,,,, PRO,旋转轴(轴一)P1速度,MiddleAxis_P1_Speed,800,,,,,,,
PRO,旋转轴(轴一)P2速度,MiddleAxis_P2_Speed,800,,,,,,, PRO,旋转轴(轴一)P2速度,MiddleAxis_P2_Speed,800,,,,,,,
PRO,进出轴(轴三)P1速度,InOutAxis_P1_Speed,1200,,,,,,, PRO,进出轴(轴三)P1速度,InOutAxis_P1_Speed,1600,,,,,,,
PRO,进出轴(轴三)P2速度,InOutAxis_P2_Speed,1600,,,,,,, PRO,进出轴(轴三)P2速度,InOutAxis_P2_Speed,1800,,,,,,,
PRO,进出轴(轴三)P3速度,InOutAxis_P3_Speed,1600,,,,,, , PRO,进出轴(轴三)P3速度,InOutAxis_P3_Speed,1800,,,,,, ,
PRO,(轴一)旋转轴最小误差脉冲值,MiddleAxis_ErrorCountMin,5,,,,,,, PRO,(轴一)旋转轴最小误差脉冲值,MiddleAxis_ErrorCountMin,5,,,,,,,
PRO,(轴二)升降轴轴最小误差脉冲值,UpdownAxis_ErrorCountMin,5,,,,,,, PRO,(轴二)升降轴轴最小误差脉冲值,UpdownAxis_ErrorCountMin,5,,,,,,,
PRO,(轴三)进出轴最小误差脉冲值,InoutAxis_ErrorCountMin,5,,,,,,, PRO,(轴三)进出轴最小误差脉冲值,InoutAxis_ErrorCountMin,5,,,,,,,
...@@ -106,7 +106,7 @@ PRO,(轴一)旋转轴最大误差脉冲值,MiddleAxis_ErrorCountMax,20,,,,,,, ...@@ -106,7 +106,7 @@ PRO,(轴一)旋转轴最大误差脉冲值,MiddleAxis_ErrorCountMax,20,,,,,,,
PRO,(轴二)升降轴轴最大误差脉冲值,UpdownAxis_ErrorCountMax,20,,,,,,, PRO,(轴二)升降轴轴最大误差脉冲值,UpdownAxis_ErrorCountMax,20,,,,,,,
PRO,(轴三)进出轴最大误差脉冲值,InoutAxis_ErrorCountMax,20,,,,,,, PRO,(轴三)进出轴最大误差脉冲值,InoutAxis_ErrorCountMax,20,,,,,,,
PRO,出入库多少次，会自动重置旋转轴,Box_ResetMCount,1000,,,,,,, PRO,出入库多少次，会自动重置旋转轴,Box_ResetMCount,1000,,,,,,,
PRO,出入库多少次，会自动重置所有轴操作,Box_ResetACount,100,,,,,, , PRO,出入库多少次，会自动重置所有轴操作,Box_ResetACount,500,,,,,, ,
PRO,IO信号超时时间（毫秒）,IOSingle_TimerOut,10000,,,,,,, PRO,IO信号超时时间（毫秒）,IOSingle_TimerOut,10000,,,,,,,
PRO,是否使用料盘检测信号,IsUse_Tray_Check,1,,,,,,, PRO,是否使用料盘检测信号,IsUse_Tray_Check,1,,,,,,,
PRO,(轴一)旋转轴最小限位,MiddleAxis_PositionMin,0,,,,,,, PRO,(轴一)旋转轴最小限位,MiddleAxis_PositionMin,0,,,,,,,
...@@ -123,8 +123,8 @@ PRO,温湿度端口号,Humiture_Port,COM5,,,,,,, ...@@ -123,8 +123,8 @@ PRO,温湿度端口号,Humiture_Port,COM5,,,,,,,
,,,,,,,,,, ,,,,,,,,,,
,,,,,,,,,, ,,,,,,,,,,
,,,,,,,,,, ,,,,,,,,,,
PRO,(轴五)上料轴目标速度,BatchAxis_TargetSpeed,20000,,,,,,, PRO,(轴五)上料轴目标速度,BatchAxis_TargetSpeed,13000,,,,,,,
PRO,(轴五)上料轴慢速匀速上升速度,BatchAxis_SlowSpeed,10000,,,,,,, PRO,(轴五)上料轴慢速匀速上升速度,BatchAxis_SlowSpeed,8000,,,,,,,
PRO,(轴五)上料轴加速度,BatchAxis_AddSpeed,60000,,,,,,, PRO,(轴五)上料轴加速度,BatchAxis_AddSpeed,60000,,,,,,,
PRO,(轴五)上料轴减速度,BatchAxis_DelSpeed,60000,,,,,,, PRO,(轴五)上料轴减速度,BatchAxis_DelSpeed,60000,,,,,,,
PRO,(轴五)上料轴原点低速,BatchAxis_HomeLowSpeed,20000,,,,,,, PRO,(轴五)上料轴原点低速,BatchAxis_HomeLowSpeed,20000,,,,,,,
...@@ -132,17 +132,17 @@ PRO,(轴五)上料轴原点高速,BatchAxis_HomeHighSpeed,30000,,,,,,, ...@@ -132,17 +132,17 @@ PRO,(轴五)上料轴原点高速,BatchAxis_HomeHighSpeed,30000,,,,,,,
PRO,(轴五)上料轴原点加速度,BatchAxis_HomeAddSpeed,90000,,,,,, , PRO,(轴五)上料轴原点加速度,BatchAxis_HomeAddSpeed,90000,,,,,, ,
PRO,(轴五)上料轴P1点（出库时接料盘的位置）,BatchAxis_P1,290669,,,,,, , PRO,(轴五)上料轴P1点（出库时接料盘的位置）,BatchAxis_P1,290669,,,,,, ,
PRO,(轴五)上料轴P2点（待机点）,BatchAxis_P2,3000,,,,,,, PRO,(轴五)上料轴P2点（待机点）,BatchAxis_P2,3000,,,,,,,
PRO,(轴五)上料轴P2速度,BatchAxis_P2_Speed,15000,,,,,,, PRO,(轴五)上料轴P2速度,BatchAxis_P2_Speed,20000,,,,,,,
PRO,(轴五)上料轴最小误差脉冲值,BatchAxis_ErrorCountMin,100,,,,,,, PRO,(轴五)上料轴最小误差脉冲值,BatchAxis_ErrorCountMin,100,,,,,,,
PRO,(轴五)上料轴最大误差脉冲值,BatchAxis_ErrorCountMax,1000,,,,,,, PRO,(轴五)上料轴最大误差脉冲值,BatchAxis_ErrorCountMax,1000,,,,,,,
PRO,(轴五)上料轴最小限位,BatchAxis_PositionMin,0,,,,,,, PRO,(轴五)上料轴最小限位,BatchAxis_PositionMin,0,,,,,,,
PRO,(轴五)上料轴最大限位,BatchAxis_PositionMax,0,,,,,,, PRO,(轴五)上料轴最大限位,BatchAxis_PositionMax,0,,,,,,,
PRO,(轴五)上料轴出料时距离检测信号需要下降的高度,BatchAxis_OutDownPosition,10,,,,,,, PRO,(轴五)上料轴出料时距离检测信号需要下降的高度,BatchAxis_OutDownPosition,40,,,,,,,
PRO,(轴五)上料轴出料时检测到料盘需要下降的高度,BatchAxis_DownPosition2,3000,,,,,,, PRO,(轴五)上料轴出料时检测到料盘需要下降的高度,BatchAxis_DownPosition2,3000,,,,,,,
PRO,(轴五)上料轴P1速度,BatchAxis_P1_Speed,20000,,,,,,, PRO,(轴五)上料轴P1速度,BatchAxis_P1_Speed,22000,,,,,,,
PRO,(轴五)上料轴最最大料盘高度，到达后无法批量出库,BatchAxis_MaxHeight,250,,,,,,, PRO,(轴五)上料轴最最大料盘高度，到达后无法批量出库,BatchAxis_MaxHeight,250,,,,,,,
PRO,最后一盘料需要补充的高度,LastTrayAddHeight,7,,,,,,, PRO,最后一盘料需要补充的高度,LastTrayAddHeight,10,,,,,,,
PRO,(轴五)上料轴P3点（上料目标位置）,BatchAxis_P3,362062,,,,,,, PRO,(轴五)上料轴P3点（上料目标位置）,BatchAxis_P3,362262,,,,,,,
,,,,,,,,,, ,,,,,,,,,,
PRO,(轴二)升降轴单盘入库抬升料盘的高度,UpdownAxis_UpPosition,100,,,,,,, PRO,(轴二)升降轴单盘入库抬升料盘的高度,UpdownAxis_UpPosition,100,,,,,,,
PRO,(轴五)上料轴出库上升最大高度,BatchAxis_OutMaxValue,100,,,,,,, PRO,(轴五)上料轴出库上升最大高度,BatchAxis_OutMaxValue,100,,,,,,,
...@@ -153,7 +153,7 @@ PRO,(轴四)压紧轴减速度,CompAxis_DelSpeed,25000,,,,,,, ...@@ -153,7 +153,7 @@ PRO,(轴四)压紧轴减速度,CompAxis_DelSpeed,25000,,,,,,,
PRO,(轴四)压紧轴原点低速,CompAxis_HomeLowSpeed,3000,,,,,,, PRO,(轴四)压紧轴原点低速,CompAxis_HomeLowSpeed,3000,,,,,,,
PRO,(轴四)压紧轴原点高速,CompAxis_HomeHighSpeed,5000,,,,,,, PRO,(轴四)压紧轴原点高速,CompAxis_HomeHighSpeed,5000,,,,,,,
PRO,(轴四)压紧轴原点加速度,CompAxis_HomeAddSpeed,10000,,,,,,, PRO,(轴四)压紧轴原点加速度,CompAxis_HomeAddSpeed,10000,,,,,,,
PRO,(轴四)压紧轴P1速度,CompAxis_P1_Speed,3000,,,,,,, PRO,(轴四)压紧轴P1速度,CompAxis_P1_Speed,5000,,,,,,,
PRO,(轴四)压紧轴P2速度,CompAxis_P2_Speed,7500,,,,,,, PRO,(轴四)压紧轴P2速度,CompAxis_P2_Speed,8500,,,,,,,
PRO,(轴四)压紧轴P3速度,CompAxis_P3_Speed,7500,,,,,,, PRO,(轴四)压紧轴P3速度,CompAxis_P3_Speed,8500,,,,,,,
PRO,特殊二维码尺寸配置,CodeSizeConfig,T;PartNum;1=330x81,,,,,,, PRO,特殊二维码尺寸配置,CodeSizeConfig,T;PartNum;1=330x81,,,,,,,
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
...@@ -76,8 +76,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -76,8 +76,8 @@ namespace OnlineStore.DeviceLibrary
AutomaticBaiting.Init(); AutomaticBaiting.Init();
IOManager.Init(); IOManager.Init();
//初始化 //连接设备 //初始化 //连接设备
if (ConfigAppSettings.GetIntValue(Setting_Init.CodeRun).Equals(1)) { } //if (ConfigAppSettings.GetIntValue(Setting_Init.CodeRun).Equals(1)) { }
else //else
{ {
Task.Factory.StartNew(delegate Task.Factory.StartNew(delegate
{ {
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
...@@ -890,22 +890,26 @@ namespace OnlineStore.DeviceLibrary ...@@ -890,22 +890,26 @@ namespace OnlineStore.DeviceLibrary
int outDownPosition = StoreMove.MoveParam.MoveP.BatchAxis_DownValue; int outDownPosition = StoreMove.MoveParam.MoveP.BatchAxis_DownValue;
if (StoreMove.IsBatchInOutStore) if (StoreMove.IsBatchInOutStore)
{ //如果料盘检测信号不亮，不需要下降这么多 {
//如果料盘检测信号不亮，不需要下降这么多
//判断是否在P1点 //判断是否在P1点
int acPosition = ACServerManager.GetActualtPosition(Config.Batch_Axis); int acPosition = ACServerManager.GetActualtPosition(Config.Batch_Axis);
bool isIn = Math.Abs(acPosition - Config.BatchAxis_P1) < Config.Batch_Axis.CanErrorCountMax; bool isIn = Math.Abs(acPosition - Config.BatchAxis_P1) < Config.Batch_Axis.CanErrorCountMax;
if (IOManager.IOValue(IO_Type.TrayCheck_LoadMaterial).Equals(IO_VALUE.LOW) && outDownPosition > Config.BatchAxis_OutDownPosition && isIn) if (IOManager.IOValue(IO_Type.TrayCheck_LoadMaterial).Equals(IO_VALUE.LOW) && outDownPosition > Config.BatchAxis_OutDownPosition && isIn)
{ {
outDownPosition = outDownPosition - Config.BatchAxis_OutDownPosition; //outDownPosition = outDownPosition - Config.BatchAxis_OutDownPosition;
LogUtil.info_noshow($"判断是否在P1点:outDownPosition:{outDownPosition}");
} }
//如果检测信号亮，需要多下降 //如果检测信号亮，需要多下降
if (IOManager.IOValue(IO_Type.TrayCheck_LoadMaterial).Equals(IO_VALUE.HIGH)) if (IOManager.IOValue(IO_Type.TrayCheck_LoadMaterial).Equals(IO_VALUE.HIGH))
{ {
outDownPosition = outDownPosition + Config.BatchAxis_DownPosition2; outDownPosition = outDownPosition + Config.BatchAxis_DownPosition2;
LogUtil.info_noshow($"如果检测信号亮，需要多下降:outDownPosition:{outDownPosition}");
} }
//上下料机构下降的距离=料盘最低高度+默认的高度 //上下料机构下降的距离=料盘最低高度+默认的高度
targetValue = GetBatchTargetValue(outDownPosition); targetValue = GetBatchTargetValue(outDownPosition);
if (targetValue >= 1000) if (targetValue >= Config.BatchAxis_P2)
{ {
BatchNeedMove = true; BatchNeedMove = true;
} }
...@@ -1097,7 +1101,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -1097,7 +1101,7 @@ namespace OnlineStore.DeviceLibrary
//如果可以直接下降，则不需要匀速上升 //如果可以直接下降，则不需要匀速上升
int targetValue = GetBatchTargetValue(StoreMove.MoveParam.MoveP.BatchAxis_DownValue); int targetValue = GetBatchTargetValue(StoreMove.MoveParam.MoveP.BatchAxis_DownValue);
if (targetValue >= 300000) if (targetValue >= 290600)
{ {
OutStoreLog("出库：SO_02 批量上下料轴直接下降后目标位置【" + targetValue + "】不需要匀速上升 "); OutStoreLog("出库：SO_02 批量上下料轴直接下降后目标位置【" + targetValue + "】不需要匀速上升 ");
} }
...@@ -1125,7 +1129,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -1125,7 +1129,6 @@ namespace OnlineStore.DeviceLibrary
//第二盘以后的料，若信号亮，先下降到信号不亮 //第二盘以后的料，若信号亮，先下降到信号不亮
//信号不亮，批量轴下降指定的位置 //信号不亮，批量轴下降指定的位置
} }
} }
private int GetBatchTargetValue(int downValue) private int GetBatchTargetValue(int downValue)
......
source/DeviceLibrary/acSingleStore/AutomaticBaiting.cs
...@@ -408,6 +408,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -408,6 +408,7 @@ namespace OnlineStore.DeviceLibrary
InStoreLog(" 批量轴匀速上升【" + StoreManager.Config.BatchAxis_SlowSpeed + "】"); InStoreLog(" 批量轴匀速上升【" + StoreManager.Config.BatchAxis_SlowSpeed + "】");
ACAxisSpeedMove(StoreManager.Config.Batch_Axis, StoreManager.Config.BatchAxis_P3, StoreManager.Config.BatchAxis_SlowSpeed, IO_Type.TrayCheck_LoadMaterial); ACAxisSpeedMove(StoreManager.Config.Batch_Axis, StoreManager.Config.BatchAxis_P3, StoreManager.Config.BatchAxis_SlowSpeed, IO_Type.TrayCheck_LoadMaterial);
CylinderMove(IO_Type.ClampingDisc_Up, IO_Type.ClampingDisc_Down, true); CylinderMove(IO_Type.ClampingDisc_Up, IO_Type.ClampingDisc_Down, true);
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Fixture, IO_VALUE.LOW));
if (StoreManager.Config.Default_TrayWidth.Equals(7)) if (StoreManager.Config.Default_TrayWidth.Equals(7))
{ {
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.WidthCheck1, IO_VALUE.HIGH)); StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.WidthCheck1, IO_VALUE.HIGH));
......
source/LoadCVSLibrary/LoadCSVLibrary.csproj
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OnlineStore.LoadCSVLibrary</RootNamespace> <RootNamespace>OnlineStore.LoadCSVLibrary</RootNamespace>
<AssemblyName>LoadCSVLibrary</AssemblyName> <AssemblyName>LoadCSVLibrary</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
...@@ -33,9 +33,9 @@ ...@@ -33,9 +33,9 @@
<Prefer32Bit>false</Prefer32Bit> <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL"> <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\dll\log4net.dll</HintPath> <HintPath>..\..\..\增广夹爪\log4net.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!