Skip to content

刘韬 / SO815-AutoInOutStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit ab4b5c10 由 几米阳光
选项

文字修改

1 个父辈 d8246416
内嵌 并排
正在显示 6 个修改的文件 包含 25 行增加 和 44 行删除
source/ACSingleStore/FrmStoreBox.Designer.cs
...@@ -54,7 +54,6 @@ ...@@ -54,7 +54,6 @@
this.label2 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label();
this.txtAlarmStatus = new System.Windows.Forms.TextBox(); this.txtAlarmStatus = new System.Windows.Forms.TextBox();
this.btnGetAlarm = new System.Windows.Forms.Button(); this.btnGetAlarm = new System.Windows.Forms.Button();
this.btnReadPosition = new System.Windows.Forms.Button();
this.lblServerOn = new System.Windows.Forms.Label(); this.lblServerOn = new System.Windows.Forms.Label();
this.label7 = new System.Windows.Forms.Label(); this.label7 = new System.Windows.Forms.Label();
this.label8 = new System.Windows.Forms.Label(); this.label8 = new System.Windows.Forms.Label();
...@@ -319,7 +318,6 @@ ...@@ -319,7 +318,6 @@
this.groupBox5.Controls.Add(this.label2); this.groupBox5.Controls.Add(this.label2);
this.groupBox5.Controls.Add(this.txtAlarmStatus); this.groupBox5.Controls.Add(this.txtAlarmStatus);
this.groupBox5.Controls.Add(this.btnGetAlarm); this.groupBox5.Controls.Add(this.btnGetAlarm);
this.groupBox5.Controls.Add(this.btnReadPosition);
this.groupBox5.Controls.Add(this.lblServerOn); this.groupBox5.Controls.Add(this.lblServerOn);
this.groupBox5.Controls.Add(this.label7); this.groupBox5.Controls.Add(this.label7);
this.groupBox5.Controls.Add(this.label8); this.groupBox5.Controls.Add(this.label8);
...@@ -608,28 +606,12 @@ ...@@ -608,28 +606,12 @@
this.btnGetAlarm.UseVisualStyleBackColor = true; this.btnGetAlarm.UseVisualStyleBackColor = true;
this.btnGetAlarm.Click += new System.EventHandler(this.btnGetAlarm_Click); this.btnGetAlarm.Click += new System.EventHandler(this.btnGetAlarm_Click);
// //
// btnReadPosition
//
this.btnReadPosition.BackColor = System.Drawing.SystemColors.Control;
this.btnReadPosition.Cursor = System.Windows.Forms.Cursors.Default;
this.btnReadPosition.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnReadPosition.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnReadPosition.Location = new System.Drawing.Point(509, 152);
this.btnReadPosition.Name = "btnReadPosition";
this.btnReadPosition.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnReadPosition.Size = new System.Drawing.Size(133, 33);
this.btnReadPosition.TabIndex = 278;
this.btnReadPosition.Text = "读取位置";
this.btnReadPosition.UseVisualStyleBackColor = true;
this.btnReadPosition.Visible = false;
this.btnReadPosition.Click += new System.EventHandler(this.btnReadPosition_Click);
//
// lblServerOn // lblServerOn
// //
this.lblServerOn.AutoSize = true; this.lblServerOn.AutoSize = true;
this.lblServerOn.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblServerOn.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblServerOn.ForeColor = System.Drawing.Color.Red; this.lblServerOn.ForeColor = System.Drawing.Color.Red;
this.lblServerOn.Location = new System.Drawing.Point(48, 161); this.lblServerOn.Location = new System.Drawing.Point(522, 160);
this.lblServerOn.Name = "lblServerOn"; this.lblServerOn.Name = "lblServerOn";
this.lblServerOn.Size = new System.Drawing.Size(0, 19); this.lblServerOn.Size = new System.Drawing.Size(0, 19);
this.lblServerOn.TabIndex = 268; this.lblServerOn.TabIndex = 268;
...@@ -2609,7 +2591,7 @@ ...@@ -2609,7 +2591,7 @@
this.tabPage2.Location = new System.Drawing.Point(4, 26); this.tabPage2.Location = new System.Drawing.Point(4, 26);
this.tabPage2.Name = "tabPage2"; this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3); this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
this.tabPage2.Size = new System.Drawing.Size(655, 451); this.tabPage2.Size = new System.Drawing.Size(655, 459);
this.tabPage2.TabIndex = 1; this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "伺服调试"; this.tabPage2.Text = "伺服调试";
this.tabPage2.UseVisualStyleBackColor = true; this.tabPage2.UseVisualStyleBackColor = true;
...@@ -2620,7 +2602,7 @@ ...@@ -2620,7 +2602,7 @@
this.tabPage3.Controls.Add(this.groupBox1); this.tabPage3.Controls.Add(this.groupBox1);
this.tabPage3.Location = new System.Drawing.Point(4, 26); this.tabPage3.Location = new System.Drawing.Point(4, 26);
this.tabPage3.Name = "tabPage3"; this.tabPage3.Name = "tabPage3";
this.tabPage3.Size = new System.Drawing.Size(655, 451); this.tabPage3.Size = new System.Drawing.Size(655, 459);
this.tabPage3.TabIndex = 2; this.tabPage3.TabIndex = 2;
this.tabPage3.Text = "压紧轴调试"; this.tabPage3.Text = "压紧轴调试";
this.tabPage3.UseVisualStyleBackColor = true; this.tabPage3.UseVisualStyleBackColor = true;
...@@ -2637,7 +2619,7 @@ ...@@ -2637,7 +2619,7 @@
this.tabPage1.Controls.Add(this.label9); this.tabPage1.Controls.Add(this.label9);
this.tabPage1.Location = new System.Drawing.Point(4, 26); this.tabPage1.Location = new System.Drawing.Point(4, 26);
this.tabPage1.Name = "tabPage1"; this.tabPage1.Name = "tabPage1";
this.tabPage1.Size = new System.Drawing.Size(655, 451); this.tabPage1.Size = new System.Drawing.Size(655, 459);
this.tabPage1.TabIndex = 3; this.tabPage1.TabIndex = 3;
this.tabPage1.Text = "温湿度调试"; this.tabPage1.Text = "温湿度调试";
this.tabPage1.UseVisualStyleBackColor = true; this.tabPage1.UseVisualStyleBackColor = true;
...@@ -3060,7 +3042,6 @@ ...@@ -3060,7 +3042,6 @@
private System.Windows.Forms.ToolStripMenuItem 关闭仓门ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 关闭仓门ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem 回待机点ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 回待机点ToolStripMenuItem;
private System.Windows.Forms.Label lblServerOn; private System.Windows.Forms.Label lblServerOn;
public System.Windows.Forms.Button btnReadPosition;
private System.Windows.Forms.Label label16; private System.Windows.Forms.Label label16;
private System.Windows.Forms.Label label15; private System.Windows.Forms.Label label15;
private System.Windows.Forms.Label label14; private System.Windows.Forms.Label label14;
......
source/ACSingleStore/FrmStoreBox.cs
...@@ -225,7 +225,7 @@ namespace OnlineStore.AutoInOutStore ...@@ -225,7 +225,7 @@ namespace OnlineStore.AutoInOutStore
this.toolStripMenuItem5.Visible = StoreManager.HasDisableDoorControl; this.toolStripMenuItem5.Visible = StoreManager.HasDisableDoorControl;
this.toolStripSeparator16.Visible = StoreManager.HasDisableDoorControl; this.toolStripSeparator16.Visible = StoreManager.HasDisableDoorControl;
this.toolStripSeparator18.Visible = StoreManager.HasDisableDoorControl; this.toolStripSeparator18.Visible = StoreManager.HasDisableDoorControl;
txtTempPort.Text = store.Config.Humiture_Port;
LoadOk = true; LoadOk = true;
cmbHomeType.SelectedIndex = 1; cmbHomeType.SelectedIndex = 1;
timer1.Start(); timer1.Start();
......
source/ACSingleStore/Properties/Resource.en-US.resx
...@@ -448,7 +448,7 @@ ...@@ -448,7 +448,7 @@
<value>p-axis stanby P1:</value> <value>p-axis stanby P1:</value>
</data> </data>
<data name="FrmStoreBox_btnInOutP2_Text" xml:space="preserve"> <data name="FrmStoreBox_btnInOutP2_Text" xml:space="preserve">
<value>In-out axis providing P2:</value> <value>In-out axis sucking disc providing P2:</value>
</data> </data>
<data name="FrmStoreBox_btnInOutP1_Text" xml:space="preserve"> <data name="FrmStoreBox_btnInOutP1_Text" xml:space="preserve">
<value>In-out axis stanby P1:</value> <value>In-out axis stanby P1:</value>
...@@ -469,7 +469,7 @@ ...@@ -469,7 +469,7 @@
<value>p-axis pressing P2:</value> <value>p-axis pressing P2:</value>
</data> </data>
<data name="FrmStoreBox_btnInOutP3_Text" xml:space="preserve"> <data name="FrmStoreBox_btnInOutP3_Text" xml:space="preserve">
<value>In-out axistaking out P3:</value> <value>In-out axis taking out P3:</value>
</data> </data>
<data name="FrmStoreBox_btnMiddleP2_Text" xml:space="preserve"> <data name="FrmStoreBox_btnMiddleP2_Text" xml:space="preserve">
<value>Rotation axis storage P2:</value> <value>Rotation axis storage P2:</value>
...@@ -876,16 +876,16 @@ ...@@ -876,16 +876,16 @@
<data name="Y16" xml:space="preserve"> <data name="Y16" xml:space="preserve">
<value /> <value />
</data> </data>
<data name="X17" xml:space="preserve"> <data name="X21" xml:space="preserve">
<value>Feeding door close</value> <value>Feeding door close</value>
</data> </data>
<data name="X18" xml:space="preserve"> <data name="X22" xml:space="preserve">
<value>Pressure detection</value> <value>Pressure detection</value>
</data> </data>
<data name="X19" xml:space="preserve"> <data name="X23" xml:space="preserve">
<value>Confirm sucker pressure signal</value> <value>Confirm sucker pressure signal</value>
</data> </data>
<data name="X20" xml:space="preserve"> <data name="X24" xml:space="preserve">
<value>door limit</value> <value>door limit</value>
</data> </data>
<data name="Batch_Axis" xml:space="preserve"> <data name="Batch_Axis" xml:space="preserve">
......
source/ACSingleStore/Properties/Resource.zh-CN.resx
...@@ -448,7 +448,7 @@ ...@@ -448,7 +448,7 @@
<value>压紧轴待机点P1:</value> <value>压紧轴待机点P1:</value>
</data> </data>
<data name="FrmStoreBox_btnInOutP2_Text" xml:space="preserve"> <data name="FrmStoreBox_btnInOutP2_Text" xml:space="preserve">
<value>进出轴取料点P2:</value> <value>进出轴吸盘取料点P2:</value>
</data> </data>
<data name="FrmStoreBox_btnInOutP1_Text" xml:space="preserve"> <data name="FrmStoreBox_btnInOutP1_Text" xml:space="preserve">
<value>进出轴待机点P1:</value> <value>进出轴待机点P1:</value>
...@@ -469,7 +469,7 @@ ...@@ -469,7 +469,7 @@
<value>压紧轴压紧点P2:</value> <value>压紧轴压紧点P2:</value>
</data> </data>
<data name="FrmStoreBox_btnInOutP3_Text" xml:space="preserve"> <data name="FrmStoreBox_btnInOutP3_Text" xml:space="preserve">
<value>进出轴取料点P3:</value> <value>进出轴库位取料点P3:</value>
</data> </data>
<data name="FrmStoreBox_btnMiddleP2_Text" xml:space="preserve"> <data name="FrmStoreBox_btnMiddleP2_Text" xml:space="preserve">
<value>旋转轴库位点P2:</value> <value>旋转轴库位点P2:</value>
...@@ -873,16 +873,16 @@ ...@@ -873,16 +873,16 @@
<data name="Y16" xml:space="preserve"> <data name="Y16" xml:space="preserve">
<value /> <value />
</data> </data>
<data name="X17" xml:space="preserve"> <data name="X21" xml:space="preserve">
<value>上料机构门关闭</value> <value>上料机构门关闭</value>
</data> </data>
<data name="X18" xml:space="preserve"> <data name="X22" xml:space="preserve">
<value>气压检测</value> <value>气压检测</value>
</data> </data>
<data name="X19" xml:space="preserve"> <data name="X23" xml:space="preserve">
<value>吸盘压力确认信号</value> <value>吸盘压力确认信号</value>
</data> </data>
<data name="X20" xml:space="preserve"> <data name="X24" xml:space="preserve">
<value>左侧门关闭</value> <value>左侧门关闭</value>
</data> </data>
<data name="Batch_Axis" xml:space="preserve"> <data name="Batch_Axis" xml:space="preserve">
......
source/DeviceLibrary/StoreConfig/AC/StoreConfig.csv
...@@ -31,14 +31,14 @@ DO,门锁气缸打开SOL,BatchDoor_Open,112,192.168.200.21,0,门锁气缸打开SOL,Y13,DO-13 ...@@ -31,14 +31,14 @@ DO,门锁气缸打开SOL,BatchDoor_Open,112,192.168.200.21,0,门锁气缸打开SOL,Y13,DO-13
DO,门锁气缸关闭SOL,BatchDoor_Close,113,192.168.200.21,0,门锁气缸关闭SOL,Y14,DO-14,0, DO,门锁气缸关闭SOL,BatchDoor_Close,113,192.168.200.21,0,门锁气缸关闭SOL,Y14,DO-14,0,
DO,门禁功能屏蔽,DisableDoorControl,114,192.168.200.21,0,门禁功能屏蔽,Y15,DO-15,0, DO,门禁功能屏蔽,DisableDoorControl,114,192.168.200.21,0,门禁功能屏蔽,Y15,DO-15,0,
,,,115,192.168.200.21,0,,Y16,DO-16,0, ,,,115,192.168.200.21,0,,Y16,DO-16,0,
DI,上料机构门关闭,DoorClose_LoadMaterial,200,192.168.200.22,0,上料机构门关闭,X17,DI-21,0, DI,上料机构门关闭,DoorClose_LoadMaterial,200,192.168.200.22,0,上料机构门关闭,X21,DI-21,0,
DI,气压检测,Airpressure_Check,201,192.168.200.22,0,气压检测,X18,DI-22,0, DI,气压检测,Airpressure_Check,201,192.168.200.22,0,气压检测,X22,DI-22,0,
DI,吸盘压力确认信号,SuckingDisc_Air,202,192.168.200.22,0,吸盘压力确认信号,X19,DI-23,0, DI,吸盘压力确认信号,SuckingDisc_Air,202,192.168.200.22,0,吸盘压力确认信号,X23,DI-23,0,
DI,左侧门关闭,DoorColse_Single,203,192.168.200.22,0,左侧门关闭,X20,DI-24,0, DI,左侧门关闭,DoorColse_Single,203,192.168.200.22,0,左侧门关闭,X24,DI-24,0,
,,,100,192.168.200.22,0,,Y17,DO-21,0, ,,,100,192.168.200.22,0,,Y21,DO-21,0,
,,,101,192.168.200.22,0,,Y18,DO-22,0, ,,,101,192.168.200.22,0,,Y22,DO-22,0,
,,,102,192.168.200.22,0,,Y19,DO-23,0, ,,,102,192.168.200.22,0,,Y23,DO-23,0,
,,,103,192.168.200.22,0,,Y20,DO-24,0, ,,,103,192.168.200.22,0,,Y24,DO-24,0,
AXIS,(轴一)旋转轴,Middle_Axis,1,COM3,0,,,,, AXIS,(轴一)旋转轴,Middle_Axis,1,COM3,0,,,,,
AXIS,(轴二)升降轴轴,UpDown_Axis,1,COM4,0,,,,, AXIS,(轴二)升降轴轴,UpDown_Axis,1,COM4,0,,,,,
AXIS,(轴三)进出轴,InOut_Axis,1,COM5,0,,,,, AXIS,(轴三)进出轴,InOut_Axis,1,COM5,0,,,,,
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!