Skip to content

孙克 / ACSingleStore

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

添加压紧轴列表, 回原加速度调到6倍, 扫码完后取盘时检测不到盘则取消任务

1 个父辈 de14ca3c
内嵌 并排
正在显示 28 个修改的文件 包含 479 行增加 和 203 行删除
source/ACSingleStore/ACSingleStore.csproj
...@@ -218,7 +218,7 @@ ...@@ -218,7 +218,7 @@
</EmbeddedResource> </EmbeddedResource>
<None Include="app.manifest" /> <None Include="app.manifest" />
<None Include="packages.config" /> <None Include="packages.config" />
<None Include="resource\language.resource"> <None Include="resources\language.resource">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
<None Include="Properties\Settings.settings"> <None Include="Properties\Settings.settings">
...@@ -230,7 +230,7 @@ ...@@ -230,7 +230,7 @@
<DependentUpon>Settings.settings</DependentUpon> <DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput> <DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile> </Compile>
<None Include="resource\ResourceMap.csv"> <None Include="resources\ResourceMap.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
</ItemGroup> </ItemGroup>
......
source/ACSingleStore/App.config
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
<level value="Info" /> <level value="Info" />
<appender-ref ref="RollingLogFileAppender" /> <appender-ref ref="RollingLogFileAppender" />
</logger> </logger>
<logger name="ResourcesLog" additivity="false"> <logger name="LngResource" additivity="false">
<level value="All" /> <level value="All" />
<appender-ref ref="ResourcesLog" /> <appender-ref ref="ResourcesLog" />
</logger> </logger>
......
source/ACSingleStore/FrmIOStatus.Designer.cs
...@@ -254,7 +254,7 @@ ...@@ -254,7 +254,7 @@
this.chbAutoRead.Checked = true; this.chbAutoRead.Checked = true;
this.chbAutoRead.CheckState = System.Windows.Forms.CheckState.Checked; this.chbAutoRead.CheckState = System.Windows.Forms.CheckState.Checked;
this.chbAutoRead.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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(588, 613); this.chbAutoRead.Location = new System.Drawing.Point(592, 613);
this.chbAutoRead.Name = "chbAutoRead"; this.chbAutoRead.Name = "chbAutoRead";
this.chbAutoRead.Size = new System.Drawing.Size(75, 21); this.chbAutoRead.Size = new System.Drawing.Size(75, 21);
this.chbAutoRead.TabIndex = 244; this.chbAutoRead.TabIndex = 244;
...@@ -538,7 +538,7 @@ ...@@ -538,7 +538,7 @@
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(882, 657); this.ClientSize = new System.Drawing.Size(886, 657);
this.Controls.Add(this.button1); this.Controls.Add(this.button1);
this.Controls.Add(this.groupBoxHighState); this.Controls.Add(this.groupBoxHighState);
this.Controls.Add(this.groupBoxDowrite); this.Controls.Add(this.groupBoxDowrite);
......
source/ACSingleStore/FrmLanguare.Designer.cs
...@@ -91,10 +91,10 @@ ...@@ -91,10 +91,10 @@
this.rbtnJapanese.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.rbtnJapanese.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.rbtnJapanese.Location = new System.Drawing.Point(198, 130); this.rbtnJapanese.Location = new System.Drawing.Point(198, 130);
this.rbtnJapanese.Name = "rbtnJapanese"; this.rbtnJapanese.Name = "rbtnJapanese";
this.rbtnJapanese.Size = new System.Drawing.Size(60, 25); this.rbtnJapanese.Size = new System.Drawing.Size(76, 25);
this.rbtnJapanese.TabIndex = 281; this.rbtnJapanese.TabIndex = 281;
this.rbtnJapanese.TabStop = true; this.rbtnJapanese.TabStop = true;
this.rbtnJapanese.Text = "日语"; this.rbtnJapanese.Text = "日本語";
this.rbtnJapanese.UseVisualStyleBackColor = true; this.rbtnJapanese.UseVisualStyleBackColor = true;
// //
// FrmLanguare // FrmLanguare
......
source/ACSingleStore/FrmStoreBox.cs
...@@ -168,11 +168,12 @@ namespace OnlineStore.ACSingleStore ...@@ -168,11 +168,12 @@ namespace OnlineStore.ACSingleStore
this.Text = ConfigAppSettings.GetValue(Setting_Init.App_Title); this.Text = ConfigAppSettings.GetValue(Setting_Init.App_Title);
notifyIcon1.Text = ConfigAppSettings.GetValue(Setting_Init.App_Title); notifyIcon1.Text = ConfigAppSettings.GetValue(Setting_Init.App_Title);
axisMoveControl1.LoadData(store);
LoadOk = true;
this.chbBuzzer.Checked = store.UseBuzzer; this.chbBuzzer.Checked = store.UseBuzzer;
this.chbTH.Checked = store.UseAirBlow; this.chbTH.Checked = store.UseAirBlow;
axisMoveControl1.LoadData(store);
chbIsDebug.Checked = store.IsDebug; chbIsDebug.Checked = store.IsDebug;
LoadOk = true;
HideForm(); HideForm();
LogUtil.info("启动完成"); LogUtil.info("启动完成");
...@@ -193,7 +194,7 @@ namespace OnlineStore.ACSingleStore ...@@ -193,7 +194,7 @@ namespace OnlineStore.ACSingleStore
iodbgfrm.TopLevel = false; iodbgfrm.TopLevel = false;
tabPage9.Controls.Add(iodbgfrm); tabPage9.Controls.Add(iodbgfrm);
iodbgfrm.Dock = DockStyle.Fill; iodbgfrm.Dock = DockStyle.Fill;
iodbgfrm.Anchor = ((AnchorStyles)((AnchorStyles.Top | AnchorStyles.Right | AnchorStyles.Bottom | AnchorStyles.Left))); //iodbgfrm.Anchor = ((AnchorStyles)((AnchorStyles.Top | AnchorStyles.Right | AnchorStyles.Bottom | AnchorStyles.Left)));
iodbgfrm.Show(); iodbgfrm.Show();
...@@ -444,7 +445,10 @@ namespace OnlineStore.ACSingleStore ...@@ -444,7 +445,10 @@ namespace OnlineStore.ACSingleStore
private void AxisABSMove(ConfigMoveAxis moveAxis, int targetPosition, int targetSpeed) private void AxisABSMove(ConfigMoveAxis moveAxis, int targetPosition, int targetSpeed)
{ {
moveAxis.TargetPosition = targetPosition; moveAxis.TargetPosition = targetPosition;
ACServerManager.AbsMove(moveAxis.DeviceName, moveAxis.GetAxisValue(), targetPosition, targetSpeed, targetSpeed*4, targetSpeed*4); //var moveAxis = getAxis(SlvAddr);
var addSpeed = moveAxis.AddSpeed > 0 ? moveAxis.AddSpeed : targetSpeed * 4;
var delSpeed = moveAxis.DelSpeed > 0 ? moveAxis.DelSpeed : targetSpeed * 4;
ACServerManager.AbsMove(moveAxis.DeviceName, moveAxis.GetAxisValue(), targetPosition, targetSpeed, addSpeed, delSpeed);
} }
private void btnUpDownP1_Click(object sender, EventArgs e) private void btnUpDownP1_Click(object sender, EventArgs e)
{ {
...@@ -598,7 +602,12 @@ namespace OnlineStore.ACSingleStore ...@@ -598,7 +602,12 @@ namespace OnlineStore.ACSingleStore
{ {
Camera._cam.CloseAll(); Camera._cam.CloseAll();
} }
//CodeResourceControl.OpenResourceLog = true;
CodeResourceControl.GetLanguageEvent += () => { return ResourceCulture.CurrLanguage; };
CodeResourceControl.CurrLanguage= ResourceCulture.CurrLanguage;
CodeLibrary.FrmCodeDecode frm = new CodeLibrary.FrmCodeDecode(); CodeLibrary.FrmCodeDecode frm = new CodeLibrary.FrmCodeDecode();
frm.CurrLanguage = ResourceCulture.CurrLanguage;
frm.LanguageProcess();
frm.chbZxing.Checked = false; frm.chbZxing.Checked = false;
frm.chbZxing.Visible = false; frm.chbZxing.Visible = false;
frm.ShowDialog(); frm.ShowDialog();
...@@ -933,9 +942,9 @@ namespace OnlineStore.ACSingleStore ...@@ -933,9 +942,9 @@ namespace OnlineStore.ACSingleStore
short slvAddr = store.Config.UpDown_Axis.GetAxisValue(); short slvAddr = store.Config.UpDown_Axis.GetAxisValue();
int ioIndex = 0; int ioIndex = 0;
// if (store.Config.StoreDIList.ContainsKey(IO_Type.UpdownPositionSingal)) // if (store.Config.StoreDIList.ContainsKey(IO_Type.UpdownPositionSingal))
if (store.Config.StoreDIList.ContainsKey(IO_Type.TrayCheck_Fixture)) if (store.Config.StoreDIList.ContainsKey(IO_Type.Laser_detection))
{ {
ioIndex = store.Config.StoreDIList[IO_Type.TrayCheck_Fixture].GetIOAddr(); ioIndex = store.Config.StoreDIList[IO_Type.Laser_detection].GetIOAddr();
} }
FrmPositionTool frm = new FrmPositionTool(PortName, slvAddr, ioIndex, store.Config.UpDown_Axis.HomeHighSpeed, store.Config.UpDown_Axis.HomeLowSpeed, store.Config.UpDown_Axis.HomeAddSpeed); FrmPositionTool frm = new FrmPositionTool(PortName, slvAddr, ioIndex, store.Config.UpDown_Axis.HomeHighSpeed, store.Config.UpDown_Axis.HomeLowSpeed, store.Config.UpDown_Axis.HomeAddSpeed);
frm.ShowDialog(); frm.ShowDialog();
......
source/ACSingleStore/Properties/AssemblyInfo.cs
...@@ -9,7 +9,7 @@ using System.Runtime.InteropServices; ...@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyDescription("")] [assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")] [assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("SO951-HC-ACSingleStore 82710d360fb1b40b2637f7671e0085adf4f5926c")] [assembly: AssemblyProduct("SO951-HC-ACSingleStore de14ca3c0b9efddc8beead183e4c06c73936ef8b")]
[assembly: AssemblyCopyright("Copyright ? 2017")] [assembly: AssemblyCopyright("Copyright ? 2017")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
......
source/ACSingleStore/ResourceCulture.cs
...@@ -58,7 +58,7 @@ namespace OnlineStore ...@@ -58,7 +58,7 @@ namespace OnlineStore
//string chinaPath = Application.StartupPath + @"\resource\zh-CN.resource"; //string chinaPath = Application.StartupPath + @"\resource\zh-CN.resource";
//Dictionary<string, string> ChinaMap = LoadDataMap(chinaPath); //Dictionary<string, string> ChinaMap = LoadDataMap(chinaPath);
//Dictionary<string, string> EnglishMap = LoadDataMap(englishPath); //Dictionary<string, string> EnglishMap = LoadDataMap(englishPath);
string rPath= Application.StartupPath + @"\resource\language.resource"; string rPath= Application.StartupPath + @"\resources\language.resource";
ResourceMap = new Dictionary<string, Dictionary<string, string>>(); ResourceMap = new Dictionary<string, Dictionary<string, string>>();
Dictionary<string, string> ChinaMap = new Dictionary<string, string>(); Dictionary<string, string> ChinaMap = new Dictionary<string, string>();
Dictionary<string, string> EnglishMap = new Dictionary<string, string>(); Dictionary<string, string> EnglishMap = new Dictionary<string, string>();
...@@ -186,7 +186,7 @@ namespace OnlineStore ...@@ -186,7 +186,7 @@ namespace OnlineStore
private static Dictionary<string,string> LoadRMap() private static Dictionary<string,string> LoadRMap()
{ {
string path = Application.StartupPath + @"\resource\ResourceMap.csv"; string path = Application.StartupPath + @"\resources\ResourceMap.csv";
Dictionary<string, string> map = new Dictionary<string, string>(); Dictionary<string, string> map = new Dictionary<string, string>();
try try
{ {
......
source/ACSingleStore/positionTool/FrmPositionTool.Designer.cs
...@@ -84,9 +84,11 @@ ...@@ -84,9 +84,11 @@
this.groupBox6.Controls.Add(this.btnClear); this.groupBox6.Controls.Add(this.btnClear);
this.groupBox6.Controls.Add(this.richTextBox1); this.groupBox6.Controls.Add(this.richTextBox1);
this.groupBox6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.groupBox6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox6.Location = new System.Drawing.Point(6, 5); this.groupBox6.Location = new System.Drawing.Point(8, 6);
this.groupBox6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox6.Name = "groupBox6"; this.groupBox6.Name = "groupBox6";
this.groupBox6.Size = new System.Drawing.Size(992, 707); this.groupBox6.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox6.Size = new System.Drawing.Size(1240, 884);
this.groupBox6.TabIndex = 250; this.groupBox6.TabIndex = 250;
this.groupBox6.TabStop = false; this.groupBox6.TabStop = false;
// //
...@@ -117,9 +119,11 @@ ...@@ -117,9 +119,11 @@
this.groupBox2.Controls.Add(this.btnSdStop); this.groupBox2.Controls.Add(this.btnSdStop);
this.groupBox2.Controls.Add(this.label6); this.groupBox2.Controls.Add(this.label6);
this.groupBox2.Controls.Add(this.txtTargetPosition); this.groupBox2.Controls.Add(this.txtTargetPosition);
this.groupBox2.Location = new System.Drawing.Point(9, 192); this.groupBox2.Location = new System.Drawing.Point(11, 240);
this.groupBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox2.Name = "groupBox2"; this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(458, 504); this.groupBox2.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox2.Size = new System.Drawing.Size(572, 630);
this.groupBox2.TabIndex = 283; this.groupBox2.TabIndex = 283;
this.groupBox2.TabStop = false; this.groupBox2.TabStop = false;
this.groupBox2.Text = "位置信息"; this.groupBox2.Text = "位置信息";
...@@ -127,19 +131,21 @@ ...@@ -127,19 +131,21 @@
// txtP4Offset // txtP4Offset
// //
this.txtP4Offset.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtP4Offset.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtP4Offset.Location = new System.Drawing.Point(184, 174); this.txtP4Offset.Location = new System.Drawing.Point(230, 218);
this.txtP4Offset.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtP4Offset.MaxLength = 30; this.txtP4Offset.MaxLength = 30;
this.txtP4Offset.Name = "txtP4Offset"; this.txtP4Offset.Name = "txtP4Offset";
this.txtP4Offset.Size = new System.Drawing.Size(121, 26); this.txtP4Offset.Size = new System.Drawing.Size(150, 31);
this.txtP4Offset.TabIndex = 287; this.txtP4Offset.TabIndex = 287;
this.txtP4Offset.Text = "-6000"; this.txtP4Offset.Text = "-6000";
// //
// label10 // label10
// //
this.label10.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label10.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label10.Location = new System.Drawing.Point(6, 177); this.label10.Location = new System.Drawing.Point(8, 221);
this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label10.Name = "label10"; this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(173, 20); this.label10.Size = new System.Drawing.Size(216, 25);
this.label10.TabIndex = 288; this.label10.TabIndex = 288;
this.label10.Text = "入料缓冲点P4偏移量："; this.label10.Text = "入料缓冲点P4偏移量：";
this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -147,19 +153,21 @@ ...@@ -147,19 +153,21 @@
// txtP3Offset // txtP3Offset
// //
this.txtP3Offset.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtP3Offset.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtP3Offset.Location = new System.Drawing.Point(184, 142); this.txtP3Offset.Location = new System.Drawing.Point(230, 178);
this.txtP3Offset.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtP3Offset.MaxLength = 30; this.txtP3Offset.MaxLength = 30;
this.txtP3Offset.Name = "txtP3Offset"; this.txtP3Offset.Name = "txtP3Offset";
this.txtP3Offset.Size = new System.Drawing.Size(121, 26); this.txtP3Offset.Size = new System.Drawing.Size(150, 31);
this.txtP3Offset.TabIndex = 285; this.txtP3Offset.TabIndex = 285;
this.txtP3Offset.Text = "6000"; this.txtP3Offset.Text = "6000";
// //
// label9 // label9
// //
this.label9.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label9.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label9.Location = new System.Drawing.Point(6, 145); this.label9.Location = new System.Drawing.Point(8, 181);
this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label9.Name = "label9"; this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(173, 20); this.label9.Size = new System.Drawing.Size(216, 25);
this.label9.TabIndex = 286; this.label9.TabIndex = 286;
this.label9.Text = "入料前点P3偏移量："; this.label9.Text = "入料前点P3偏移量：";
this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -167,19 +175,21 @@ ...@@ -167,19 +175,21 @@
// txtP6Offset // txtP6Offset
// //
this.txtP6Offset.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtP6Offset.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtP6Offset.Location = new System.Drawing.Point(184, 110); this.txtP6Offset.Location = new System.Drawing.Point(230, 138);
this.txtP6Offset.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtP6Offset.MaxLength = 30; this.txtP6Offset.MaxLength = 30;
this.txtP6Offset.Name = "txtP6Offset"; this.txtP6Offset.Name = "txtP6Offset";
this.txtP6Offset.Size = new System.Drawing.Size(121, 26); this.txtP6Offset.Size = new System.Drawing.Size(150, 31);
this.txtP6Offset.TabIndex = 283; this.txtP6Offset.TabIndex = 283;
this.txtP6Offset.Text = "6000"; this.txtP6Offset.Text = "6000";
// //
// label5 // label5
// //
this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.Location = new System.Drawing.Point(6, 113); this.label5.Location = new System.Drawing.Point(8, 141);
this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label5.Name = "label5"; this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(173, 20); this.label5.Size = new System.Drawing.Size(216, 25);
this.label5.TabIndex = 284; this.label5.TabIndex = 284;
this.label5.Text = "出料缓冲点P6偏移量："; this.label5.Text = "出料缓冲点P6偏移量：";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -187,19 +197,21 @@ ...@@ -187,19 +197,21 @@
// txtP5Offset // txtP5Offset
// //
this.txtP5Offset.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtP5Offset.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtP5Offset.Location = new System.Drawing.Point(184, 78); this.txtP5Offset.Location = new System.Drawing.Point(230, 98);
this.txtP5Offset.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtP5Offset.MaxLength = 30; this.txtP5Offset.MaxLength = 30;
this.txtP5Offset.Name = "txtP5Offset"; this.txtP5Offset.Name = "txtP5Offset";
this.txtP5Offset.Size = new System.Drawing.Size(121, 26); this.txtP5Offset.Size = new System.Drawing.Size(150, 31);
this.txtP5Offset.TabIndex = 281; this.txtP5Offset.TabIndex = 281;
this.txtP5Offset.Text = "-6000"; this.txtP5Offset.Text = "-6000";
// //
// label4 // label4
// //
this.label4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.Location = new System.Drawing.Point(6, 81); this.label4.Location = new System.Drawing.Point(8, 101);
this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label4.Name = "label4"; this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(173, 20); this.label4.Size = new System.Drawing.Size(216, 25);
this.label4.TabIndex = 282; this.label4.TabIndex = 282;
this.label4.Text = "出料前点P5偏移值："; this.label4.Text = "出料前点P5偏移值：";
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -207,9 +219,10 @@ ...@@ -207,9 +219,10 @@
// btnOpenFolder // btnOpenFolder
// //
this.btnOpenFolder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnOpenFolder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenFolder.Location = new System.Drawing.Point(312, 22); this.btnOpenFolder.Location = new System.Drawing.Point(390, 28);
this.btnOpenFolder.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnOpenFolder.Name = "btnOpenFolder"; this.btnOpenFolder.Name = "btnOpenFolder";
this.btnOpenFolder.Size = new System.Drawing.Size(132, 36); this.btnOpenFolder.Size = new System.Drawing.Size(165, 45);
this.btnOpenFolder.TabIndex = 280; this.btnOpenFolder.TabIndex = 280;
this.btnOpenFolder.Text = "打开文件夹"; this.btnOpenFolder.Text = "打开文件夹";
this.btnOpenFolder.UseVisualStyleBackColor = true; this.btnOpenFolder.UseVisualStyleBackColor = true;
...@@ -218,9 +231,10 @@ ...@@ -218,9 +231,10 @@
// btnGetActualPosition // btnGetActualPosition
// //
this.btnGetActualPosition.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnGetActualPosition.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnGetActualPosition.Location = new System.Drawing.Point(312, 342); this.btnGetActualPosition.Location = new System.Drawing.Point(390, 428);
this.btnGetActualPosition.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnGetActualPosition.Name = "btnGetActualPosition"; this.btnGetActualPosition.Name = "btnGetActualPosition";
this.btnGetActualPosition.Size = new System.Drawing.Size(132, 36); this.btnGetActualPosition.Size = new System.Drawing.Size(165, 45);
this.btnGetActualPosition.TabIndex = 269; this.btnGetActualPosition.TabIndex = 269;
this.btnGetActualPosition.Text = "读取位置"; this.btnGetActualPosition.Text = "读取位置";
this.btnGetActualPosition.UseVisualStyleBackColor = true; this.btnGetActualPosition.UseVisualStyleBackColor = true;
...@@ -229,19 +243,21 @@ ...@@ -229,19 +243,21 @@
// txtSpeed // txtSpeed
// //
this.txtSpeed.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtSpeed.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtSpeed.Location = new System.Drawing.Point(184, 227); this.txtSpeed.Location = new System.Drawing.Point(230, 284);
this.txtSpeed.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtSpeed.MaxLength = 30; this.txtSpeed.MaxLength = 30;
this.txtSpeed.Name = "txtSpeed"; this.txtSpeed.Name = "txtSpeed";
this.txtSpeed.Size = new System.Drawing.Size(121, 26); this.txtSpeed.Size = new System.Drawing.Size(150, 31);
this.txtSpeed.TabIndex = 83; this.txtSpeed.TabIndex = 83;
this.txtSpeed.Text = "20"; this.txtSpeed.Text = "20";
// //
// label8 // label8
// //
this.label8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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, 230); this.label8.Location = new System.Drawing.Point(8, 288);
this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label8.Name = "label8"; this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(173, 20); this.label8.Size = new System.Drawing.Size(216, 25);
this.label8.TabIndex = 84; this.label8.TabIndex = 84;
this.label8.Text = "移动速度："; this.label8.Text = "移动速度：";
this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -249,10 +265,11 @@ ...@@ -249,10 +265,11 @@
// txtFileName // txtFileName
// //
this.txtFileName.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtFileName.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtFileName.Location = new System.Drawing.Point(141, 27); this.txtFileName.Location = new System.Drawing.Point(176, 34);
this.txtFileName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtFileName.MaxLength = 30; this.txtFileName.MaxLength = 30;
this.txtFileName.Name = "txtFileName"; this.txtFileName.Name = "txtFileName";
this.txtFileName.Size = new System.Drawing.Size(164, 26); this.txtFileName.Size = new System.Drawing.Size(204, 31);
this.txtFileName.TabIndex = 278; this.txtFileName.TabIndex = 278;
this.txtFileName.Text = "position.csv"; this.txtFileName.Text = "position.csv";
// //
...@@ -261,17 +278,19 @@ ...@@ -261,17 +278,19 @@
this.ioStatusControl1.IOName = "检测信号"; this.ioStatusControl1.IOName = "检测信号";
this.ioStatusControl1.IOValue = 0; this.ioStatusControl1.IOValue = 0;
this.ioStatusControl1.isCanClick = false; this.ioStatusControl1.isCanClick = false;
this.ioStatusControl1.Location = new System.Drawing.Point(38, 401); this.ioStatusControl1.Location = new System.Drawing.Point(48, 501);
this.ioStatusControl1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.ioStatusControl1.Name = "ioStatusControl1"; this.ioStatusControl1.Name = "ioStatusControl1";
this.ioStatusControl1.Size = new System.Drawing.Size(267, 69); this.ioStatusControl1.Size = new System.Drawing.Size(334, 86);
this.ioStatusControl1.TabIndex = 279; this.ioStatusControl1.TabIndex = 279;
// //
// btnAbsMove // btnAbsMove
// //
this.btnAbsMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnAbsMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAbsMove.Location = new System.Drawing.Point(312, 222); this.btnAbsMove.Location = new System.Drawing.Point(390, 278);
this.btnAbsMove.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnAbsMove.Name = "btnAbsMove"; this.btnAbsMove.Name = "btnAbsMove";
this.btnAbsMove.Size = new System.Drawing.Size(132, 36); this.btnAbsMove.Size = new System.Drawing.Size(165, 45);
this.btnAbsMove.TabIndex = 88; this.btnAbsMove.TabIndex = 88;
this.btnAbsMove.Text = "开始运动"; this.btnAbsMove.Text = "开始运动";
this.btnAbsMove.UseVisualStyleBackColor = true; this.btnAbsMove.UseVisualStyleBackColor = true;
...@@ -280,9 +299,10 @@ ...@@ -280,9 +299,10 @@
// label3 // label3
// //
this.label3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.Location = new System.Drawing.Point(13, 30); this.label3.Location = new System.Drawing.Point(16, 38);
this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label3.Name = "label3"; this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(122, 20); this.label3.Size = new System.Drawing.Size(152, 25);
this.label3.TabIndex = 277; this.label3.TabIndex = 277;
this.label3.Text = "保存文件名称："; this.label3.Text = "保存文件名称：";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -290,9 +310,10 @@ ...@@ -290,9 +310,10 @@
// label7 // label7
// //
this.label7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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, 355); this.label7.Location = new System.Drawing.Point(8, 444);
this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label7.Name = "label7"; this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(173, 20); this.label7.Size = new System.Drawing.Size(216, 25);
this.label7.TabIndex = 271; this.label7.TabIndex = 271;
this.label7.Text = "实际位置："; this.label7.Text = "实际位置：";
this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -300,10 +321,11 @@ ...@@ -300,10 +321,11 @@
// txtPosition // txtPosition
// //
this.txtPosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtPosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtPosition.Location = new System.Drawing.Point(184, 265); this.txtPosition.Location = new System.Drawing.Point(230, 331);
this.txtPosition.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtPosition.MaxLength = 30; this.txtPosition.MaxLength = 30;
this.txtPosition.Name = "txtPosition"; this.txtPosition.Name = "txtPosition";
this.txtPosition.Size = new System.Drawing.Size(121, 26); this.txtPosition.Size = new System.Drawing.Size(150, 31);
this.txtPosition.TabIndex = 89; this.txtPosition.TabIndex = 89;
this.txtPosition.Text = "5000"; this.txtPosition.Text = "5000";
// //
...@@ -311,18 +333,20 @@ ...@@ -311,18 +333,20 @@
// //
this.txtActualPosition.Enabled = false; this.txtActualPosition.Enabled = false;
this.txtActualPosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtActualPosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtActualPosition.Location = new System.Drawing.Point(184, 352); this.txtActualPosition.Location = new System.Drawing.Point(230, 440);
this.txtActualPosition.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtActualPosition.MaxLength = 30; this.txtActualPosition.MaxLength = 30;
this.txtActualPosition.Name = "txtActualPosition"; this.txtActualPosition.Name = "txtActualPosition";
this.txtActualPosition.Size = new System.Drawing.Size(121, 26); this.txtActualPosition.Size = new System.Drawing.Size(150, 31);
this.txtActualPosition.TabIndex = 270; this.txtActualPosition.TabIndex = 270;
// //
// label13 // label13
// //
this.label13.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label13.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label13.Location = new System.Drawing.Point(6, 268); this.label13.Location = new System.Drawing.Point(8, 335);
this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label13.Name = "label13"; this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(173, 20); this.label13.Size = new System.Drawing.Size(216, 25);
this.label13.TabIndex = 90; this.label13.TabIndex = 90;
this.label13.Text = "目标位置："; this.label13.Text = "目标位置：";
this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -330,9 +354,10 @@ ...@@ -330,9 +354,10 @@
// btnSdStop // btnSdStop
// //
this.btnSdStop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSdStop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSdStop.Location = new System.Drawing.Point(312, 260); this.btnSdStop.Location = new System.Drawing.Point(390, 325);
this.btnSdStop.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnSdStop.Name = "btnSdStop"; this.btnSdStop.Name = "btnSdStop";
this.btnSdStop.Size = new System.Drawing.Size(132, 36); this.btnSdStop.Size = new System.Drawing.Size(165, 45);
this.btnSdStop.TabIndex = 257; this.btnSdStop.TabIndex = 257;
this.btnSdStop.Text = "停止"; this.btnSdStop.Text = "停止";
this.btnSdStop.UseVisualStyleBackColor = true; this.btnSdStop.UseVisualStyleBackColor = true;
...@@ -341,9 +366,10 @@ ...@@ -341,9 +366,10 @@
// label6 // label6
// //
this.label6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label6.Location = new System.Drawing.Point(6, 321); this.label6.Location = new System.Drawing.Point(8, 401);
this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label6.Name = "label6"; this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(173, 20); this.label6.Size = new System.Drawing.Size(216, 25);
this.label6.TabIndex = 268; this.label6.TabIndex = 268;
this.label6.Text = "目标位置："; this.label6.Text = "目标位置：";
this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -352,10 +378,11 @@ ...@@ -352,10 +378,11 @@
// //
this.txtTargetPosition.Enabled = false; this.txtTargetPosition.Enabled = false;
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)));
this.txtTargetPosition.Location = new System.Drawing.Point(184, 318); this.txtTargetPosition.Location = new System.Drawing.Point(230, 398);
this.txtTargetPosition.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtTargetPosition.MaxLength = 30; this.txtTargetPosition.MaxLength = 30;
this.txtTargetPosition.Name = "txtTargetPosition"; this.txtTargetPosition.Name = "txtTargetPosition";
this.txtTargetPosition.Size = new System.Drawing.Size(121, 26); this.txtTargetPosition.Size = new System.Drawing.Size(150, 31);
this.txtTargetPosition.TabIndex = 267; this.txtTargetPosition.TabIndex = 267;
// //
// groupBox1 // groupBox1
...@@ -369,9 +396,11 @@ ...@@ -369,9 +396,11 @@
this.groupBox1.Controls.Add(this.btnServoOff); this.groupBox1.Controls.Add(this.btnServoOff);
this.groupBox1.Controls.Add(this.txtIOIndex); this.groupBox1.Controls.Add(this.txtIOIndex);
this.groupBox1.Controls.Add(this.label2); this.groupBox1.Controls.Add(this.label2);
this.groupBox1.Location = new System.Drawing.Point(9, 13); this.groupBox1.Location = new System.Drawing.Point(11, 16);
this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(458, 173); this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox1.Size = new System.Drawing.Size(572, 216);
this.groupBox1.TabIndex = 282; this.groupBox1.TabIndex = 282;
this.groupBox1.TabStop = false; this.groupBox1.TabStop = false;
this.groupBox1.Text = "设备信息"; this.groupBox1.Text = "设备信息";
...@@ -379,9 +408,10 @@ ...@@ -379,9 +408,10 @@
// label12 // label12
// //
this.label12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label12.Location = new System.Drawing.Point(8, 28); this.label12.Location = new System.Drawing.Point(10, 35);
this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label12.Name = "label12"; this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(122, 20); this.label12.Size = new System.Drawing.Size(152, 25);
this.label12.TabIndex = 1; this.label12.TabIndex = 1;
this.label12.Text = "端口号："; this.label12.Text = "端口号：";
this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -389,9 +419,10 @@ ...@@ -389,9 +419,10 @@
// label18 // label18
// //
this.label18.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label18.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label18.Location = new System.Drawing.Point(8, 64); this.label18.Location = new System.Drawing.Point(10, 80);
this.label18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label18.Name = "label18"; this.label18.Name = "label18";
this.label18.Size = new System.Drawing.Size(122, 20); this.label18.Size = new System.Drawing.Size(152, 25);
this.label18.TabIndex = 94; this.label18.TabIndex = 94;
this.label18.Text = "地址："; this.label18.Text = "地址：";
this.label18.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label18.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -400,19 +431,21 @@ ...@@ -400,19 +431,21 @@
// //
this.txtAddr.Enabled = false; this.txtAddr.Enabled = false;
this.txtAddr.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtAddr.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtAddr.Location = new System.Drawing.Point(136, 61); this.txtAddr.Location = new System.Drawing.Point(170, 76);
this.txtAddr.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtAddr.MaxLength = 30; this.txtAddr.MaxLength = 30;
this.txtAddr.Name = "txtAddr"; this.txtAddr.Name = "txtAddr";
this.txtAddr.Size = new System.Drawing.Size(164, 26); this.txtAddr.Size = new System.Drawing.Size(204, 31);
this.txtAddr.TabIndex = 95; this.txtAddr.TabIndex = 95;
this.txtAddr.Text = "1"; this.txtAddr.Text = "1";
// //
// btnHomeMove // btnHomeMove
// //
this.btnHomeMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnHomeMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnHomeMove.Location = new System.Drawing.Point(307, 113); this.btnHomeMove.Location = new System.Drawing.Point(384, 141);
this.btnHomeMove.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnHomeMove.Name = "btnHomeMove"; this.btnHomeMove.Name = "btnHomeMove";
this.btnHomeMove.Size = new System.Drawing.Size(132, 36); this.btnHomeMove.Size = new System.Drawing.Size(165, 45);
this.btnHomeMove.TabIndex = 110; this.btnHomeMove.TabIndex = 110;
this.btnHomeMove.Text = "原点返回"; this.btnHomeMove.Text = "原点返回";
this.btnHomeMove.UseVisualStyleBackColor = true; this.btnHomeMove.UseVisualStyleBackColor = true;
...@@ -421,9 +454,10 @@ ...@@ -421,9 +454,10 @@
// btnServoOn // btnServoOn
// //
this.btnServoOn.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnServoOn.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnServoOn.Location = new System.Drawing.Point(307, 25); this.btnServoOn.Location = new System.Drawing.Point(384, 31);
this.btnServoOn.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnServoOn.Name = "btnServoOn"; this.btnServoOn.Name = "btnServoOn";
this.btnServoOn.Size = new System.Drawing.Size(132, 36); this.btnServoOn.Size = new System.Drawing.Size(165, 45);
this.btnServoOn.TabIndex = 258; this.btnServoOn.TabIndex = 258;
this.btnServoOn.Text = "打开伺服"; this.btnServoOn.Text = "打开伺服";
this.btnServoOn.UseVisualStyleBackColor = true; this.btnServoOn.UseVisualStyleBackColor = true;
...@@ -433,19 +467,21 @@ ...@@ -433,19 +467,21 @@
// //
this.txtPortName.Enabled = false; this.txtPortName.Enabled = false;
this.txtPortName.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtPortName.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtPortName.Location = new System.Drawing.Point(136, 25); this.txtPortName.Location = new System.Drawing.Point(170, 31);
this.txtPortName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtPortName.MaxLength = 30; this.txtPortName.MaxLength = 30;
this.txtPortName.Name = "txtPortName"; this.txtPortName.Name = "txtPortName";
this.txtPortName.Size = new System.Drawing.Size(164, 26); this.txtPortName.Size = new System.Drawing.Size(204, 31);
this.txtPortName.TabIndex = 276; this.txtPortName.TabIndex = 276;
this.txtPortName.Text = "COM1"; this.txtPortName.Text = "COM1";
// //
// btnServoOff // btnServoOff
// //
this.btnServoOff.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnServoOff.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnServoOff.Location = new System.Drawing.Point(307, 64); this.btnServoOff.Location = new System.Drawing.Point(384, 80);
this.btnServoOff.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnServoOff.Name = "btnServoOff"; this.btnServoOff.Name = "btnServoOff";
this.btnServoOff.Size = new System.Drawing.Size(132, 36); this.btnServoOff.Size = new System.Drawing.Size(165, 45);
this.btnServoOff.TabIndex = 259; this.btnServoOff.TabIndex = 259;
this.btnServoOff.Text = "关闭伺服"; this.btnServoOff.Text = "关闭伺服";
this.btnServoOff.UseVisualStyleBackColor = true; this.btnServoOff.UseVisualStyleBackColor = true;
...@@ -455,19 +491,21 @@ ...@@ -455,19 +491,21 @@
// //
this.txtIOIndex.Enabled = false; this.txtIOIndex.Enabled = false;
this.txtIOIndex.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtIOIndex.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtIOIndex.Location = new System.Drawing.Point(136, 93); this.txtIOIndex.Location = new System.Drawing.Point(170, 116);
this.txtIOIndex.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtIOIndex.MaxLength = 30; this.txtIOIndex.MaxLength = 30;
this.txtIOIndex.Name = "txtIOIndex"; this.txtIOIndex.Name = "txtIOIndex";
this.txtIOIndex.Size = new System.Drawing.Size(164, 26); this.txtIOIndex.Size = new System.Drawing.Size(204, 31);
this.txtIOIndex.TabIndex = 275; this.txtIOIndex.TabIndex = 275;
this.txtIOIndex.Text = "1"; this.txtIOIndex.Text = "1";
// //
// label2 // label2
// //
this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.Location = new System.Drawing.Point(8, 96); this.label2.Location = new System.Drawing.Point(10, 120);
this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(122, 20); this.label2.Size = new System.Drawing.Size(152, 25);
this.label2.TabIndex = 274; this.label2.TabIndex = 274;
this.label2.Text = "检测信号地址："; this.label2.Text = "检测信号地址：";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -475,9 +513,10 @@ ...@@ -475,9 +513,10 @@
// btnExit // btnExit
// //
this.btnExit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.btnExit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnExit.Location = new System.Drawing.Point(822, 665); this.btnExit.Location = new System.Drawing.Point(1028, 831);
this.btnExit.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnExit.Name = "btnExit"; this.btnExit.Name = "btnExit";
this.btnExit.Size = new System.Drawing.Size(132, 36); this.btnExit.Size = new System.Drawing.Size(165, 45);
this.btnExit.TabIndex = 281; this.btnExit.TabIndex = 281;
this.btnExit.Text = "退出"; this.btnExit.Text = "退出";
this.btnExit.UseVisualStyleBackColor = true; this.btnExit.UseVisualStyleBackColor = true;
...@@ -486,9 +525,10 @@ ...@@ -486,9 +525,10 @@
// btnClear // btnClear
// //
this.btnClear.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.btnClear.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnClear.Location = new System.Drawing.Point(675, 665); this.btnClear.Location = new System.Drawing.Point(844, 831);
this.btnClear.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnClear.Name = "btnClear"; this.btnClear.Name = "btnClear";
this.btnClear.Size = new System.Drawing.Size(132, 36); this.btnClear.Size = new System.Drawing.Size(165, 45);
this.btnClear.TabIndex = 106; this.btnClear.TabIndex = 106;
this.btnClear.Text = "清理"; this.btnClear.Text = "清理";
this.btnClear.UseVisualStyleBackColor = true; this.btnClear.UseVisualStyleBackColor = true;
...@@ -500,24 +540,26 @@ ...@@ -500,24 +540,26 @@
| System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.richTextBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.richTextBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.richTextBox1.Location = new System.Drawing.Point(473, 20); this.richTextBox1.Location = new System.Drawing.Point(591, 25);
this.richTextBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.richTextBox1.Name = "richTextBox1"; this.richTextBox1.Name = "richTextBox1";
this.richTextBox1.Size = new System.Drawing.Size(510, 642); this.richTextBox1.Size = new System.Drawing.Size(636, 802);
this.richTextBox1.TabIndex = 105; this.richTextBox1.TabIndex = 105;
this.richTextBox1.Text = ""; this.richTextBox1.Text = "";
// //
// timer1 // timer1
// //
this.timer1.Interval = 1000; this.timer1.Interval = 100;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick); this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
// //
// FrmPositionTool // FrmPositionTool
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleDimensions = new System.Drawing.SizeF(120F, 120F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.ClientSize = new System.Drawing.Size(1004, 719); this.ClientSize = new System.Drawing.Size(1255, 899);
this.Controls.Add(this.groupBox6); this.Controls.Add(this.groupBox6);
this.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.Name = "FrmPositionTool"; this.Name = "FrmPositionTool";
this.Text = "升降轴位置测试"; this.Text = "升降轴位置测试";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized; this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
......
source/ACSingleStore/positionTool/FrmPositionTool.cs
...@@ -150,12 +150,18 @@ namespace OnlineStore.ACSingleStore ...@@ -150,12 +150,18 @@ namespace OnlineStore.ACSingleStore
{ {
int position = Convert.ToInt32(txtPosition.Text); int position = Convert.ToInt32(txtPosition.Text);
int speed = Convert.ToInt32(txtSpeed.Text); int speed = Convert.ToInt32(txtSpeed.Text);
ACServerManager.RelMove(PortName, SlvAddr, position, speed, speed*4, speed * 4); var moveAxis = getAxis(SlvAddr);
var addSpeed = moveAxis.AddSpeed > 0 ? moveAxis.AddSpeed : speed * 4;
var delSpeed = moveAxis.DelSpeed > 0 ? moveAxis.DelSpeed : speed * 4;
ACServerManager.RelMove(PortName, SlvAddr, position, speed, addSpeed, delSpeed);
} }
private void btnHomeMove_Click(object sender, EventArgs e) private void btnHomeMove_Click(object sender, EventArgs e)
{ {
int speed = Convert.ToInt32(txtSpeed.Text); int speed = Convert.ToInt32(txtSpeed.Text);
ACServerManager.HomeMove(PortName, SlvAddr, ptpAcc, ptpDec,homespeed); var moveAxis = getAxis(SlvAddr);
var HomeAddSpeed = moveAxis.HomeAddSpeed > 0 ? moveAxis.HomeAddSpeed : moveAxis.HomeHighSpeed * 6;
var HomeLowSpeed = moveAxis.HomeLowSpeed > 0 ? moveAxis.HomeLowSpeed : moveAxis.HomeHighSpeed / 10;
ACServerManager.HomeMove(PortName, SlvAddr, moveAxis.HomeHighSpeed, HomeAddSpeed, HomeLowSpeed);
} }
private void btnSpeedMove_Click(object sender, EventArgs e) private void btnSpeedMove_Click(object sender, EventArgs e)
{ {
...@@ -213,7 +219,10 @@ namespace OnlineStore.ACSingleStore ...@@ -213,7 +219,10 @@ namespace OnlineStore.ACSingleStore
PositionList = new List<int>(); PositionList = new List<int>();
LogUtil.info(LogName + "伺服开始运动，速度【" + speed + "】位置【" + position + "】启动定时器 "); LogUtil.info(LogName + "伺服开始运动，速度【" + speed + "】位置【" + position + "】启动定时器 ");
formMoveStatus(false); formMoveStatus(false);
ACServerManager.AbsMove(PortName, SlvAddr, position, speed, speed * 4, speed * 4); var moveAxis = getAxis(SlvAddr);
var addSpeed = moveAxis.AddSpeed > 0 ? moveAxis.AddSpeed : speed * 4;
var delSpeed = moveAxis.DelSpeed > 0 ? moveAxis.DelSpeed : speed * 4;
ACServerManager.AbsMove(PortName, SlvAddr, position, speed, addSpeed, delSpeed);
toolTimer.Start(); toolTimer.Start();
} }
private int P3Offset = 0; private int P3Offset = 0;
...@@ -235,6 +244,7 @@ namespace OnlineStore.ACSingleStore ...@@ -235,6 +244,7 @@ namespace OnlineStore.ACSingleStore
{ {
toolTimer.Stop(); toolTimer.Stop();
ACServerManager.SuddenStop(PortName, SlvAddr); ACServerManager.SuddenStop(PortName, SlvAddr);
formMoveStatus(true);
} }
private IO_VALUE GetSingleValue() private IO_VALUE GetSingleValue()
...@@ -370,6 +380,19 @@ namespace OnlineStore.ACSingleStore ...@@ -370,6 +380,19 @@ namespace OnlineStore.ACSingleStore
{ {
this.Close(); this.Close();
} }
ConfigMoveAxis getAxis(short SlvAddr)
{
foreach (ConfigMoveAxis a in StoreManager.Store.moveAxisList)
{
if (a.IsSameAxis(PortName, SlvAddr))
{
return a;
}
}
return null;
}
} }
} }
source/ACSingleStore/resource/language.resource → source/ACSingleStore/resources/language.resource
...@@ -23,11 +23,11 @@ FrmStoreBox_btnClearL_Text,清理日志,Clean log,ブログの消去 ...@@ -23,11 +23,11 @@ FrmStoreBox_btnClearL_Text,清理日志,Clean log,ブログの消去
FrmStoreBox_btnLogDebug_Text,开启DEBUG,Open Debug,DEBUGをオンにする FrmStoreBox_btnLogDebug_Text,开启DEBUG,Open Debug,DEBUGをオンにする
FrmStoreBox_tabControl1_Text,FrmStoreBox_tabControl1_Text,FrmStoreBox_tabControl1_Text,FrmStoreBox_tabControl1_Text FrmStoreBox_tabControl1_Text,FrmStoreBox_tabControl1_Text,FrmStoreBox_tabControl1_Text,FrmStoreBox_tabControl1_Text
FrmStoreBox_tabPage3_Text,操作日志,Operation Log,操作ブログ FrmStoreBox_tabPage3_Text,操作日志,Operation Log,操作ブログ
FrmStoreBox_btnCloseLed_Text,关闭相机照明,Close Camera light,カメラの照明をオフにする FrmStoreBox_btnCloseLed_Text,关闭相机照明,Close Camera light,カメラ照明消灯
FrmStoreBox_btnClearLog_Text,清理日志,Clean log,ブログの消去 FrmStoreBox_btnClearLog_Text,清理日志,Clean log,ブログの消去
FrmStoreBox_btnOpenLed_Text,打开相机照明,Open Camera light,カメラの照明をオンにする FrmStoreBox_btnOpenLed_Text,打开相机照明,Open Camera light,カメラ照明点灯
FrmStoreBox_btnCloseDoor_Text,关闭仓门,Close door,boxの扉を閉める FrmStoreBox_btnCloseDoor_Text,关闭仓门,Close door,入出庫口扉閉
FrmStoreBox_btnOpenDoor_Text,打开仓门,Open door,boxの扉を開ける FrmStoreBox_btnOpenDoor_Text,打开仓门,Open door,入出庫口扉開
FrmStoreBox_tabPage1_Text,伺服调试,Servo debug,サーボのデバック FrmStoreBox_tabPage1_Text,伺服调试,Servo debug,サーボのデバック
FrmStoreBox_axisMoveControl1_Text,FrmStoreBox_axisMoveControl1_Text,FrmStoreBox_axisMoveControl1_Text,FrmStoreBox_axisMoveControl1_Text FrmStoreBox_axisMoveControl1_Text,FrmStoreBox_axisMoveControl1_Text,FrmStoreBox_axisMoveControl1_Text,FrmStoreBox_axisMoveControl1_Text
FrmStoreBox_groupBox1_Text,伺服状态,Servo state,サーボ状態 FrmStoreBox_groupBox1_Text,伺服状态,Servo state,サーボ状態
...@@ -123,27 +123,28 @@ FrmPwd_label1_Text,请输入密码:,Enter PSW:,パスワードを入力してく ...@@ -123,27 +123,28 @@ FrmPwd_label1_Text,请输入密码:,Enter PSW:,パスワードを入力してく
FrmStoreBox_groupBoxHighState_Text,高度传感器,Height Single:,高精度センサー FrmStoreBox_groupBoxHighState_Text,高度传感器,Height Single:,高精度センサー
FrmStoreBox_labelReelWidth_Text,料盘尺寸:,Size:,トレイのサイズ。 FrmStoreBox_labelReelWidth_Text,料盘尺寸:,Size:,トレイのサイズ。
FrmStoreBox_labelReelHeight_Text,料盘高度:,Hieght:,トレイの高さ。 FrmStoreBox_labelReelHeight_Text,料盘高度:,Hieght:,トレイの高さ。
FrmStoreBox_groupBoxDowrite_Text,DO写入,DO write,DO写す FrmStoreBox_groupBoxDowrite_Text,DO写入,DO write,出力確認
FrmStoreBox_labeladdr_Text,地址:,Servo address:,アドレス FrmStoreBox_labeladdr_Text,地址:,Servo address:,アドレス
FrmStoreBox_labeltimer_Text,定时(ms):,Time(ms):,タイマー設定 FrmStoreBox_labeltimer_Text,定时(ms):,Time(ms):,タイマー設定
FrmStoreBox_groupBoxDolist_Text,DO列表,DO list,DOリスト FrmStoreBox_groupBoxDolist_Text,DO列表,DO list,DOリスト
FrmStoreBox_groupBoxDilist_Text,DI列表,DI list,DIリスト FrmStoreBox_groupBoxDilist_Text,DI列表,DI list,DIリスト
FrmStoreBox_chbTH_Text,启用气压报警,enable air alert,エアーダウン警告
FrmAxisDebug_Text,料仓BOX_1 _轴点动调试,SMD BOX_1 _axis inching adjusting,BOX_1 _アクシスのポインティングのバッファ FrmAxisDebug_Text,料仓BOX_1 _轴点动调试,SMD BOX_1 _axis inching adjusting,BOX_1 _アクシスのポインティングのバッファ
FrmAxisDebug_btnCCopy_Text,复制,Copy,コピー FrmAxisDebug_btnCCopy_Text,复制,Copy,コピー
FrmAxisDebug_btnICopy_Text,复制,Copy,コピー FrmAxisDebug_btnICopy_Text,复制,Copy,コピー
FrmAxisDebug_btnUCopy_Text,复制,Copy,コピー FrmAxisDebug_btnUCopy_Text,复制,Copy,コピー
FrmAxisDebug_btnMCopy_Text,复制,Copy,コピー FrmAxisDebug_btnMCopy_Text,复制,Copy,コピー
FrmAxisDebug_lblSpeed_Text,点动速度=0.2倍目标速度,Speed=0.2xTarget Speed,タップスピード＝ターゲットスピードの0.2倍 FrmAxisDebug_lblSpeed_Text,点动速度=0.2倍目标速度,Speed=0.2xTarget Speed,タップスピード＝ターゲットスピードの0.2倍
FrmAxisDebug_btnComMovej_Text,压紧轴-(向上),Pressure axis-(up),圧着軸 - （上 FrmAxisDebug_btnComMovej_Text,压紧轴-(向上),Pressure axis-(up),クランプ軸＋(上)
FrmAxisDebug_btnComMove_Text,压紧轴+(向下),Pressure axis+(down),圧着軸 （下） FrmAxisDebug_btnComMove_Text,压紧轴+(向下),Pressure axis+(down),クランプ軸＋(下)
FrmAxisDebug_label4_Text,（轴四）压紧轴,(Axis 4)pressure axis,(IV軸) 圧着軸 FrmAxisDebug_label4_Text,（轴四）压紧轴,(Axis 4)pressure axis,(IV軸) 圧着軸
FrmAxisDebug_label6_Text,实时坐标,Real time coordinate,リアルタイム座標 FrmAxisDebug_label6_Text,实时坐标,Real time coordinate,リアルタイム座標
FrmAxisDebug_label5_Text,点动速度,Inching speed,タップスピード FrmAxisDebug_label5_Text,点动速度,Inching speed,タップスピード
FrmAxisDebug_button1_Text,关闭,Close,閉じる FrmAxisDebug_button1_Text,关闭,Close,閉じる
FrmAxisDebug_btnInOutMovej_Text,进出轴-(后退),In-out axis-backward, 出入り- （バック) FrmAxisDebug_btnInOutMovej_Text,进出轴-(后退),In-out axis-backward, 出入り軸-(後退)
FrmAxisDebug_btnUpDownMovej_Text,升降轴-(下降),l-axis-descent,昇降軸 - (降下) FrmAxisDebug_btnUpDownMovej_Text,升降轴-(下降),l-axis-descent,昇降軸-(下降)
FrmAxisDebug_btnMiddleMovej_Text,旋转轴-(逆时针),Rotation axis- anti-clockwise,回転軸-(反時計回り) FrmAxisDebug_btnMiddleMovej_Text,旋转轴-(逆时针),Rotation axis- anti-clockwise,回転軸-(反時計回り)
FrmAxisDebug_btnInOutMove_Text,进出轴+(前进),In-out axis+forward,出入力軸＋（前進) FrmAxisDebug_btnInOutMove_Text,进出轴+(前进),In-out axis+forward,出入り軸＋(前進)
FrmAxisDebug_btnUpDownMove_Text,升降轴+(上升),l-axis+ascent,昇降軸＋（上昇) FrmAxisDebug_btnUpDownMove_Text,升降轴+(上升),l-axis+ascent,昇降軸＋（上昇)
FrmAxisDebug_btnMiddleMove_Text,旋转轴+(顺时针),Rotation axis+clockwise,回転軸＋（時計回り) FrmAxisDebug_btnMiddleMove_Text,旋转轴+(顺时针),Rotation axis+clockwise,回転軸＋（時計回り)
FrmAxisDebug_label3_Text,（轴三）进出轴,(Axis 3) in-out axis,(III軸) 出入り軸 FrmAxisDebug_label3_Text,（轴三）进出轴,(Axis 3) in-out axis,(III軸) 出入り軸
...@@ -190,13 +191,13 @@ FrmAbout_lblTime_Text,更新时间:2020-02-07 21:16,UpdateTime:2020-02-07 21:16, ...@@ -190,13 +191,13 @@ FrmAbout_lblTime_Text,更新时间:2020-02-07 21:16,UpdateTime:2020-02-07 21:16,
FrmAbout_lblVersion_Text,版本号:1.0.7342.38298,Version:1.0.7342.38298,バージョン番号：1.0.7342.38298 FrmAbout_lblVersion_Text,版本号:1.0.7342.38298,Version:1.0.7342.38298,バージョン番号：1.0.7342.38298
FrmAbout_btnNext_Text,确定,Confirm,確定 FrmAbout_btnNext_Text,确定,Confirm,確定
FrmStoreBox_tabPage8_Text, 库位调试 , Storage location , ロケーションデバッグ FrmStoreBox_tabPage8_Text, 库位调试 , Storage location , ロケーションデバッグ
FrmStoreBox_btn_setlow_Text,关,Switch to Low,オフ FrmStoreBox_btn_setlow_Text,关,Switch to Low,OFF
FrmStoreBox_btn_SetHigh_Text,开,Switch to High,開く FrmStoreBox_btn_SetHigh_Text,开,Switch to High,ON
FrmStoreBox_checkBox_Double_Alternate_Text,双盘测试,Double Alternate,ダブルリールテスト FrmStoreBox_checkBox_Double_Alternate_Text,双盘测试,Double Alternate,ダブルリールテスト
Middle_Axis,（轴一）旋转轴,(Axis 1) rotation axis,(I軸) 回転軸 Middle_Axis,（轴一）旋转轴,(Axis 1) rotation axis,(I軸) 回転軸
UpDown_Axis,（轴二）升降轴轴,(Axis 2) lifting axis,(I軸) 昇降軸 UpDown_Axis,（轴二）升降轴轴,(Axis 2) lifting axis,(I軸) 昇降軸
InOut_Axis,（轴三）进出轴,(Axis 3) in-out axis,(III軸) 出入り軸 InOut_Axis,（轴三）进出轴,(Axis 3) in-out axis,(III軸) 出入り軸
Comp_Axis,（轴四）压紧轴,(Axis 4)pressure axis,(IV軸)圧着軸 Comp_Axis,（轴四）压紧轴,(Axis 4)pressure axis,(IV軸)クランプ軸
启用调试,启用调试,Enable debugging,デバック起動 启用调试,启用调试,Enable debugging,デバック起動
等待启动,等待启动,Wait to start,スタートアップを待つ 等待启动,等待启动,Wait to start,スタートアップを待つ
前门未关,前门未关,Front door open,フロントドアが閉まらない 前门未关,前门未关,Front door open,フロントドアが閉まらない
...@@ -276,66 +277,66 @@ TimeOut,超时,Time out,タイムオーバー ...@@ -276,66 +277,66 @@ TimeOut,超时,Time out,タイムオーバー
Run,运行中,Runing,作業中 Run,运行中,Runing,作業中
Runing,运行中,Runing,作業中 Runing,运行中,Runing,作業中
OutStorEnd,出库完成,OutStorEnd,出庫完成 OutStorEnd,出库完成,OutStorEnd,出庫完成
FrmStoreBox_btnCloseDLed_Text,关闭设备照明,Turn off lighting,設備照明を閉める FrmStoreBox_btnCloseDLed_Text,关闭设备照明,Turn off lighting,カメラ照明消灯
FrmStoreBox_btnOpenDLed_Text,打开设备照明,Turn on lighting,設備照明を開ける FrmStoreBox_btnOpenDLed_Text,打开设备照明,Turn on lighting,カメラ照明点灯
FrmStoreBox_btnOpenAutoInOut_Text,开启自动出入库, start auto storage and retrieval,入庫と出庫の機能を自動的にオンにします FrmStoreBox_btnOpenAutoInOut_Text,开启自动出入库, start auto storage and retrieval,入庫と出庫の機能を自動的にオンにします
FrmStoreBox_btnHul_Text,忽略夹爪检测信号,Ignore the gripper detection signal,グリッパー検出信号を無視する FrmStoreBox_btnHul_Text,忽略夹爪检测信号,Ignore the gripper detection signal,グリッパー検出信号を無視する
FrmStoreBox_lblTempStr_Text,FrmStoreBox_lblTempStr_Text,FrmStoreBox_lblTempStr_Text, FrmStoreBox_lblTempStr_Text,FrmStoreBox_lblTempStr_Text,FrmStoreBox_lblTempStr_Text,
FrmStoreBox_btnCDLed_Text,关闭设备照明,Turn off equipment lighting,設備照明を閉める FrmStoreBox_btnCDLed_Text,关闭设备照明,Turn off equipment lighting,カメラ照明消灯
FrmStoreBox_btnDevideLed_Text,打开设备照明,Turn on equipment lighting,設備照明を開ける FrmStoreBox_btnDevideLed_Text,打开设备照明,Turn on equipment lighting,カメラ照明点灯
FrmStoreBox_chbOpenLog_Text,显示日志,Open Log,ブログを表示する FrmStoreBox_chbOpenLog_Text,显示日志,Open Log,ブログを表示する
FrmStoreBox_tabPage7_Text, 设备状态 , Machine state ,設備状態 FrmStoreBox_tabPage7_Text, 设备状态 , Machine state ,設備状態
,,, ,,,
,,, ,,,
X00,急停,Emergency stop,緊急停止 X00,急停,Emergency stop,緊急停止
X01,复位,Reset,リセット X01,复位,Reset,リセット
X02,启动,Auto,自動 X02,启动,Auto,スタート
X03,氮气气压检测,Pressure detection,空気圧検査 X03,氮气气压检测,Pressure detection,エアダウン検出
X04,料盘检测1（进料口）,Tray check 1,リール検査1（原料入り入口 X04,料盘检测1（进料口）,Tray check 1,リール検出１（テーブル）
X05,料盘检测2（料叉）,Tray check 2,リール検査2（フォーク X05,料盘检测2（料叉）,Tray check 2,リール検出２（フォーク）
X06,进料口门上升端,Portal ascent position,原料入り入口上昇端 X06,进料口门上升端,Portal ascent position,入出庫口扉上限検出
X07,进料口门下降端,Portal descent position,原料入り入口降下端 X07,进料口门下降端,Portal descent position,入出庫口扉下限検出
X08,安全光栅,Security grating,セーフティーグレーチング X08,安全光栅,Security grating,入出庫口光カーテン検出
X09,前门限位,front door limit,フロントドアの制限位置 X09,前门限位,front door limit,前カバー安全検出
X10,左侧门限位,Left side threshold,左側ドアの限定位置 X10,左侧门限位,Left side threshold,左前カバー安全検出
X11,右侧门限位,Right hand threshold,右側ドアの限定位置 X11,右侧门限位,Right hand threshold,右前カバー安全検出
X12,激光对点检测,Laser point detection,レーザ当て検査 X12,激光对点检测,Laser point detection,レーザー位置センサー
X13,进料口电机异常,Portal motor abnormal,原料入れ口電機異常 X13,进料口电机异常,Portal motor abnormal,入出庫口扉駆動モータ異常検出
Y00,自动指示灯,Auto indicator light,自動指示ライト Y00,自动指示灯,Auto indicator light,パトライト（緑）
Y01,故障指示灯,Error indicator light,故障指示ライト Y01,故障指示灯,Error indicator light,パトライト（赤）
Y02,待机指示灯,Indicator light,待機指示ライト Y02,待机指示灯,Indicator light,パトライト（黄）
Y03,故障蜂鸣器,Fault buzzer,故障ブザー Y03,故障蜂鸣器,Fault buzzer,ブザー
Y04,设备照明开启,System light ON,設備照明開け Y04,设备照明开启,System light ON,設備内照明点灯
Y05,相机光源开启,Camera light ON,カメラ照明ON Y05,相机光源开启,Camera light ON,カメラ照明点灯
Y06,氮气阀门开启,Nitrogen valve open,アンモ二アバルブ開け Y06,氮气阀门开启,Nitrogen valve open,イオナイザ
Y07,进料口门运转,Portal door operation,原料入れ口ドア運転 Y07,进料口门运转,Portal door operation,入出庫扉開
Y08,进料口门反转关门,Portal door reverse close,原料入れ口ドア逆転閉め Y08,进料口门反转关门,Portal door reverse close,入出庫扉閉
Y11,设备照明开,Equipment lighting on,設備照明を開ける Y11,设备照明开,Equipment lighting on,設備照明を開ける
,,, ,,,
FrmStoreBox_groupBox2_Text,轴状态监控,Axis status monitor,軸状態監視 FrmStoreBox_groupBox2_Text,轴状态监控,Axis status monitor,軸状態
FrmStoreBox_lblAlarmcode_Text,错误码:,Wrong code:,エラーコード FrmStoreBox_lblAlarmcode_Text,错误码:,Wrong code:,アラーム
FrmStoreBox_lblINP_Text,到位,Ready,準備 FrmStoreBox_lblINP_Text,到位,Ready,ready
FrmStoreBox_lblBUSY_Text,忙碌,Busy,忙しい FrmStoreBox_lblBUSY_Text,忙碌,Busy,busy
FrmStoreBox_lblNEL_Text,负极限,Negative limit, 負極限 FrmStoreBox_lblNEL_Text,负极限,Negative limit, -LM
FrmStoreBox_lblORG_Text,原点,Origin,原点 FrmStoreBox_lblORG_Text,原点,Origin,原点
FrmStoreBox_lblPEL_Text,正极限,Positive limit,正極限 FrmStoreBox_lblPEL_Text,正极限,Positive limit,+LM
FrmStoreBox_lblSvOn_Text,伺服,Servo,サーボ FrmStoreBox_lblSvOn_Text,伺服,Servo,サーボ
FrmStoreBox_lblEMG_Text,急停,Emergency stop,急停 FrmStoreBox_lblEMG_Text,急停,Emergency stop,急停止
FrmStoreBox_lblWARN_Text,警告,Warning,警告 FrmStoreBox_lblWARN_Text,警告,Warning,警告
FrmStoreBox_lblALM_Text,报警,Alarm,通報+ FrmStoreBox_lblALM_Text,报警,Alarm,エラー
FrmStoreBox_label53_Text,规划速度:,Planning speed:,計画速度 FrmStoreBox_label53_Text,规划速度:,Planning speed:,計画速度
FrmStoreBox_label56_Text,实际速度:,Actual speed:,実際速度 FrmStoreBox_label56_Text,实际速度:,Actual speed:,実際速度
FrmStoreBox_label55_Text,实际位置:,Actual location:,実際位置 FrmStoreBox_label55_Text,实际位置:,Actual location:,実際位置
FrmStoreBox_label52_Text,规划位置:,Planning location:,計画位置 FrmStoreBox_label52_Text,规划位置:,Planning location:,計画位置
FrmStoreBox_label50_Text,规划模式:,Planning mode:,計画モード FrmStoreBox_label50_Text,规划模式:,Planning mode:,計画モード
FrmStoreBox_linkLabel1_Text,复制,Copy,コピー FrmStoreBox_linkLabel1_Text,复制,Copy,コピー
FrmStoreBox_btnDelMove_Text,点动- ,Jogging-,クリック‐ FrmStoreBox_btnDelMove_Text,点动- ,Jogging-,正転
FrmStoreBox_btnAddMove_Text,点动+ ,Jogging+,クリック FrmStoreBox_btnAddMove_Text,点动+ ,Jogging+,逆転
AxisTipControl_btn_cancel_Text,取消,Back,戻る AxisTipControl_btn_cancel_Text,取消,Back,戻る
AxisTipControl_btn_ok_Text,确定,Confirm,OK AxisTipControl_btn_ok_Text,确定,Confirm,OK
AxisTipControl_btnDelMove_Text,点动- ,Jogging-,クリック‐ AxisTipControl_btnDelMove_Text,点动- ,Jogging-,逆転
AxisTipControl_btnAddMove_Text,点动+ ,Jogging+,クリック AxisTipControl_btnAddMove_Text,点动+ ,Jogging+,正転
AxisTipControl_label_position_Text,当前位置：,Actual position:,リアルタイムの位置。 AxisTipControl_label_position_Text,当前位置：,Actual position:,リアルタイムの位置。
AxisTipControl_label_speed_Text,点动速度：,Inching speed,タップスピード AxisTipControl_label_speed_Text,点动速度：,Inching speed,タップスピード
\ No newline at end of file \ No newline at end of file
source/ACSingleStore/useControl/AxisMoveControl.cs
...@@ -111,7 +111,10 @@ namespace OnlineStore.DUOStore ...@@ -111,7 +111,10 @@ namespace OnlineStore.DUOStore
int position = FormUtil.GetIntValue(txtAPosition); int position = FormUtil.GetIntValue(txtAPosition);
int speed = FormUtil.GetIntValue(txtASpeed); int speed = FormUtil.GetIntValue(txtASpeed);
LogUtil.info(boxBean.Name+"点击【绝对运动】，【" + PortName + "_" + SlvAddr + "】位置【" + position + "】速度【" + speed + "】"); LogUtil.info(boxBean.Name+"点击【绝对运动】，【" + PortName + "_" + SlvAddr + "】位置【" + position + "】速度【" + speed + "】");
AxisManager.AbsMove(PortName, SlvAddr, position, speed, speed*4, speed * 4); var moveAxis = getAxis(SlvAddr);
var addSpeed = moveAxis.AddSpeed > 0 ? moveAxis.AddSpeed : speed * 4;
var delSpeed = moveAxis.DelSpeed > 0 ? moveAxis.DelSpeed : speed * 4;
AxisManager.AbsMove(PortName, SlvAddr, position, speed, addSpeed, delSpeed);
} }
private void btnAxisRMove_Click(object sender, EventArgs e) private void btnAxisRMove_Click(object sender, EventArgs e)
...@@ -123,7 +126,10 @@ namespace OnlineStore.DUOStore ...@@ -123,7 +126,10 @@ namespace OnlineStore.DUOStore
int position = FormUtil.GetIntValue(txtAPosition); int position = FormUtil.GetIntValue(txtAPosition);
int speed = FormUtil.GetIntValue(txtASpeed); int speed = FormUtil.GetIntValue(txtASpeed);
LogUtil.info(boxBean.Name+"点击【相对运动】，【" + PortName + "_" + SlvAddr + "】位置【" + position + "】速度【" + speed + "】"); LogUtil.info(boxBean.Name+"点击【相对运动】，【" + PortName + "_" + SlvAddr + "】位置【" + position + "】速度【" + speed + "】");
AxisManager.RelMove(PortName, SlvAddr, position, speed, speed*4, speed*4); var moveAxis = getAxis(SlvAddr);
var addSpeed = moveAxis.AddSpeed > 0 ? moveAxis.AddSpeed : speed * 4;
var delSpeed = moveAxis.DelSpeed > 0 ? moveAxis.DelSpeed : speed * 4;
AxisManager.RelMove(PortName, SlvAddr, position, speed, addSpeed, delSpeed);
} }
private void btnAxisVMove_Click(object sender, EventArgs e) private void btnAxisVMove_Click(object sender, EventArgs e)
...@@ -173,8 +179,10 @@ namespace OnlineStore.DUOStore ...@@ -173,8 +179,10 @@ namespace OnlineStore.DUOStore
if (a.IsSameAxis(PortName, SlvAddr)) if (a.IsSameAxis(PortName, SlvAddr))
{ {
LogUtil.info(boxBean.Name+"点击【原点返回】，【" + PortName + "_" + SlvAddr + "】 速度【" + a.HomeHighSpeed + "】"); LogUtil.info(boxBean.Name+"点击【原点返回】，【" + PortName + "_" + SlvAddr + "】 速度【" + a.HomeHighSpeed + "】");
var moveAxis = a;
AxisManager.HomeMove(PortName, SlvAddr, a.HomeHighSpeed,a.HomeLowSpeed,a.HomeAddSpeed); var HomeAddSpeed = moveAxis.HomeAddSpeed > 0 ? moveAxis.HomeAddSpeed : moveAxis.HomeHighSpeed * 6;
var HomeLowSpeed = moveAxis.HomeLowSpeed > 0 ? moveAxis.HomeLowSpeed : moveAxis.HomeHighSpeed / 10;
AxisManager.HomeMove(PortName, SlvAddr, a.HomeHighSpeed,HomeLowSpeed,HomeAddSpeed);
} }
} }
} }
...@@ -333,7 +341,7 @@ namespace OnlineStore.DUOStore ...@@ -333,7 +341,7 @@ namespace OnlineStore.DUOStore
} }
private void ReadAxisStatus() private void ReadAxisStatus()
{ {
groupBox2.Text = cmbAxis.Text + "-状态监控"; groupBox2.Text = cmbAxis.Text;
//【1】更新轴号 //【1】更新轴号
short axisNo = SlvAddr; short axisNo = SlvAddr;
if (axisNo < 0) if (axisNo < 0)
...@@ -421,5 +429,17 @@ namespace OnlineStore.DUOStore ...@@ -421,5 +429,17 @@ namespace OnlineStore.DUOStore
{ {
this.timer1.Stop(); this.timer1.Stop();
} }
ConfigMoveAxis getAxis(short SlvAddr) {
foreach (ConfigMoveAxis a in axisList)
{
if (a.IsSameAxis(PortName, SlvAddr))
{
return a;
}
}
return null;
}
} }
} }
source/ACSingleStore/useControl/uc_boxdebug.cs
...@@ -115,8 +115,15 @@ namespace OnlineStore.ACSingleStore.useControl ...@@ -115,8 +115,15 @@ namespace OnlineStore.ACSingleStore.useControl
pa[1] += "A"; pa[1] += "A";
if (int.TryParse(pb[1], out _)) if (int.TryParse(pb[1], out _))
pb[1] += "A"; pb[1] += "A";
var isa = Regex.Replace(pa[1], @"[^\d]*", "") + (pa[1][1].Equals('A') ? "1" : "2") + pa[2][0] + pa[3].PadLeft(2, '0');
var isb = Regex.Replace(pb[1], @"[^\d]*", "") + (pb[1][1].Equals('A') ? "1" : "2") + pb[2][0] + pb[3].PadLeft(2, '0'); var pa1 = pa[1][0]+(pa[1][1].Equals('A') ? "1" : "2");
var pb1 = pb[1][0] + (pb[1][1].Equals('A') ? "1" : "2");
var pa2 = pa[2].Length==2? (pa[2][1].Equals('A') ? "1" : "2")+ pa[2][0] : pa[2];
var pb2 = pb[2].Length == 2 ? (pb[2][1].Equals('A') ? "1" : "2")+ pb[2][0] : pb[2];
var isa = Regex.Replace(pa[1], @"[^\d]*", "") + pa1 + pa2 + pa[3].PadLeft(2, '0');
var isb = Regex.Replace(pb[1], @"[^\d]*", "") + pb1 + pb2 + pb[3].PadLeft(2, '0');
if (int.Parse(isa) == int.Parse(isb)) if (int.Parse(isa) == int.Parse(isb))
return 0; return 0;
...@@ -359,7 +366,10 @@ namespace OnlineStore.ACSingleStore.useControl ...@@ -359,7 +366,10 @@ namespace OnlineStore.ACSingleStore.useControl
private void AxisABSMove(ConfigMoveAxis moveAxis, int targetPosition, int targetSpeed) private void AxisABSMove(ConfigMoveAxis moveAxis, int targetPosition, int targetSpeed)
{ {
moveAxis.TargetPosition = targetPosition; moveAxis.TargetPosition = targetPosition;
ACServerManager.AbsMove(moveAxis.DeviceName, moveAxis.GetAxisValue(), targetPosition, targetSpeed, targetSpeed * 4, targetSpeed * 4);
var addSpeed = moveAxis.AddSpeed > 0 ? moveAxis.AddSpeed : targetSpeed * 4;
var delSpeed = moveAxis.DelSpeed > 0 ? moveAxis.DelSpeed : targetSpeed * 4;
ACServerManager.AbsMove(moveAxis.DeviceName, moveAxis.GetAxisValue(), targetPosition, targetSpeed, addSpeed, delSpeed);
} }
/// <summary> /// <summary>
/// 判断进出轴是否在P1点 /// 判断进出轴是否在P1点
......
source/Common/Common.csproj
...@@ -62,6 +62,7 @@ ...@@ -62,6 +62,7 @@
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath> <HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Web" />
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" /> <Reference Include="System.Data.DataSetExtensions" />
......
source/Common/util/HttpHelper.cs
...@@ -121,5 +121,65 @@ namespace OnlineStore.Common ...@@ -121,5 +121,65 @@ namespace OnlineStore.Common
} }
return ""; return "";
} }
private static string Addr_cancelPutInTask = "/service/store/cancelPutInTask";
public static string cancelPutInTask(string deviceName, string barcode)
{
string msg = "";
try
{
Dictionary<string, string> paramMap = new Dictionary<string, string>();
paramMap.Add("barcode", barcode);
string server = GetAddr(Addr_cancelPutInTask, paramMap);
DateTime startTime = DateTime.Now;
string resultStr = HttpHelper.Post(server, "");
LogUtil.info(deviceName + "cancelPutInTask " + FormUtil.GetSpanStr(DateTime.Now - startTime) + " 【" + server + "】【" + resultStr + "】");
RfidData data = JsonHelper.DeserializeJsonToObject<RfidData>(resultStr);
if (data == null)
{
return msg = deviceName + " cancelPutInTask【 " + barcode + "】 没有收到服务器反馈";
}
else if (data.code.Equals(0).Equals(false))
{
return msg = deviceName + " cancelPutInTask【 " + barcode + "】 ：" + data.msg;
}
return "";
}
catch (Exception ex)
{
LogUtil.error(deviceName + " " + ex.ToString());
}
return msg;
}
private static string GetAddr(string addr, Dictionary<string, string> paramsMap)
{
string server = ConfigAppSettings.GetValue(Setting_Init.http_server);
if (server.EndsWith("/"))
{
server = server.Substring(0, server.Length - 1);
}
string path = server + addr.Trim() + "?";
foreach (string paramName in paramsMap.Keys)
{
string par = System.Web.HttpUtility.UrlEncode(paramsMap[paramName], System.Text.Encoding.UTF8);
path += paramName + "=" + par + "&";
}
path = path.Substring(0, path.Length - 1);
return path;
}
public class RfidData
{
//{"code":0,"msg":"ok","data":"7"}
public int code { get; set; }
public string msg { get; set; }
public Dictionary<string, string> data { get; set; }
}
} }
} }
\ No newline at end of file \ No newline at end of file
source/DeviceLibrary/DeviceLibrary.csproj
...@@ -36,8 +36,9 @@ ...@@ -36,8 +36,9 @@
<Prefer32Bit>false</Prefer32Bit> <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Asa.Camera.VisionLib"> <Reference Include="Asa.Camera.VisionLib, Version=1.3.7927.28975, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\camera\Asa.Camera.VisionLib.dll</HintPath> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\Camera\CameraVisionLib\bin\Debug\Asa.Camera.VisionLib.dll</HintPath>
</Reference> </Reference>
<Reference Include="Asa.IOModule.AIOBOX"> <Reference Include="Asa.IOModule.AIOBOX">
<HintPath>..\..\dll\Asa.IOModule.AIOBOX.dll</HintPath> <HintPath>..\..\dll\Asa.IOModule.AIOBOX.dll</HintPath>
......
source/DeviceLibrary/StoreConfig/AC/StoreConfig.csv
...@@ -36,6 +36,7 @@ PRO,升降轴 进料口出料缓冲点 P8,UpDownAxis_DoorIBPosition_P8,700000,,,,,, ...@@ -36,6 +36,7 @@ PRO,升降轴 进料口出料缓冲点 P8,UpDownAxis_DoorIBPosition_P8,700000,,,,,,
PRO,旋转轴（轴1）P1 待机原位点,MiddleAxis_P1_Position,151500,,,,,, PRO,旋转轴（轴1）P1 待机原位点,MiddleAxis_P1_Position,151500,,,,,,
PRO,进出轴（轴3）P1待机原位点,InOutAxis_P1_Position,0,,,,,, PRO,进出轴（轴3）P1待机原位点,InOutAxis_P1_Position,0,,,,,,
PRO,压紧轴（轴4）P1待机原位点,CompressAxis_P1_Position,2000,,,,,, PRO,压紧轴（轴4）P1待机原位点,CompressAxis_P1_Position,2000,,,,,,
PRO,L4_压紧轴_P2压紧点范围对应值,_CompAxis_P2_List,8=49928;12=45455;16=42495;,,,,,,
PRO,是否使用定位气缸,IsHasLocationCylinder,0,,,,,, PRO,是否使用定位气缸,IsHasLocationCylinder,0,,,,,,
PRO,是否有左右侧门,IsHasDoorLimit,1,,,,,, PRO,是否有左右侧门,IsHasDoorLimit,1,,,,,,
PRO,是否使用压紧轴（1=使用）,IsHasCompress_Axis,1,,,,,, PRO,是否使用压紧轴（1=使用）,IsHasCompress_Axis,1,,,,,,
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
...@@ -123,7 +123,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -123,7 +123,8 @@ namespace OnlineStore.DeviceLibrary
IOManager.IOMove(IO_Type.Alarm_HddLed, IO_VALUE.LOW); IOManager.IOMove(IO_Type.Alarm_HddLed, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.AutoRun_HddLed, IO_VALUE.LOW); IOManager.IOMove(IO_Type.AutoRun_HddLed, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.RunSign_HddLed, IO_VALUE.LOW); IOManager.IOMove(IO_Type.RunSign_HddLed, IO_VALUE.LOW);
//IOManager.IOMove(IO_Type.Device_Led, IO_VALUE.HIGH);
IOManager.IOMove(IO_Type.Device_Led, IO_VALUE.HIGH);
LogUtil.info(StoreName + " 初始化完成，OutStoreWaitSeconds=" + OutStoreWaitSeconds); LogUtil.info(StoreName + " 初始化完成，OutStoreWaitSeconds=" + OutStoreWaitSeconds);
} }
...@@ -190,7 +191,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -190,7 +191,7 @@ namespace OnlineStore.DeviceLibrary
public override bool StartRun() public override bool StartRun()
{ {
LogUtil.info(LOGGER, StoreName + "开始启动，启动时间：" + StartTime.ToString()); LogUtil.info(LOGGER, StoreName + "开始启动，启动时间：" + StartTime.ToString());
autoNext = false; autoNext = false;
mainTimer.Enabled = false; mainTimer.Enabled = false;
alarmType = StoreAlarmType.None; alarmType = StoreAlarmType.None;
...@@ -388,13 +389,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -388,13 +389,10 @@ namespace OnlineStore.DeviceLibrary
return; return;
} }
//复位和回原点要等轴3进出轴ORG亮了以后才能返回其他轴 //复位和回原点要等轴3进出轴ORG亮了以后才能返回其他轴
LogUtil.info(LOGGER, StoreName + "复位中： 压紧轴，旋转轴，上下轴开始 原点返回"); LogUtil.info(LOGGER, StoreName + "复位中： 旋转轴，上下轴开始 原点返回");
StoreMove.NextMoveStep(StoreMoveStep.BOX_H_OtherAxisBack_wait); StoreMove.NextMoveStep(StoreMoveStep.BOX_H_OtherAxisBack_wait);
StoreMove.WaitList.Add(WaitResultInfo.WaitTime(1000)); StoreMove.WaitList.Add(WaitResultInfo.WaitTime(1000));
if (IsHasCompress_Axis)
{
ACAxisHomeMove(Config.Comp_Axis);
}
ACAxisHomeMove(Config.Middle_Axis); ACAxisHomeMove(Config.Middle_Axis);
ACAxisHomeMove(Config.UpDown_Axis); ACAxisHomeMove(Config.UpDown_Axis);
break; break;
...@@ -403,15 +401,22 @@ namespace OnlineStore.DeviceLibrary ...@@ -403,15 +401,22 @@ namespace OnlineStore.DeviceLibrary
StoreMove.WaitList.Add(WaitResultInfo.WaitTime(500)); StoreMove.WaitList.Add(WaitResultInfo.WaitTime(500));
break; break;
case StoreMoveStep.BOX_H_OtherAxisBack: case StoreMoveStep.BOX_H_OtherAxisBack:
StoreMove.NextMoveStep(StoreMoveStep.BOX_H_OtherAxisBack_wait2);
StoreMove.NextMoveStep(StoreMoveStep.BOX_H_MiddleAxisToP1);
StoreMove.WaitList.Add(WaitResultInfo.WaitTime(1000)); StoreMove.WaitList.Add(WaitResultInfo.WaitTime(1000));
LogUtil.info(LOGGER, StoreName + "复位中：旋转轴运动到P1，上下轴走到P1，压紧轴到P1！"); LogUtil.info(LOGGER, StoreName + "复位中：压紧轴，旋转轴运动到P1，上下轴走到P1，压紧轴到P1！");
ACAxisMove(Config.Middle_Axis, Config.MiddleAxis_P1_Position, Config.MiddleAxis_P1_Speed); ACAxisMove(Config.Middle_Axis, Config.MiddleAxis_P1_Position, Config.MiddleAxis_P1_Speed);
ACAxisMove(Config.UpDown_Axis, Config.UpDownAxis_DoorOPosition_P1, Config.UpDownAxis_P1_Speed); ACAxisMove(Config.UpDown_Axis, Config.UpDownAxis_DoorOPosition_P1, Config.UpDownAxis_P1_Speed);
ComMoveToPosition(Config.CompressAxis_P1_Position,Config.CompAxis_P1_Speed); if (IsHasCompress_Axis)
{
ACAxisHomeMove(Config.Comp_Axis);
}
break;
case StoreMoveStep.BOX_H_OtherAxisBack_wait2:
StoreMove.NextMoveStep(StoreMoveStep.BOX_H_MiddleAxisToP1);
StoreMove.WaitList.Add(WaitResultInfo.WaitTime(500));
break; break;
case StoreMoveStep.BOX_H_MiddleAxisToP1: case StoreMoveStep.BOX_H_MiddleAxisToP1:
ComMoveToPosition(Config.CompressAxis_P1_Position, Config.CompAxis_P1_Speed);
HuichuanLibrary.HCBoardManager.SetAxBacklash(Config.Middle_Axis.GetAxisValue(), Config.MiddleAxis_Reverse_Offset, Config.Middle_Axis.HomeLowSpeed, -1); HuichuanLibrary.HCBoardManager.SetAxBacklash(Config.Middle_Axis.GetAxisValue(), Config.MiddleAxis_Reverse_Offset, Config.Middle_Axis.HomeLowSpeed, -1);
LogUtil.info(LOGGER, StoreName + "复位完成,设置旋转轴反向间隙:"+ Config.MiddleAxis_Reverse_Offset); LogUtil.info(LOGGER, StoreName + "复位完成,设置旋转轴反向间隙:"+ Config.MiddleAxis_Reverse_Offset);
storeRunStatus = StoreRunStatus.Runing; storeRunStatus = StoreRunStatus.Runing;
...@@ -1715,7 +1720,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -1715,7 +1720,7 @@ namespace OnlineStore.DeviceLibrary
return CalHeight(Value); return CalHeight(Value);
} }
private int CalHeight(double Value) private int CalHeight(double Value)
{ {
int result = 0; int result = 0;
...@@ -1730,6 +1735,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -1730,6 +1735,7 @@ namespace OnlineStore.DeviceLibrary
else else
{ {
result = (int)Math.Floor(1F * (Value) / 4) * 4; result = (int)Math.Floor(1F * (Value) / 4) * 4;
result = (int)Math.Floor(1F * (Value));
if (result <= 8) if (result <= 8)
{ {
result = 8; result = 8;
...@@ -1753,12 +1759,20 @@ namespace OnlineStore.DeviceLibrary ...@@ -1753,12 +1759,20 @@ namespace OnlineStore.DeviceLibrary
} }
else if (result >= 16) else if (result >= 16)
{ {
result = 24; result = 16;
} }
else if (result >= 13) else if (result >= 13)
{ {
result = 12; result = 12;
} }
else if (result >= 5)
{
result = 8;
}
else
{
result = 0;
}
return result; return result;
} }
...@@ -2190,10 +2204,16 @@ namespace OnlineStore.DeviceLibrary ...@@ -2190,10 +2204,16 @@ namespace OnlineStore.DeviceLibrary
} }
else else
{ {
if (StoreMove.MoveType == StoreMoveType.OutStore && StoreMove.MoveParam.PositionNum == posId)
{
LogUtil.error(LOGGER, "执行出库【" + posId + "】失败，当前库位正在出库");
continue;
}
FixtureCodeInfo currInOutFixture = new FixtureCodeInfo(0, "", posId, plateW, plateH); FixtureCodeInfo currInOutFixture = new FixtureCodeInfo(0, "", posId, plateW, plateH);
if (CanStarInOut()) if (CanStarInOut())
{ {
bool result = StartOutStoreMove(new InOutStoreParam("", posId, position)); bool result = StartOutStoreMove(new InOutStoreParam("", posId, plateH, plateW));
if (!result) if (!result)
{ {
LogUtil.info(LOGGER, StoreName + " 执行出库【" + currInOutFixture.ToStr() + "】失败，加入等待队列"); LogUtil.info(LOGGER, StoreName + " 执行出库【" + currInOutFixture.ToStr() + "】失败，加入等待队列");
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
...@@ -73,6 +73,12 @@ namespace OnlineStore.DeviceLibrary ...@@ -73,6 +73,12 @@ namespace OnlineStore.DeviceLibrary
p.UpDown_P7 = Config.UpDownAxis_DoorOBPosition_P7; p.UpDown_P7 = Config.UpDownAxis_DoorOBPosition_P7;
p.ComPress_P2 = position.CompressAxis_Position_P2; p.ComPress_P2 = position.CompressAxis_Position_P2;
if (int.TryParse(param.PlateH, out int plateh))
{
var h = Config.GetComP2(plateh);
if (h>0)
p.ComPress_P2 = h;
}
p.ComPress_P3 = position.CompressAxis_CPosition_P3; p.ComPress_P3 = position.CompressAxis_CPosition_P3;
p.InOut_P3 = position.InOutAxis_Position_P3; p.InOut_P3 = position.InOutAxis_Position_P3;
p.Middle_P2 = position.MiddleAxis_Position_P2; p.Middle_P2 = position.MiddleAxis_Position_P2;
...@@ -386,10 +392,21 @@ namespace OnlineStore.DeviceLibrary ...@@ -386,10 +392,21 @@ namespace OnlineStore.DeviceLibrary
else if (StoreMove.MoveStep == StoreMoveStep.SI_05_DeviceToDoor) else if (StoreMove.MoveStep == StoreMoveStep.SI_05_DeviceToDoor)
{ {
NeedCheckSafetyLight = 0; NeedCheckSafetyLight = 0;
InStoreLog("入库：SI_06 拿物品，压紧轴至P2(压紧点)) 升降轴至P7(进料口取料缓冲点) "); if (IOManager.IOValue(IO_Type.TrayCheck_Door).Equals(IO_VALUE.LOW))
StoreMove.NextMoveStep(StoreMoveStep.SI_06_DoorWarToDevice); {
ComMoveToPosition(moveP.ComPress_P2, Config.CompAxis_P2_Speed); InStoreLog("入库：SI_06 未检测到料盘,任务取消 ");
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P7, Config.UpDownAxis_P7_Speed); StoreMove.NextMoveStep(StoreMoveStep.SI_14_CheckTray);
HttpHelper.cancelPutInTask(Name, StoreMove.MoveParam.WareNumber);
}
else
{
InStoreLog("入库：SI_06 拿物品，压紧轴至P2(压紧点)) 升降轴至P7(进料口取料缓冲点) ");
StoreMove.NextMoveStep(StoreMoveStep.SI_06_DoorWarToDevice);
ComMoveToPosition(moveP.ComPress_P2, Config.CompAxis_P2_Speed);
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P7, Config.UpDownAxis_P7_Speed);
}
} }
else if (StoreMove.MoveStep == StoreMoveStep.SI_06_DoorWarToDevice) else if (StoreMove.MoveStep == StoreMoveStep.SI_06_DoorWarToDevice)
...@@ -414,7 +431,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -414,7 +431,7 @@ namespace OnlineStore.DeviceLibrary
StoreMove.NextMoveStep(StoreMoveStep.SI_09_MoveToBag); StoreMove.NextMoveStep(StoreMoveStep.SI_09_MoveToBag);
ACAxisMove(Config.Middle_Axis, moveP.Middle_P2, Config.MiddleAxis_P2_Speed); ACAxisMove(Config.Middle_Axis, moveP.Middle_P2, Config.MiddleAxis_P2_Speed);
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P3, Config.UpDownAxis_P3_Speed); ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P3, Config.UpDownAxis_P3_Speed);
//关闭仓门 //关闭仓门
CloseDoor(false); CloseDoor(false);
} }
//else //else
...@@ -866,7 +883,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -866,7 +883,9 @@ namespace OnlineStore.DeviceLibrary
{ {
lock (waitOutListLock) lock (waitOutListLock)
{ {
waitOutStoreList.Add(code); var x = waitOutStoreList.FindAll((fx) => { return fx.PosId == code.PosId; });
if (x.Count==0)
waitOutStoreList.Add(code);
} }
} }
/// <summary> /// <summary>
......
source/DeviceLibrary/halcon/CodeManager.cs
...@@ -154,8 +154,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -154,8 +154,9 @@ namespace OnlineStore.DeviceLibrary
HalconDotNet.HObject ho_Image = null; HalconDotNet.HObject ho_Image = null;
try try
{ {
ho_Image = Camera._cam.CaptureOnImage(cameraName,out Bitmap bitmap); bool nohalcon = false;
if (ho_Image == null) ho_Image = Camera._cam.CaptureOnImage(cameraName,out Bitmap bitmap, nohalcon);
if (ho_Image == null && !nohalcon)
{ {
LogUtil.error(" 【" + cameraName + "】取图片失败[" + Camera._cam.ErrInfo + "]，关闭相机"); LogUtil.error(" 【" + cameraName + "】取图片失败[" + Camera._cam.ErrInfo + "]，关闭相机");
CloseCamera(cameraName); CloseCamera(cameraName);
...@@ -165,17 +166,15 @@ namespace OnlineStore.DeviceLibrary ...@@ -165,17 +166,15 @@ namespace OnlineStore.DeviceLibrary
LogUtil.info(" 【" + cameraName + "】取图片完成，开始扫码"); LogUtil.info(" 【" + cameraName + "】取图片完成，开始扫码");
List<CodeInfo> cc = new List<CodeInfo>(); List<CodeInfo> cc = new List<CodeInfo>();
string r = ""; string r = "";
foreach (string codeType in codeTypeList)
RemoteDecodeHelper.RemoteDecodeParam remoteDecodeParam = new RemoteDecodeHelper.RemoteDecodeParam
{ {
//判断是否是一维码 codeTypeList = codeTypeList.ToArray(),
if (codeType.ToLower().Equals("barcode")) codeCount = codeCount,
{ timeout = 4000
cc = HDCodeHelper.DecodeBarCode(ho_Image); };
} cc = RemoteDecodeHelper.DecodeRequest(bitmap, remoteDecodeParam);
else if (cc != null) {
{
cc = HDCodeHelper.DecodeCode(ho_Image, codeType, GetCodeParamFilePath(codeType), codeCount, 4000);
}
foreach (CodeInfo c in cc) foreach (CodeInfo c in cc)
{ {
string str = CodeManager.ReplaceCode(c.CodeStr); string str = CodeManager.ReplaceCode(c.CodeStr);
...@@ -186,6 +185,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -186,6 +185,7 @@ namespace OnlineStore.DeviceLibrary
} }
} }
} }
if (String.IsNullOrEmpty(r)) if (String.IsNullOrEmpty(r))
{ {
// SaveImageToFile(deviceName, cameraName, bit); // SaveImageToFile(deviceName, cameraName, bit);
......
source/DeviceLibrary/store/Camera.cs
...@@ -40,7 +40,7 @@ namespace OnlineStore ...@@ -40,7 +40,7 @@ namespace OnlineStore
} }
var m = Regex.Match(configtxt, "name\".*?\"(.+)\"", RegexOptions.IgnoreCase); var m = Regex.Match(configtxt, "name\".*?\"(.+)\"", RegexOptions.IgnoreCase);
DeviceName = m.Groups[1].Value; DeviceName = m.Groups[1].Value;
camera = new VisionLib(path, "HIK.IPCamera"); camera = new VisionLib(path,true, "HIK.IPCamera");
} }
catch (Exception e){ catch (Exception e){
LogUtil.error(Name + "加载监控相机配置文件失败:"+ e.ToString()); LogUtil.error(Name + "加载监控相机配置文件失败:"+ e.ToString());
......
source/DeviceLibrary/store/InOrOutStoreParam.cs
...@@ -73,7 +73,16 @@ namespace OnlineStore.DeviceLibrary ...@@ -73,7 +73,16 @@ namespace OnlineStore.DeviceLibrary
MoveP = null; MoveP = null;
IsSolderPaste = false; IsSolderPaste = false;
} }
public InOutStoreParam(string wareNo, string posId, string plateH, string plateW, ACStorePosition movep)
{
ACStoreP = movep;
WareNumber = wareNo;
PositionNum = posId;
MoveP = null;
IsSolderPaste = false;
this.PlagtW = plateW;
this.PlateH = plateH;
}
private ACStorePosition ACStoreP = null; private ACStorePosition ACStoreP = null;
public ACStorePosition GetACPosition() public ACStorePosition GetACPosition()
......
source/DeviceLibrary/store/KTK_Store.cs
...@@ -228,7 +228,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -228,7 +228,10 @@ namespace OnlineStore.DeviceLibrary
LogUtil.info(LOGGER, moveAxis.DisplayStr + "speed[" + moveAxis.TargetSpeed + "]开始原点返回"); LogUtil.info(LOGGER, moveAxis.DisplayStr + "speed[" + moveAxis.TargetSpeed + "]开始原点返回");
StoreMove.WaitList.Add(WaitResultInfo.WaitAxis(moveAxis, true)); StoreMove.WaitList.Add(WaitResultInfo.WaitAxis(moveAxis, true));
AddAxisMoveTime(moveAxis); AddAxisMoveTime(moveAxis);
ACServerManager.HomeMove(moveAxis.DeviceName, (short)moveAxis.GetAxisValue(), moveAxis.HomeHighSpeed, moveAxis.HomeLowSpeed, moveAxis.HomeAddSpeed); var HomeAddSpeed = moveAxis.HomeAddSpeed > 0 ? moveAxis.HomeAddSpeed : moveAxis.HomeHighSpeed * 6;
var HomeLowSpeed = moveAxis.HomeLowSpeed > 0 ? moveAxis.HomeLowSpeed : moveAxis.HomeHighSpeed / 10;
ACServerManager.HomeMove(moveAxis.DeviceName, (short)moveAxis.GetAxisValue(), moveAxis.HomeHighSpeed, HomeLowSpeed, HomeAddSpeed);
} }
/// <summary> /// <summary>
...@@ -239,7 +242,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -239,7 +242,10 @@ namespace OnlineStore.DeviceLibrary
StoreMove.WaitList.Add(WaitResultInfo.WaitAxis(moveAxis, targetPosition, targetSpeed)); StoreMove.WaitList.Add(WaitResultInfo.WaitAxis(moveAxis, targetPosition, targetSpeed));
moveAxis.TargetPosition = targetPosition; moveAxis.TargetPosition = targetPosition;
AddAxisMoveTime(moveAxis); AddAxisMoveTime(moveAxis);
ACServerManager.AbsMove(moveAxis.DeviceName, moveAxis.GetAxisValue(), targetPosition,targetSpeed, targetSpeed*4, targetSpeed * 4); var addSpeed = moveAxis.AddSpeed > 0 ? moveAxis.AddSpeed:targetSpeed * 4;
var delSpeed = moveAxis.DelSpeed > 0 ? moveAxis.DelSpeed:targetSpeed * 4;
ACServerManager.AbsMove(moveAxis.DeviceName, moveAxis.GetAxisValue(), targetPosition,targetSpeed, addSpeed, delSpeed);
} }
/// <summary> /// <summary>
...@@ -274,8 +280,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -274,8 +280,11 @@ namespace OnlineStore.DeviceLibrary
if (StoreMove.CanWhileCount > 0) if (StoreMove.CanWhileCount > 0)
{ {
LogUtil.error(LOGGER, moveAxis.DisplayStr + "目标位置[" + targetPosition + "]当前位置[" + outCount + LogUtil.error(LOGGER, moveAxis.DisplayStr + "目标位置[" + targetPosition + "]当前位置[" + outCount +
"]，误差过大，重新开始运动，剩余[" + StoreMove.CanWhileCount + "]次"); "]，误差过大，重新开始运动，剩余[" + StoreMove.CanWhileCount + "]次");
ACServerManager.AbsMove(moveAxis.DeviceName, moveAxis.GetAxisValue(), targetPosition, targetSpeed, targetSpeed * 4, targetSpeed * 4);
var addSpeed = moveAxis.AddSpeed > 0 ? moveAxis.AddSpeed : targetSpeed * 4;
var delSpeed = moveAxis.DelSpeed > 0 ? moveAxis.DelSpeed : targetSpeed * 4;
ACServerManager.AbsMove(moveAxis.DeviceName, moveAxis.GetAxisValue(), targetPosition, targetSpeed, addSpeed, delSpeed);
StoreMove.CanWhileCount--; StoreMove.CanWhileCount--;
} }
else else
...@@ -306,7 +315,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -306,7 +315,10 @@ namespace OnlineStore.DeviceLibrary
{ {
LogUtil.error(LOGGER, moveAxis.DisplayStr + "收到原点完成信号，当前位置[" + outCount + "]，重新回原点，剩余[" + StoreMove.CanWhileCount + "]次"); LogUtil.error(LOGGER, moveAxis.DisplayStr + "收到原点完成信号，当前位置[" + outCount + "]，重新回原点，剩余[" + StoreMove.CanWhileCount + "]次");
//LogUtil.error(LOGGER, StoreName + moveAxis.DisplayStr + "重新回原点"); //LogUtil.error(LOGGER, StoreName + moveAxis.DisplayStr + "重新回原点");
ACServerManager.HomeMove(moveAxis.DeviceName, moveAxis.GetAxisValue(), moveAxis.HomeHighSpeed, moveAxis.HomeLowSpeed, moveAxis.HomeAddSpeed);
var HomeAddSpeed = moveAxis.HomeAddSpeed > 0 ? moveAxis.HomeAddSpeed : moveAxis.HomeHighSpeed * 6;
var HomeLowSpeed = moveAxis.HomeLowSpeed > 0 ? moveAxis.HomeLowSpeed : moveAxis.HomeHighSpeed / 10;
ACServerManager.HomeMove(moveAxis.DeviceName, moveAxis.GetAxisValue(), moveAxis.HomeHighSpeed, HomeLowSpeed, HomeAddSpeed);
StoreMove.CanWhileCount--; StoreMove.CanWhileCount--;
} }
else else
......
source/DeviceLibrary/store/StoreStep.cs
...@@ -142,6 +142,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -142,6 +142,7 @@ namespace OnlineStore.DeviceLibrary
/// 料仓原点返回和重置步骤，，升降轴，旋转轴，压紧轴原点返回 /// 料仓原点返回和重置步骤，，升降轴，旋转轴，压紧轴原点返回
/// </summary> /// </summary>
BOX_H_OtherAxisBack = 014, BOX_H_OtherAxisBack = 014,
BOX_H_OtherAxisBack_wait2 = 015,
///// <summary> ///// <summary>
///// 清理轴位置 ///// 清理轴位置
///// </summary> ///// </summary>
...@@ -149,7 +150,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -149,7 +150,7 @@ namespace OnlineStore.DeviceLibrary
/// <summary> /// <summary>
/// 旋转轴返回P1 /// 旋转轴返回P1
/// </summary> /// </summary>
BOX_H_MiddleAxisToP1=016, BOX_H_MiddleAxisToP1 =016,
/// <summary> /// <summary>
/// 叉子先退回P1 /// 叉子先退回P1
......
source/LoadCVSLibrary/storeConfig/config/AC_SA_Config.cs
using System; using OnlineStore.Common;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
...@@ -340,7 +341,11 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -340,7 +341,11 @@ namespace OnlineStore.LoadCSVLibrary
/// </summary> /// </summary>
[ConfigProAttribute("CompressAxis_P1_Position")] [ConfigProAttribute("CompressAxis_P1_Position")]
public int CompressAxis_P1_Position { get; set; } public int CompressAxis_P1_Position { get; set; }
/// <summary>
/// PRO,,L4_压紧轴_P2压紧点范围对应值,CompAxis_P2_List,8=385001;12=383001;16=379001;
/// </summary>
[ConfigProAttribute("CompAxis_P2_List",false)]
public string CompAxis_P2_List { get; set; }
/// <summary> /// <summary>
/// PRO 是否使用料盘检测信号 IsUse_Tray_Check /// PRO 是否使用料盘检测信号 IsUse_Tray_Check
/// </summary> /// </summary>
...@@ -680,8 +685,50 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -680,8 +685,50 @@ namespace OnlineStore.LoadCSVLibrary
Config.Comp_Axis.CanErrorCountMin = 10; Config.Comp_Axis.CanErrorCountMin = 10;
Config.Comp_Axis.PositionMin = 0; Config.Comp_Axis.PositionMin = 0;
Config.Comp_Axis.PositionMax = 0; Config.Comp_Axis.PositionMax = 0;
} }
private Dictionary<int, int> ComP2Map = null;
public int GetComP2(int plateh)
{
//查找指定的高度
analysisComP2();
if (ComP2Map.ContainsKey(plateh))
{
return ComP2Map[plateh];
}
else
return 0;
//return new List<int>(ComP2Map.Values).First<int>();
}
private void analysisComP2()
{
if (ComP2Map == null)
{
try
{
// 8=385001;424000#12=383001;385000#16=379001;
ComP2Map = new Dictionary<int, int>();
string[] arrayList = CompAxis_P2_List.Split(';');
foreach (string str in arrayList)
{
if (str.Equals(""))
{
continue;
}
string[] com2A = str.Split('=');
if (com2A.Length.Equals(2))
{
int plateH = Convert.ToInt32(com2A[0]);
int p2 = Convert.ToInt32(com2A[1]);
ComP2Map.Add(plateH, p2);
}
}
}
catch (Exception ex)
{
LogUtil.error("解析CompAxis_P2_List【" + CompAxis_P2_List + "】出错：" + ex.ToString());
}
}
}
} }
} }
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!