Skip to content

孙克 / RC1250-AssemblyLine

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

1

1 个父辈 d2690f0b
内嵌 并排
正在显示 4 个修改的文件 包含 16 行增加 和 77 行删除
source/AssemblyLineClient/FrmFeedingEquip.Designer.cs
...@@ -223,7 +223,7 @@ ...@@ -223,7 +223,7 @@
this.cmbWriteIO.DisplayMember = "ProName"; this.cmbWriteIO.DisplayMember = "ProName";
this.cmbWriteIO.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawVariable; this.cmbWriteIO.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawVariable;
this.cmbWriteIO.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbWriteIO.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbWriteIO.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.cmbWriteIO.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbWriteIO.FormattingEnabled = true; this.cmbWriteIO.FormattingEnabled = true;
this.cmbWriteIO.ItemHeight = 22; this.cmbWriteIO.ItemHeight = 22;
this.cmbWriteIO.Location = new System.Drawing.Point(17, 25); this.cmbWriteIO.Location = new System.Drawing.Point(17, 25);
...@@ -355,7 +355,7 @@ ...@@ -355,7 +355,7 @@
this.btnBStopDown.BackColor = System.Drawing.Color.White; this.btnBStopDown.BackColor = System.Drawing.Color.White;
this.btnBStopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnBStopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnBStopDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnBStopDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBStopDown.Location = new System.Drawing.Point(16, 138); this.btnBStopDown.Location = new System.Drawing.Point(175, 139);
this.btnBStopDown.Name = "btnBStopDown"; this.btnBStopDown.Name = "btnBStopDown";
this.btnBStopDown.Size = new System.Drawing.Size(153, 34); this.btnBStopDown.Size = new System.Drawing.Size(153, 34);
this.btnBStopDown.TabIndex = 267; this.btnBStopDown.TabIndex = 267;
...@@ -368,7 +368,7 @@ ...@@ -368,7 +368,7 @@
this.btnEStopDown.BackColor = System.Drawing.Color.White; this.btnEStopDown.BackColor = System.Drawing.Color.White;
this.btnEStopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnEStopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnEStopDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnEStopDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnEStopDown.Location = new System.Drawing.Point(175, 138); this.btnEStopDown.Location = new System.Drawing.Point(16, 139);
this.btnEStopDown.Name = "btnEStopDown"; this.btnEStopDown.Name = "btnEStopDown";
this.btnEStopDown.Size = new System.Drawing.Size(153, 34); this.btnEStopDown.Size = new System.Drawing.Size(153, 34);
this.btnEStopDown.TabIndex = 266; this.btnEStopDown.TabIndex = 266;
...@@ -791,7 +791,7 @@ ...@@ -791,7 +791,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(1319, 657); this.tabPage2.Size = new System.Drawing.Size(1319, 701);
this.tabPage2.TabIndex = 1; this.tabPage2.TabIndex = 1;
this.tabPage2.Text = " 伺服信息 "; this.tabPage2.Text = " 伺服信息 ";
this.tabPage2.UseVisualStyleBackColor = true; this.tabPage2.UseVisualStyleBackColor = true;
......
source/AssemblyLineClient/FrmIOStatus.cs
...@@ -266,17 +266,11 @@ namespace OnlineStore.AssemblyLine ...@@ -266,17 +266,11 @@ namespace OnlineStore.AssemblyLine
{ {
btnDriveMotor_Run.Text = "驱动电机1234停止"; btnDriveMotor_Run.Text = "驱动电机1234停止";
btnDriveMotor_Run.BackColor = Color.Aqua; btnDriveMotor_Run.BackColor = Color.Aqua;
IOManager.IOMove(IO_Type.DriveMotor_Run1, IO_VALUE.HIGH); LineManager.Line.WriteDrivetMotorRun(IO_VALUE.HIGH);
IOManager.IOMove(IO_Type.DriveMotor_Run2, IO_VALUE.HIGH);
IOManager.IOMove(IO_Type.DriveMotor_Run3, IO_VALUE.HIGH);
IOManager.IOMove(IO_Type.DriveMotor_Run4, IO_VALUE.HIGH);
} }
else else
{ {
IOManager.IOMove(IO_Type.DriveMotor_Run1, IO_VALUE.LOW); LineManager.Line.WriteDrivetMotorRun(IO_VALUE.LOW);
IOManager.IOMove(IO_Type.DriveMotor_Run2, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.DriveMotor_Run3, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.DriveMotor_Run4, IO_VALUE.LOW);
btnDriveMotor_Run.Text = "驱动电机1234正转"; btnDriveMotor_Run.Text = "驱动电机1234正转";
btnDriveMotor_Run.BackColor = Color.White; btnDriveMotor_Run.BackColor = Color.White;
} }
......
source/DeviceLibrary/LineConfig/Config_FeedingEquip_3.csv
...@@ -17,14 +17,14 @@ PRO,0,提升上料轴减速度,BatchAxis_DelSpeed,400,,,,, ...@@ -17,14 +17,14 @@ PRO,0,提升上料轴减速度,BatchAxis_DelSpeed,400,,,,,
PRO,0,提升上料轴原点低速度,BatchAxis_HomeLowSpeed,1500,,,,, PRO,0,提升上料轴原点低速度,BatchAxis_HomeLowSpeed,1500,,,,,
PRO,0,提升上料轴原点高速,BatchAxis_HomeHighSpeed,500,,,,, PRO,0,提升上料轴原点高速,BatchAxis_HomeHighSpeed,500,,,,,
PRO,0,提升上料轴原点加速度,BatchAxis_HomeAddSpeed,500,,,,, PRO,0,提升上料轴原点加速度,BatchAxis_HomeAddSpeed,500,,,,,
PRO,0,提升上料轴P1速度,BatchAxis_P1Speed,400,,,,, PRO,0,提升上料轴P1速度,BatchAxis_P1Speed,2800,,,,,
PRO,0,提升上料轴P2速度,BatchAxis_P2Speed,400,,,,, PRO,0,提升上料轴P2速度,BatchAxis_P2Speed,2500,,,,,
PRO,0,提升上料轴P3速度,BatchAxis_P3Speed,50,,,,, PRO,0,提升上料轴P3速度,BatchAxis_P3Speed,1200,,,,,
PRO,0,提升上料轴高度转换系数（1mm对应的脉冲）,Height_ChangeValue,5000,,,,, PRO,0,提升上料轴高度转换系数（1mm对应的脉冲）,Height_ChangeValue,50000,,,,,
,,,,,,,,, ,,,,,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,6,COM5,0,,, AXIS,0,移栽上下轴,UpDown_Axis,6,COM5,0,,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,2000,,,,, PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,2000,,,,,
PRO,0,移栽上下轴P2移栽机构下降位置,UpDownP2List,0=180000,,,,, PRO,0,移栽上下轴P2移栽机构下降位置,UpDownP2List,0=154010,,,,,
PRO,0,移栽上下轴P3取料位置,UpDownAxisP3,310000,,,,, PRO,0,移栽上下轴P3取料位置,UpDownAxisP3,310000,,,,,
PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,, PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,, PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,,
......
source/LoadCVSLibrary/storeConfig/config/Line_Config.cs
...@@ -65,60 +65,7 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -65,60 +65,7 @@ namespace OnlineStore.LoadCSVLibrary
[ConfigProAttribute("IO_DOLength")] [ConfigProAttribute("IO_DOLength")]
public string IO_DOLength { get; set; } public string IO_DOLength { get; set; }
///// <summary>
///// PRO 模拟量IO模块的IP地址 AIDevice_IP 192.168.200.11
///// </summary>
//[ConfigProAttribute("AIDevice_IP", true)]
//public string AIDevice_IP { get; set; }
///// <summary>
///// PRO 模拟量测高1mm对应的转换值 AI_ConvertPosition 55
///// </summary>
//[ConfigProAttribute("AI_ConvertPosition", true)]
//public int AI_ConvertPosition { get; set; }
///// <summary>
///// PRO,模拟信号1默认高度,AIDI1_DefaultPosition,1,,,,,,,
///// </summary>
//[ConfigProAttribute("AIDI1_DefaultPosition", true)]
//public double AIDI1_DefaultPosition { get; set; }
///// <summary>
///// PRO,模拟信号2默认高度,AIDI2_DefaultPosition,1,,,,,,,
///// </summary>
//[ConfigProAttribute("AIDI2_DefaultPosition", true)]
//public double AIDI2_DefaultPosition { get; set; }
///// <summary>
///// PRO,模拟信号3默认高度,AIDI3_DefaultPosition,1,,,,,,,
///// </summary>
//[ConfigProAttribute("AIDI3_DefaultPosition", true)]
//public double AIDI3_DefaultPosition { get; set; }
///// <summary>
///// PRO,模拟信号4默认高度,AIDI4_DefaultPosition,1,,,,,,,
///// </summary>
//[ConfigProAttribute("AIDI4_DefaultPosition", true)]
//public double AIDI4_DefaultPosition { get; set; }
///// <summary>
///// PRO 模拟信号1的地址 AIDI1_Addr 7
///// </summary>
//[ConfigProAttribute("AIDI1_Addr", true)]
//public int AIDI1_Addr { get; set; }
///// <summary>
///// PRO 模拟信号2的地址 AIDI2_Addr 8
///// </summary>
//[ConfigProAttribute("AIDI2_Addr", true)]
//public int AIDI2_Addr { get; set; }
///// <summary>
///// PRO 模拟信号3的地址 AIDI3_Addr 5
///// </summary>
//[ConfigProAttribute("AIDI3_Addr", true)]
//public int AIDI3_Addr { get; set; }
///// <summary>
///// PRO 模拟信号4的地址 AIDI4_Addr 6
///// </summary>
//[ConfigProAttribute("AIDI4_Addr", true)]
//public int AIDI4_Addr { get; set; }
private Dictionary<string, ushort> DILengthMap = null; private Dictionary<string, ushort> DILengthMap = null;
...@@ -189,8 +136,8 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -189,8 +136,8 @@ namespace OnlineStore.LoadCSVLibrary
{ {
MustHaveDIList = new List<string>(); MustHaveDIList = new List<string>();
MustHaveDOList = new List<string>(); MustHaveDOList = new List<string>();
MustHaveDIList.Add(IO_Type.SuddenStop_BTN); MustHaveDIList.Add(IO_Type.SuddenStop_BTN);
MustHaveDIList.Add(IO_Type.Reset_BTN); MustHaveDIList.Add(IO_Type.Reset_BTN);
MustHaveDIList.Add(IO_Type.Start_BTN); MustHaveDIList.Add(IO_Type.Start_BTN);
MustHaveDIList.Add(IO_Type.Airpressure_Check); MustHaveDIList.Add(IO_Type.Airpressure_Check);
...@@ -199,8 +146,7 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -199,8 +146,7 @@ namespace OnlineStore.LoadCSVLibrary
MustHaveDIList.Add(IO_Type.TopCylinder_UP); MustHaveDIList.Add(IO_Type.TopCylinder_UP);
MustHaveDIList.Add(IO_Type.TopCylinder_Down); MustHaveDIList.Add(IO_Type.TopCylinder_Down);
MustHaveDOList.Add(IO_Type.AutoRun_HddLed); MustHaveDOList.Add(IO_Type.AutoRun_HddLed);
MustHaveDOList.Add(IO_Type.RunSign_HddLed); MustHaveDOList.Add(IO_Type.RunSign_HddLed);
MustHaveDOList.Add(IO_Type.Alarm_HddLed); MustHaveDOList.Add(IO_Type.Alarm_HddLed);
...@@ -214,8 +160,7 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -214,8 +160,7 @@ namespace OnlineStore.LoadCSVLibrary
MustHaveDOList.Add(IO_Type.NGCylinder_After); MustHaveDOList.Add(IO_Type.NGCylinder_After);
MustHaveDOList.Add(IO_Type.TopCylinder_UP); MustHaveDOList.Add(IO_Type.TopCylinder_UP);
MustHaveDOList.Add(IO_Type.TopCylinder_Down); MustHaveDOList.Add(IO_Type.TopCylinder_Down);
} }
} }
} }
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!