Skip to content

孙克 / ACSingleStore

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

位置保存bug修改

1 个父辈 048c06ea
内嵌 并排
正在显示 5 个修改的文件 包含 34 行增加 和 72 行删除
source/ACSingleStore/FrmIOStatus.Designer.cs
...@@ -34,11 +34,9 @@ ...@@ -34,11 +34,9 @@
this.btnWriteSingleDO = new System.Windows.Forms.Button(); this.btnWriteSingleDO = new System.Windows.Forms.Button();
this.txtWriteTime = new System.Windows.Forms.TextBox(); this.txtWriteTime = new System.Windows.Forms.TextBox();
this.label5 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label();
this.btnReadAllDi = new System.Windows.Forms.Button();
this.cmbWriteValue = new System.Windows.Forms.ComboBox(); this.cmbWriteValue = new System.Windows.Forms.ComboBox();
this.label6 = new System.Windows.Forms.Label(); this.label6 = new System.Windows.Forms.Label();
this.cmbWriteIO = new System.Windows.Forms.ComboBox(); this.cmbWriteIO = new System.Windows.Forms.ComboBox();
this.btnReadAllDo = new System.Windows.Forms.Button();
this.btnCloseDoor = new System.Windows.Forms.Button(); this.btnCloseDoor = new System.Windows.Forms.Button();
this.btnOpenDoor = new System.Windows.Forms.Button(); this.btnOpenDoor = new System.Windows.Forms.Button();
this.button1 = new System.Windows.Forms.Button(); this.button1 = new System.Windows.Forms.Button();
...@@ -96,11 +94,9 @@ ...@@ -96,11 +94,9 @@
this.groupBox1.Controls.Add(this.btnWriteSingleDO); this.groupBox1.Controls.Add(this.btnWriteSingleDO);
this.groupBox1.Controls.Add(this.txtWriteTime); this.groupBox1.Controls.Add(this.txtWriteTime);
this.groupBox1.Controls.Add(this.label5); this.groupBox1.Controls.Add(this.label5);
this.groupBox1.Controls.Add(this.btnReadAllDi);
this.groupBox1.Controls.Add(this.cmbWriteValue); this.groupBox1.Controls.Add(this.cmbWriteValue);
this.groupBox1.Controls.Add(this.label6); this.groupBox1.Controls.Add(this.label6);
this.groupBox1.Controls.Add(this.cmbWriteIO); this.groupBox1.Controls.Add(this.cmbWriteIO);
this.groupBox1.Controls.Add(this.btnReadAllDo);
this.groupBox1.Controls.Add(this.btnCloseDoor); this.groupBox1.Controls.Add(this.btnCloseDoor);
this.groupBox1.Controls.Add(this.btnOpenDoor); this.groupBox1.Controls.Add(this.btnOpenDoor);
this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
...@@ -284,18 +280,6 @@ ...@@ -284,18 +280,6 @@
this.label5.Text = "定时(ms):"; this.label5.Text = "定时(ms):";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// btnReadAllDi
//
this.btnReadAllDi.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnReadAllDi.Location = new System.Drawing.Point(69, 126);
this.btnReadAllDi.Name = "btnReadAllDi";
this.btnReadAllDi.Size = new System.Drawing.Size(111, 26);
this.btnReadAllDi.TabIndex = 244;
this.btnReadAllDi.Text = "读取所有DI";
this.btnReadAllDi.UseVisualStyleBackColor = true;
this.btnReadAllDi.Visible = false;
this.btnReadAllDi.Click += new System.EventHandler(this.btnReadAllDi_Click);
//
// cmbWriteValue // cmbWriteValue
// //
this.cmbWriteValue.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawVariable; this.cmbWriteValue.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawVariable;
...@@ -337,18 +321,6 @@ ...@@ -337,18 +321,6 @@
this.cmbWriteIO.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.cmbWriteIO_DrawItem); this.cmbWriteIO.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.cmbWriteIO_DrawItem);
this.cmbWriteIO.SelectedIndexChanged += new System.EventHandler(this.cmbWriteIO_SelectedIndexChanged); this.cmbWriteIO.SelectedIndexChanged += new System.EventHandler(this.cmbWriteIO_SelectedIndexChanged);
// //
// btnReadAllDo
//
this.btnReadAllDo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnReadAllDo.Location = new System.Drawing.Point(226, 126);
this.btnReadAllDo.Name = "btnReadAllDo";
this.btnReadAllDo.Size = new System.Drawing.Size(111, 26);
this.btnReadAllDo.TabIndex = 245;
this.btnReadAllDo.Text = "读取所有DO";
this.btnReadAllDo.UseVisualStyleBackColor = true;
this.btnReadAllDo.Visible = false;
this.btnReadAllDo.Click += new System.EventHandler(this.btnReadAllDo_Click);
//
// btnCloseDoor // btnCloseDoor
// //
this.btnCloseDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCloseDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
...@@ -718,8 +690,6 @@ ...@@ -718,8 +690,6 @@
private System.Windows.Forms.CheckBox chbAutoRead; private System.Windows.Forms.CheckBox chbAutoRead;
private System.Windows.Forms.TextBox txtSlaveId; private System.Windows.Forms.TextBox txtSlaveId;
private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label2;
private System.Windows.Forms.Button btnReadAllDi;
private System.Windows.Forms.Button btnReadAllDo;
private System.Windows.Forms.TextBox txtDoName; private System.Windows.Forms.TextBox txtDoName;
private System.Windows.Forms.Button btnCloseDoor; private System.Windows.Forms.Button btnCloseDoor;
private System.Windows.Forms.Button btnOpenDoor; private System.Windows.Forms.Button btnOpenDoor;
......
source/DeviceLibrary/StoreConfig/AC/StoreConfig.csv
...@@ -39,28 +39,28 @@ AXIS,（轴一）旋转轴,Middle_Axis,1,COM2,0,,,,, ...@@ -39,28 +39,28 @@ AXIS,（轴一）旋转轴,Middle_Axis,1,COM2,0,,,,,
AXIS,（轴二）升降轴轴,UpDown_Axis,2,COM2,0,,,,, AXIS,（轴二）升降轴轴,UpDown_Axis,2,COM2,0,,,,,
AXIS,（轴三）进出轴,InOut_Axis,3,COM2,0,,,,, AXIS,（轴三）进出轴,InOut_Axis,3,COM2,0,,,,,
AXIS,（轴四）压紧轴,Comp_Axis,4,COM2,0,,,,, AXIS,（轴四）压紧轴,Comp_Axis,4,COM2,0,,,,,
PRO,升降轴 进料口取料点 P1,UpDownAxis_DoorOPosition_P1,403000,,,,,,, PRO,升降轴 进料口取料点 P1,UpDownAxis_DoorOPosition_P1,380000,,,,,,,
PRO,升降轴 进料口出料前点 P2,UpDownAxis_DoorIPosition_P2,415000,,,,,,, PRO,升降轴 进料口出料前点 P2,UpDownAxis_DoorIPosition_P2,394000,,,,,,,
PRO,升降轴 进料口取料缓冲点 P7,UpDownAxis_DoorOBPosition_P7,415000,,,,,,, PRO,升降轴 进料口取料缓冲点 P7,UpDownAxis_DoorOBPosition_P7,394000,,,,,,,
PRO,升降轴 进料口出料缓冲点 P8,UpDownAxis_DoorIBPosition_P8,403000,,,,,,, PRO,升降轴 进料口出料缓冲点 P8,UpDownAxis_DoorIBPosition_P8,380000,,,,,,,
PRO,旋转轴（轴1）P1 待机原位点,MiddleAxis_P1_Position,268093,,,,,,, PRO,旋转轴（轴1）P1 待机原位点,MiddleAxis_P1_Position,266793,,,,,,,
PRO,进出轴（轴3）P1待机原位点,InOutAxis_P1_Position,1000,,,,,,, PRO,进出轴（轴3）P1待机原位点,InOutAxis_P1_Position,0,,,,,,,
PRO,压紧轴（轴4）P1待机原位点,CompressAxis_P1_Position,2000,,,,,,, PRO,压紧轴（轴4）P1待机原位点,CompressAxis_P1_Position,2000,,,,,,,
PRO,是否使用定位气缸,IsHasLocationCylinder,0,,,,,,, PRO,是否使用定位气缸,IsHasLocationCylinder,0,,,,,,,
PRO,是否有左右侧门,IsHasDoorLimit,1,,,,,,, PRO,是否有左右侧门,IsHasDoorLimit,1,,,,,,,
PRO,是否使用压紧轴（1=使用）,IsHasCompress_Axis,1,,,,, ,, PRO,是否使用压紧轴（1=使用）,IsHasCompress_Axis,1,,,,, ,,
PRO,设备是否处于调试状态（1=调试，0=正常）,IsInDebug,0,,,,,,, PRO,设备是否处于调试状态（1=调试，0=正常）,IsInDebug,1,,,,,,,
PRO,气压检测IO关闭需要持续的时间,AirCheckSeconds,3,,,,,,, PRO,气压检测IO关闭需要持续的时间,AirCheckSeconds,3,,,,,,,
,温湿度传感器地址,TemperateServer_Port,9001,,,,,,, ,温湿度传感器地址,TemperateServer_Port,9001,,,,,,,
PRO,预警温度,WarnTemperate,80,,,,,,, PRO,预警温度,WarnTemperate,80,,,,,,,
PRO,预警湿度,WarnHumidity,80,,,,,,, PRO,预警湿度,WarnHumidity,80,,,,,,,
PRO,（轴一）旋转轴目标速度,MiddleAxis_TargetSpeed,250,,,,,,, PRO,（轴一）旋转轴目标速度,MiddleAxis_TargetSpeed,250,,,,,,,
PRO,（轴一）旋转轴加速度,MiddleAxis_AddSpeed,80,,,,,,, PRO,（轴一）旋转轴加速度,MiddleAxis_AddSpeed,2000,,,,,,,
PRO,（轴一）旋转轴减速度,MiddleAxis_DelSpeed,80,,,,,,, PRO,（轴一）旋转轴减速度,MiddleAxis_DelSpeed,2000,,,,,,,
PRO,（轴一）旋转轴原点低速度,MiddleAxis_HomeLowSpeed,80,,,,,,, PRO,（轴一）旋转轴原点低速度,MiddleAxis_HomeLowSpeed,80,,,,,,,
PRO,（轴一）旋转轴原点高速,MiddleAxis_HomeHighSpeed,60,,,,,,, PRO,（轴一）旋转轴原点高速,MiddleAxis_HomeHighSpeed,60,,,,,,,
PRO,（轴一）旋转轴原点加速度,MiddleAxis_HomeAddSpeed,50,,,,,,, PRO,（轴一）旋转轴原点加速度,MiddleAxis_HomeAddSpeed,50,,,,,,,
PRO,（轴二）升降轴轴目标速度,UpdownAxis_TargetSpeed,150,,,,,,, PRO,（轴二）升降轴轴目标速度,UpdownAxis_TargetSpeed,2000,,,,,,,
PRO,（轴二）升降轴轴加速度,UpdownAxis_AddSpeed,400,,,,,,, PRO,（轴二）升降轴轴加速度,UpdownAxis_AddSpeed,400,,,,,,,
PRO,（轴二）升降轴轴减速度,UpdownAxis_DelSpeed,400,,,,,,, PRO,（轴二）升降轴轴减速度,UpdownAxis_DelSpeed,400,,,,,,,
PRO,（轴二）升降轴轴原点低速度,UpdownAxis_HomeLowSpeed,100,,,,,,, PRO,（轴二）升降轴轴原点低速度,UpdownAxis_HomeLowSpeed,100,,,,,,,
...@@ -79,30 +79,30 @@ PRO,（轴四）压紧轴原点低速,CompAxis_HomeLowSpeed,20,,,,,,, ...@@ -79,30 +79,30 @@ PRO,（轴四）压紧轴原点低速,CompAxis_HomeLowSpeed,20,,,,,,,
PRO,（轴四）压紧轴原点高速,CompAxis_HomeHighSpeed,60,,,,,,, PRO,（轴四）压紧轴原点高速,CompAxis_HomeHighSpeed,60,,,,,,,
PRO,（轴四）压紧轴原点加速度,CompAxis_HomeAddSpeed,200,,,,,,, PRO,（轴四）压紧轴原点加速度,CompAxis_HomeAddSpeed,200,,,,,,,
,,,,,,,,,, ,,,,,,,,,,
PRO,升降轴（轴2）P1速度,UpDownAxis_P1_Speed,250,,,,,,, PRO,升降轴（轴2）P1速度,UpDownAxis_P1_Speed,800,,,,,,,
PRO,升降轴（轴2）P2速度,UpDownAxis_P2_Speed,250,,,,,,, PRO,升降轴（轴2）P2速度,UpDownAxis_P2_Speed,800,,,,,,,
PRO,升降轴（轴2）P3速度,UpDownAxis_P3_Speed,250,,,,,,, PRO,升降轴（轴2）P3速度,UpDownAxis_P3_Speed,800,,,,,,,
PRO,升降轴（轴2）P4速度,UpDownAxis_P4_Speed,150,,,,,,, PRO,升降轴（轴2）P4速度,UpDownAxis_P4_Speed,300,,,,,,,
PRO,升降轴（轴2）P5速度,UpDownAxis_P5_Speed,250,,,,,,, PRO,升降轴（轴2）P5速度,UpDownAxis_P5_Speed,800,,,,,,,
PRO,升降轴（轴2）P6速度,UpDownAxis_P6_Speed,100,,,,,,, PRO,升降轴（轴2）P6速度,UpDownAxis_P6_Speed,300,,,,,,,
PRO,升降轴（轴2）P7速度,UpDownAxis_P7_Speed,100,,,,,, , PRO,升降轴（轴2）P7速度,UpDownAxis_P7_Speed,300,,,,,, ,
PRO,升降轴（轴2）P8速度,UpDownAxis_P8_Speed,100,,,,,,, PRO,升降轴（轴2）P8速度,UpDownAxis_P8_Speed,300,,,,,,,
PRO,旋转轴（轴1）P1速度,MiddleAxis_P1_Speed,120,,,,,,, PRO,旋转轴（轴1）P1速度,MiddleAxis_P1_Speed,300,,,,,,,
PRO,旋转轴（轴1）P2速度,MiddleAxis_P2_Speed,120,,,,,,, PRO,旋转轴（轴1）P2速度,MiddleAxis_P2_Speed,300,,,,,,,
PRO,进出轴（轴3）P1速度,InOutAxis_P1_Speed,100,,,,,,, PRO,进出轴（轴3）P1速度,InOutAxis_P1_Speed,300,,,,,,,
PRO,进出轴（轴3）P2速度,InOutAxis_P2_Speed,100,,,,,,, PRO,进出轴（轴3）P2速度,InOutAxis_P2_Speed,300,,,,,,,
PRO,进出轴（轴3）P3速度,InOutAxis_P3_Speed,1000,,,,,,, PRO,进出轴（轴3）P3速度,InOutAxis_P3_Speed,300,,,,,,,
PRO,压紧轴（轴4）P1速度,CompAxis_P1_Speed,100,,,,,,, PRO,压紧轴（轴4）P1速度,CompAxis_P1_Speed,800,,,,,,,
PRO,压紧轴（轴4）P2速度,CompAxis_P2_Speed,100,,,,,,, PRO,压紧轴（轴4）P2速度,CompAxis_P2_Speed,800,,,,,,,
PRO,压紧轴（轴4）P3速度,CompAxis_P3_Speed,100,,,,,,, PRO,压紧轴（轴4）P3速度,CompAxis_P3_Speed,800,,,,,,,
PRO,（轴一）旋转轴停止时可误差的脉冲数的最小值,MiddleAxis_ErrorCountMin,10,,,,,,, PRO,（轴一）旋转轴停止时可误差的脉冲数的最小值,MiddleAxis_ErrorCountMin,10,,,,,,,
PRO,（轴二）升降轴轴停止时可误差的脉冲数的最小值,UpdownAxis_ErrorCountMin,10,,,,,, , PRO,（轴二）升降轴轴停止时可误差的脉冲数的最小值,UpdownAxis_ErrorCountMin,10,,,,,, ,
PRO,（轴三）进出轴停止时可误差的脉冲数的最小值,InoutAxis_ErrorCountMin,10,,,,,,, PRO,（轴三）进出轴停止时可误差的脉冲数的最小值,InoutAxis_ErrorCountMin,100,,,,,,,
PRO,（轴一）旋转轴停止时可误差的脉冲数的最大值,MiddleAxis_ErrorCountMax,1000,,,,,,, PRO,（轴一）旋转轴停止时可误差的脉冲数的最大值,MiddleAxis_ErrorCountMax,1000,,,,,,,
PRO,（轴二）升降轴轴停止时可误差的脉冲数的最大值,UpdownAxis_ErrorCountMax,1000,,,,,,, PRO,（轴二）升降轴轴停止时可误差的脉冲数的最大值,UpdownAxis_ErrorCountMax,1000,,,,,,,
PRO,（轴三）进出轴停止时可误差的脉冲数的最大值,InoutAxis_ErrorCountMax,1000,,,,,,, PRO,（轴三）进出轴停止时可误差的脉冲数的最大值,InoutAxis_ErrorCountMax,1000,,,,,,,
PRO,出入库多少次，会自动重置旋转轴,Box_ResetMCount,1000,,,,,,, PRO,出入库多少次，会自动重置旋转轴,Box_ResetMCount,1000,,,,,,,
PRO,出入库多少次，会自动重置所有轴操作,Box_ResetACount,100,,,,,,, PRO,出入库多少次，会自动重置所有轴操作,Box_ResetACount,1000,,,,,,,
PRO,IO信号超时时间（毫秒）,IOSingle_TimerOut,10000,,,,,,, PRO,IO信号超时时间（毫秒）,IOSingle_TimerOut,10000,,,,,,,
PRO,是否使用料盘检测信号,IsUse_Tray_Check,0,,,,,, , PRO,是否使用料盘检测信号,IsUse_Tray_Check,0,,,,,, ,
PRO,（轴一）旋转轴最小限位,MiddleAxis_PositionMin,0,,,,,,, PRO,（轴一）旋转轴最小限位,MiddleAxis_PositionMin,0,,,,,,,
...@@ -118,8 +118,8 @@ PRO,两次吹气间隔（分钟）,BlowAir_Interval,10,,,,,,, ...@@ -118,8 +118,8 @@ PRO,两次吹气间隔（分钟）,BlowAir_Interval,10,,,,,,,
PRO,温湿度端口号,Humiture_Port,COM1,,,,,,, PRO,温湿度端口号,Humiture_Port,COM1,,,,,,,
,,,,,,,,, , ,,,,,,,,, ,
PRO,模拟量IO模块的IP地址,AIDevice_IP,192.168.200.22,,,,,,, PRO,模拟量IO模块的IP地址,AIDevice_IP,192.168.200.22,,,,,,,
PRO,模拟信号1默认高度,AIDI1_DefaultPosition,2920,,,,,,, PRO,模拟信号1默认高度,AIDI1_DefaultPosition,18031,,,,,,,
PRO,模拟信号2默认高度,AIDI2_DefaultPosition,2960,,,,,,, PRO,模拟信号2默认高度,AIDI2_DefaultPosition,18064,,,,,,,
PRO,模拟信号3默认高度,AIDI3_DefaultPosition,2500,,,,,,, PRO,模拟信号3默认高度,AIDI3_DefaultPosition,2500,,,,,,,
PRO,模拟信号4默认高度,AIDI4_DefaultPosition,2500,,,,,,, PRO,模拟信号4默认高度,AIDI4_DefaultPosition,2500,,,,,,,
,,,,,,,,, , ,,,,,,,,, ,
...@@ -128,7 +128,7 @@ PRO,模拟信号2的地址,AIDI2_Addr,1,,,,,,, ...@@ -128,7 +128,7 @@ PRO,模拟信号2的地址,AIDI2_Addr,1,,,,,,,
PRO,模拟信号3的地址(13寸高度),AIDI3_Addr,2,,,,,,, PRO,模拟信号3的地址(13寸高度),AIDI3_Addr,2,,,,,,,
PRO,模拟信号4的地址(15寸高度),AIDI4_Addr,3,,,,,,, PRO,模拟信号4的地址(15寸高度),AIDI4_Addr,3,,,,,,,
,,,,,,,,, , ,,,,,,,,, ,
PRO,模拟转换系数,AI_ConvertPosition,55,,,,,,, PRO,模拟转换系数,AI_ConvertPosition,150,,,,,,,
,,,,,,,,, , ,,,,,,,,, ,
PRO,默认的料盘宽度（多种尺寸为0）,Default_TrayWidth,0,,,,,,, PRO,默认的料盘宽度（多种尺寸为0）,Default_TrayWidth,0,,,,,,,
PRO,特殊二维码尺寸配置,CodeSizeConfig,XA=13x48#XB=13x32,,,,,,, PRO,特殊二维码尺寸配置,CodeSizeConfig,XA=13x48#XB=13x32,,,,,,,
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
...@@ -910,21 +910,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -910,21 +910,13 @@ namespace OnlineStore.DeviceLibrary
Reset(false); Reset(false);
autoMsg = "自动出库：" + posid; autoMsg = "自动出库：" + posid;
AddWaitOutInfo(new FixtureCodeInfo(0, "", posid)); AddWaitOutInfo(new FixtureCodeInfo(0, "", posid));
} }
//else if (CurrInOutCount >= Config.Box_ResetMCount)
//{
// LogUtil.info(LOGGER, StoreName + "自动进入下一个出库：posid=" + posid + ",当时已经出入库" + CurrInOutCount + "次，需要重置BOX旋转轴，先把出库信息存入排队列表中");
// //ResetMiddleAxis(false);
// autoMsg = "自动出库：" + posid;
// AddWaitOutInfo(new FixtureCodeInfo(0, "", posid));
//}
else else
{ {
LogUtil.info(LOGGER, StoreName + "自动进入下一个出库：posid=" + posid); LogUtil.info(LOGGER, StoreName + "自动进入下一个出库：posid=" + posid);
autoMsg = "自动出库：" + posid; autoMsg = "自动出库：" + posid;
StartOutStoreMove(new InOutStoreParam("", posid)); StartOutStoreMove(new InOutStoreParam("", posid));
} }
//}
} }
else if (storeMoveType.Equals(StoreMoveType.OutStore)) else if (storeMoveType.Equals(StoreMoveType.OutStore))
{ {
......
source/LoadCVSLibrary/position/CSVPositionReader.cs
...@@ -175,7 +175,7 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -175,7 +175,7 @@ namespace OnlineStore.LoadCSVLibrary
} }
else else
{ {
if (array.Length == titleIndex.Count) if (array.Length >= titleIndex.Count)
{ {
if (csvIndex < 0) if (csvIndex < 0)
{ {
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!