Skip to content

李娜 / SO664-HCSingleStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 235c233d 由 张东亮
选项

解决混合尺寸无法选择

1 个父辈 8e408846
全部展开
内嵌 并排
正在显示 8 个修改的文件 包含 56 行增加 和 55 行删除
source/DeviceLibrary/StoreConfig/BoxConfig_1.csv
类型,分类编号,说明,名称,属性值,设备名称,电器定义,目标速度,加速度,减速度,回零低速,回零高速,回零加速度,脉冲最小误差,脉冲最大误差,脉冲最小限位,脉冲最大限位 类型,分类编号,说明,名称,属性值,设备名称,电器定义,目标速度,加速度,减速度,回零低速,回零高速,回零加速度,脉冲最小误差,脉冲最大误差,脉冲最小限位,脉冲最大限位
AXIS,0,（轴一）旋转轴,Middle_Axis,4,HC,,500,1000,1000,30,250,3000,10,100,0,0 AXIS,0,（轴一）旋转轴,Middle_Axis,4,HC,,100,1000,1000,5,50,3000,10,100,0,0
AXIS,0,（轴二）升降轴轴,UpDown_Axis,5,HC,,200,800,800,20,250,3000,10,100,0,0 AXIS,0,（轴二）升降轴轴,UpDown_Axis,5,HC,,200,2000,2000,20,250,3000,10,100,0,0
AXIS,0,（轴三）进出轴,InOut_Axis,6,HC,,5000,5000,5000,200,800,5000,10,100,0,0 AXIS,0,（轴三）进出轴,InOut_Axis,6,HC,,5000,5000,5000,200,800,5000,10,100,0,0
AXIS,0,（轴四）压紧轴,Comp_Axis,7,HC,,30000,15000,15000,3000,5000,10000,10,100,0,0 AXIS,0,（轴四）压紧轴,Comp_Axis,7,HC,,30000,15000,15000,3000,5000,10000,10,100,0,0
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
PRO,0,升降轴（轴2）进料口取料点 P1,UpDownAxis_DoorOPosition_P1,1700,,,,,,,,,,,, PRO,0,升降轴（轴2）进料口取料点 P1,UpDownAxis_DoorOPosition_P1,2730,,,,,,,,,,,,
PRO,0,升降轴（轴2）进料口出料前点 P2,UpDownAxis_DoorIPosition_P2,1750,,,,,,,,,,,, PRO,0,升降轴（轴2）进料口出料前点 P2,UpDownAxis_DoorIPosition_P2,2920,,,,,,,,,,,,
PRO,0,升降轴（轴2）进料口取料缓冲点 P7,UpDownAxis_DoorOBPosition_P7,1750,,,,,,,,,,,, PRO,0,升降轴（轴2）进料口取料缓冲点 P7,UpDownAxis_DoorOBPosition_P7,2920,,,,,,,,,,,,
PRO,0,升降轴（轴2）进料口出料缓冲点 P8,UpDownAxis_DoorIBPosition_P8,1700,,,,,,,,,,,, PRO,0,升降轴（轴2）进料口出料缓冲点 P8,UpDownAxis_DoorIBPosition_P8,2730,,,,,,,,,,,,
PRO,0,旋转轴（轴1）P1 待机原位点,MiddleAxis_P1_Position,930,,,,,,,,,,,, PRO,0,旋转轴（轴1）P1 待机原位点,MiddleAxis_P1_Position,889,,,,,,,,,,,,
PRO,0,进出轴（轴3）P1待机原位点,InOutAxis_P1_Position,100,,,,,,,,,,,, PRO,0,进出轴（轴3）P1待机原位点,InOutAxis_P1_Position,30,,,,,,,,,,,,
PRO,0,压紧轴（轴4）P1待机原位点,CompressAxis_P1_Position,100,,,,,,,,,,,, PRO,0,压紧轴（轴4）P1待机原位点,CompressAxis_P1_Position,5000,,,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
PRO,0,升降轴（轴2）P1速度,UpDownAxis_P1_Speed,1000,,,,,,,,,,,, PRO,0,升降轴（轴2）P1速度,UpDownAxis_P1_Speed,1000,,,,,,,,,,,,
PRO,0,升降轴（轴2）P2速度,UpDownAxis_P2_Speed,500,,,,,,,,,,,, PRO,0,升降轴（轴2）P2速度,UpDownAxis_P2_Speed,500,,,,,,,,,,,,
...@@ -31,8 +31,8 @@ PRO,0,压紧轴（轴4）P3速度,CompAxis_P3_Speed,20000,,,,,,,,,,,, ...@@ -31,8 +31,8 @@ PRO,0,压紧轴（轴4）P3速度,CompAxis_P3_Speed,20000,,,,,,,,,,,,
PRO,0,出入库多少次，会自动重置旋转轴,Box_ResetMCount,1000,,,,,,,,,,,, PRO,0,出入库多少次，会自动重置旋转轴,Box_ResetMCount,1000,,,,,,,,,,,,
PRO,0,出入库多少次，会自动重置所有轴操作,Box_ResetACount,100,,,,,,,,,,,, PRO,0,出入库多少次，会自动重置所有轴操作,Box_ResetACount,100,,,,,,,,,,,,
PRO,0,IO信号超时时间（毫秒）,IOSingle_TimerOut,10000,,,,,,,,,,,, PRO,0,IO信号超时时间（毫秒）,IOSingle_TimerOut,10000,,,,,,,,,,,,
PRO,0,是否使用料盘检测信号,IsUse_Tray_Check,1,,,,,,,,,,,, PRO,0,是否使用料盘检测信号,IsUse_Tray_Check,0,,,,,,,,,,,,
PRO,0,是否调试状态,ISDebug,0,,,,,,,,,,,, PRO,0,是否调试状态,ISDebug,0,,,,,,,,,,,,
PRO,,每次吹气的时间（分钟）,BlowAir_Time,10,,, PRO,,每次吹气的时间（分钟）,BlowAir_Time,10,,,,,,,,,,,,
PRO,,两次吹气间隔（分钟）,BlowAir_Interval,10,,, PRO,,两次吹气间隔（分钟）,BlowAir_Interval,10,,, ,,,,,,,,,
PRO,,温湿度端口号,Humiture_Port,COM5,,, PRO,,温湿度端口号,Humiture_Port,COM5,,,,,,,,,,,,
source/DeviceLibrary/StoreConfig/BoxConfig_2.csv
类型,分类编号,说明,名称,属性值,设备名称,电器定义,目标速度,加速度,减速度,回零低速,回零高速,回零加速度,脉冲最小误差,脉冲最大误差,脉冲最小限位,脉冲最大限位 类型,分类编号,说明,名称,属性值,设备名称,电器定义,目标速度,加速度,减速度,回零低速,回零高速,回零加速度,脉冲最小误差,脉冲最大误差,脉冲最小限位,脉冲最大限位
AXIS,0,（轴一）旋转轴,Middle_Axis,0,HC,,500,1000,1000,30,250,3000,10,100,0,0 AXIS,0,（轴一）旋转轴,Middle_Axis,0,HC,,100,1000,1000,5,50,3000,10,100,0,0
AXIS,0,（轴二）升降轴轴,UpDown_Axis,1,HC,,200,800,800,20,250,3000,10,100,0,0 AXIS,0,（轴二）升降轴轴,UpDown_Axis,1,HC,,200,2000,2000,20,250,3000,10,100,0,0
AXIS,0,（轴三）进出轴,InOut_Axis,2,HC,,5000,5000,5000,200,800,5000,10,100,0,0 AXIS,0,（轴三）进出轴,InOut_Axis,2,HC,,5000,5000,5000,200,800,5000,10,100,0,0
AXIS,0,（轴四）压紧轴,Comp_Axis,3,HC,,30000,15000,15000,3000,5000,10000,10,100,0,0 AXIS,0,（轴四）压紧轴,Comp_Axis,3,HC,,30000,15000,15000,3000,5000,10000,10,100,0,0
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
PRO,0,升降轴（轴2）进料口取料点 P1,UpDownAxis_DoorOPosition_P1,1700,,,,,,,,,,,, PRO,0,升降轴（轴2）进料口取料点 P1,UpDownAxis_DoorOPosition_P1,2750,,,,,,,,,,,,
PRO,0,升降轴（轴2）进料口出料前点 P2,UpDownAxis_DoorIPosition_P2,1750,,,,,,,,,,,, PRO,0,升降轴（轴2）进料口出料前点 P2,UpDownAxis_DoorIPosition_P2,2920,,,,,,,,,,,,
PRO,0,升降轴（轴2）进料口取料缓冲点 P7,UpDownAxis_DoorOBPosition_P7,1750,,,,,,,,,,,, PRO,0,升降轴（轴2）进料口取料缓冲点 P7,UpDownAxis_DoorOBPosition_P7,2920,,,,,,,,,,,,
PRO,0,升降轴（轴2）进料口出料缓冲点 P8,UpDownAxis_DoorIBPosition_P8,1700,,,,,,,,,,,, PRO,0,升降轴（轴2）进料口出料缓冲点 P8,UpDownAxis_DoorIBPosition_P8,2750,,,,,,,,,,,,
PRO,0,旋转轴（轴1）P1 待机原位点,MiddleAxis_P1_Position,930,,,,,,,,,,,, PRO,0,旋转轴（轴1）P1 待机原位点,MiddleAxis_P1_Position,890,,,,,,,,,,,,
PRO,0,进出轴（轴3）P1待机原位点,InOutAxis_P1_Position,100,,,,,,,,,,,, PRO,0,进出轴（轴3）P1待机原位点,InOutAxis_P1_Position,30,,,,,,,,,,,,
PRO,0,压紧轴（轴4）P1待机原位点,CompressAxis_P1_Position,100,,,,,,,,,,,, PRO,0,压紧轴（轴4）P1待机原位点,CompressAxis_P1_Position,5000,,,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
PRO,0,升降轴（轴2）P1速度,UpDownAxis_P1_Speed,1000,,,,,,,,,,,, PRO,0,升降轴（轴2）P1速度,UpDownAxis_P1_Speed,1000,,,,,,,,,,,,
PRO,0,升降轴（轴2）P2速度,UpDownAxis_P2_Speed,500,,,,,,,,,,,, PRO,0,升降轴（轴2）P2速度,UpDownAxis_P2_Speed,500,,,,,,,,,,,,
...@@ -31,8 +31,8 @@ PRO,0,压紧轴（轴4）P3速度,CompAxis_P3_Speed,20000,,,,,,,,,,,, ...@@ -31,8 +31,8 @@ PRO,0,压紧轴（轴4）P3速度,CompAxis_P3_Speed,20000,,,,,,,,,,,,
PRO,0,出入库多少次，会自动重置旋转轴,Box_ResetMCount,1000,,,,,,,,,,,, PRO,0,出入库多少次，会自动重置旋转轴,Box_ResetMCount,1000,,,,,,,,,,,,
PRO,0,出入库多少次，会自动重置所有轴操作,Box_ResetACount,100,,,,,,,,,,,, PRO,0,出入库多少次，会自动重置所有轴操作,Box_ResetACount,100,,,,,,,,,,,,
PRO,0,IO信号超时时间（毫秒）,IOSingle_TimerOut,10000,,,,,,,,,,,, PRO,0,IO信号超时时间（毫秒）,IOSingle_TimerOut,10000,,,,,,,,,,,,
PRO,0,是否使用料盘检测信号,IsUse_Tray_Check,1,,,,,,,,,,,, PRO,0,是否使用料盘检测信号,IsUse_Tray_Check,0,,,,,,,,,,,,
PRO,0,是否调试状态,ISDebug,0,,,,,,,,,,,, PRO,0,是否调试状态,ISDebug,0,,,,,,,,,,,,
PRO,,每次吹气的时间（分钟）,BlowAir_Time,10,,, PRO,,每次吹气的时间（分钟）,BlowAir_Time,10,,,,,,,,,,,,
PRO,,两次吹气间隔（分钟）,BlowAir_Interval,10,,, PRO,,两次吹气间隔（分钟）,BlowAir_Interval,10,,, ,,,,,,,,,
PRO,,温湿度端口号,Humiture_Port,COM5,,, PRO,,温湿度端口号,Humiture_Port,COM5,,,,,,,,,,,,
source/HCSingleStore/App.config
...@@ -19,9 +19,9 @@ ...@@ -19,9 +19,9 @@
<add key="Store_ConfigPath" value="\StoreConfig\StoreConfig.csv" /> <add key="Store_ConfigPath" value="\StoreConfig\StoreConfig.csv" />
<add key="Box_ConfigPath" value="\StoreConfig\BoxConfig.csv" /> <add key="Box_ConfigPath" value="\StoreConfig\BoxConfig.csv" />
<add key="Store_Type" value="RC_AC_SA" /> <add key="Store_Type" value="RC_AC_SA" />
<add key="Store_CID" value="D1" /> <add key="Store_CID" value="D8" />
<add key="Store_CID_1" value="line-ac-01" /> <add key="Store_CID_1" value="line-ac-16" />
<add key="Store_CID_2" value="line-ac-02" /> <add key="Store_CID_2" value="line-ac-15" />
<!--end one store config--> <!--end one store config-->
<add key="ACBaudRate" value="115200" /> <add key="ACBaudRate" value="115200" />
<add key="InOutDefaultPosition" value="5000" /> <add key="InOutDefaultPosition" value="5000" />
......
source/HCSingleStore/FrmBox.Designer.cs
...@@ -314,7 +314,7 @@ ...@@ -314,7 +314,7 @@
this.groupBox1.Controls.Add(this.label43); this.groupBox1.Controls.Add(this.label43);
this.groupBox1.Controls.Add(this.label42); this.groupBox1.Controls.Add(this.label42);
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)));
this.groupBox1.Location = new System.Drawing.Point(11, 452); this.groupBox1.Location = new System.Drawing.Point(11, 456);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(476, 136); this.groupBox1.Size = new System.Drawing.Size(476, 136);
this.groupBox1.TabIndex = 217; this.groupBox1.TabIndex = 217;
...@@ -493,7 +493,7 @@ ...@@ -493,7 +493,7 @@
this.groupBox2.Controls.Add(this.button6); this.groupBox2.Controls.Add(this.button6);
this.groupBox2.Controls.Add(this.button3); this.groupBox2.Controls.Add(this.button3);
this.groupBox2.Controls.Add(this.button5); this.groupBox2.Controls.Add(this.button5);
this.groupBox2.Location = new System.Drawing.Point(11, 368); this.groupBox2.Location = new System.Drawing.Point(11, 372);
this.groupBox2.Name = "groupBox2"; this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(476, 78); this.groupBox2.Size = new System.Drawing.Size(476, 78);
this.groupBox2.TabIndex = 276; this.groupBox2.TabIndex = 276;
...@@ -746,7 +746,7 @@ ...@@ -746,7 +746,7 @@
this.groupInout.Enabled = false; this.groupInout.Enabled = false;
this.groupInout.Location = new System.Drawing.Point(5, 6); this.groupInout.Location = new System.Drawing.Point(5, 6);
this.groupInout.Name = "groupInout"; this.groupInout.Name = "groupInout";
this.groupInout.Size = new System.Drawing.Size(494, 584); this.groupInout.Size = new System.Drawing.Size(899, 584);
this.groupInout.TabIndex = 100; this.groupInout.TabIndex = 100;
this.groupInout.TabStop = false; this.groupInout.TabStop = false;
this.groupInout.Text = "料仓操作"; this.groupInout.Text = "料仓操作";
......
source/HCSingleStore/FrmInOutStore.Designer.cs
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
// comboBoxSize // comboBoxSize
// //
this.comboBoxSize.FormattingEnabled = true; this.comboBoxSize.FormattingEnabled = true;
this.comboBoxSize.Location = new System.Drawing.Point(15, 112); this.comboBoxSize.Location = new System.Drawing.Point(15, 121);
this.comboBoxSize.Name = "comboBoxSize"; this.comboBoxSize.Name = "comboBoxSize";
this.comboBoxSize.Size = new System.Drawing.Size(150, 25); this.comboBoxSize.Size = new System.Drawing.Size(150, 25);
this.comboBoxSize.TabIndex = 5; this.comboBoxSize.TabIndex = 5;
...@@ -206,6 +206,7 @@ ...@@ -206,6 +206,7 @@
this.cmbPosition.Name = "cmbPosition"; this.cmbPosition.Name = "cmbPosition";
this.cmbPosition.Size = new System.Drawing.Size(150, 25); this.cmbPosition.Size = new System.Drawing.Size(150, 25);
this.cmbPosition.TabIndex = 2; this.cmbPosition.TabIndex = 2;
this.cmbPosition.SelectedIndexChanged += new System.EventHandler(this.cmbPosition_SelectedIndexChanged);
// //
// btnStartAuto // btnStartAuto
// //
......
source/HCSingleStore/FrmInOutStore.cs
...@@ -142,10 +142,6 @@ namespace OnlineStore.ACSingleStore ...@@ -142,10 +142,6 @@ namespace OnlineStore.ACSingleStore
comboBoxSize.SelectedIndex = 0; comboBoxSize.SelectedIndex = 0;
} }
cmbPosition.DataSource = PositionInfo.PositionDic[comboBoxSize.SelectedItem.ToString()];
PositionNumList = PositionInfo.PositionDic[comboBoxSize.SelectedItem.ToString()];
cmbPosition.SelectedIndex = 0;
} }
/// <summary> /// <summary>
...@@ -161,7 +157,7 @@ namespace OnlineStore.ACSingleStore ...@@ -161,7 +157,7 @@ namespace OnlineStore.ACSingleStore
store.StartRun(); store.StartRun();
if (store.storeRunStatus >= StoreRunStatus.HomeMoving) if (store.storeRunStatus >= StoreRunStatus.HomeMoving)
{ {
StoreOpenStatus(true); //StoreOpenStatus(true);
} }
} }
else else
...@@ -179,7 +175,8 @@ namespace OnlineStore.ACSingleStore ...@@ -179,7 +175,8 @@ namespace OnlineStore.ACSingleStore
return; return;
} }
preOpen = isOpen; preOpen = isOpen;
cmbPosition.Enabled = !isOpen;
comboBoxSize.Enabled = !isOpen;
btnOutStore.Enabled = !isOpen; btnOutStore.Enabled = !isOpen;
btnStoreStart.Enabled = !isOpen; btnStoreStart.Enabled = !isOpen;
...@@ -192,20 +189,6 @@ namespace OnlineStore.ACSingleStore ...@@ -192,20 +189,6 @@ namespace OnlineStore.ACSingleStore
{ {
if (btnStartAuto.Text == StartAuto) if (btnStartAuto.Text == StartAuto)
{ {
if (needToInStoreNumList.Count > 0)
{
needToInStoreNumList.Clear();
}
if (PositionNumList.Count > 0)
{
PositionNumList.Clear();
}
for (int i = cmbPosition.SelectedIndex; i < store.PositionNumList.Count; i++)
{
needToInStoreNumList.Add(store.PositionNumList[i]);
PositionNumList.Add(store.PositionNumList[i]);
}
IsRun = true; IsRun = true;
StoreOpenStatus(true); StoreOpenStatus(true);
btnStartAuto.Text = StopAuto; btnStartAuto.Text = StopAuto;
...@@ -1207,9 +1190,26 @@ namespace OnlineStore.ACSingleStore ...@@ -1207,9 +1190,26 @@ namespace OnlineStore.ACSingleStore
private void comboBoxSize_SelectedIndexChanged(object sender, EventArgs e) private void comboBoxSize_SelectedIndexChanged(object sender, EventArgs e)
{ {
cmbPosition.DataSource = PositionInfo.PositionDic[comboBoxSize.SelectedItem.ToString()]; cmbPosition.DataSource = PositionInfo.PositionDic[comboBoxSize.SelectedItem.ToString()];
PositionNumList=PositionInfo.PositionDic[comboBoxSize.SelectedItem.ToString()];
cmbPosition.SelectedIndex = 0; cmbPosition.SelectedIndex = 0;
} }
private void cmbPosition_SelectedIndexChanged(object sender, EventArgs e)
{
if (needToInStoreNumList.Count > 0)
{
needToInStoreNumList.Clear();
}
if (PositionNumList.Count > 0)
{
PositionNumList.Clear();
}
for (int i = cmbPosition.SelectedIndex; i < cmbPosition.Items.Count; i++)
{
needToInStoreNumList.Add(cmbPosition.Items[i].ToString());
PositionNumList.Add(cmbPosition.Items[i].ToString());
}
}
} }
class PositionInfo class PositionInfo
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!