Skip to content

孙克 / ACSingleStore

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

去掉压紧轴代码

1 个父辈 74dfb385
内嵌 并排
正在显示 8 个修改的文件 包含 185 行增加 和 180 行删除
source/ACSingleStore/FrmAxisDebug.cs
......@@ -31,10 +31,10 @@ namespace OnlineStore.ACSingleStore
middle = boxBean.Config.Middle_Axis;
updown = boxBean.Config.UpDown_Axis;
compress_Slv = boxBean.Config.CompressAxis_Slv;
//compress_Slv = boxBean.Config.CompressAxis_Slv;
inout = boxBean.Config.InOut_Axis;
InitializeComponent();
txtComSpeed.Text = boxBean.Config.CompressAxis_EndSpeed.ToString();
//txtComSpeed.Text = boxBean.Config.CompressAxis_EndSpeed.ToString();
this.Text = boxBean.StoreName + "_轴点动调试";
}
......
source/ACSingleStore/FrmAxisMoveConfig.cs
......@@ -69,11 +69,11 @@ namespace OnlineStore.ACSingleStore
txtURSpeed.Text = boxBean.Config.UpdownAxis_ResolveSpeed.ToString();
//txtCRSpeed.Text = boxBean.Config.CompressAxis_ResolveSpeed.ToString();
txtAddSpeed.Text = boxBean.Config.CompressAxis_AddSpeed.ToString();
txtDelSpeed.Text = boxBean.Config.CompressAxis_DelSpeed.ToString();
txtMaxSpeed.Text = boxBean.Config.CompressAxis_MaxSpeed.ToString();
txtBeginSpeed.Text = boxBean.Config.CompressAxis_StartSpeed.ToString();
txtTargetSpeed.Text = boxBean.Config.CompressAxis_EndSpeed.ToString();
//txtAddSpeed.Text = boxBean.Config.CompressAxis_AddSpeed.ToString();
//txtDelSpeed.Text = boxBean.Config.CompressAxis_DelSpeed.ToString();
//txtMaxSpeed.Text = boxBean.Config.CompressAxis_MaxSpeed.ToString();
//txtBeginSpeed.Text = boxBean.Config.CompressAxis_StartSpeed.ToString();
//txtTargetSpeed.Text = boxBean.Config.CompressAxis_EndSpeed.ToString();
//this.txtCDtime.Text = boxBean.Config.CompressAxis_DecelTime.ToString();
//this.txtCSpeed.Text = boxBean.Config.CompressAxis_TargetSpeed.ToString();
......@@ -125,23 +125,20 @@ namespace OnlineStore.ACSingleStore
boxBean.Config.MiddleAxis_ErrorCountMax = FormUtil.GetShortValue(txtMiddleMax);
boxBean.Config.UpdownAxis_ErrorCountMax = FormUtil.GetShortValue(txtUpdownMax);
boxBean.Config.InoutAxis_ErrorCountMax = FormUtil.GetShortValue(txtInoutMax);
//boxBean.Config.CompressAxis_ErrorCountMax = FormUtil.GetShortValue(txtComMax);
boxBean.Config.InoutAxis_ErrorCountMax = FormUtil.GetShortValue(txtInoutMax);
boxBean.Config.MiddleAxis_ErrorCountMin = FormUtil.GetShortValue(txtMiddleMin);
boxBean.Config.UpdownAxis_ErrorCountMin = FormUtil.GetShortValue(txtUpdownMin);
boxBean.Config.InoutAxis_ErrorCountMin = FormUtil.GetShortValue(txtInoutMin);
//boxBean.Config.CompressAxis_ErrorCountMin = FormUtil.GetShortValue(txtComMin);
boxBean.Config.InoutAxis_ErrorCountMin = FormUtil.GetShortValue(txtInoutMin);
boxBean.Config.MiddleAxis_ResolveSpeed = FormUtil.GetShortValue(txtMRSpeed);
boxBean.Config.InoutAxis_ResolveSpeed = FormUtil.GetShortValue(txtIRSpeed);
boxBean.Config.UpdownAxis_ResolveSpeed = FormUtil.GetShortValue(txtURSpeed);
//boxBean.Config.CompressAxis_ResolveSpeed = FormUtil.GetShortValue(txtCRSpeed);
boxBean.Config.CompressAxis_StartSpeed = FormUtil.GetIntValue(txtBeginSpeed);
boxBean.Config.CompressAxis_AddSpeed = FormUtil.GetIntValue(txtAddSpeed);
boxBean.Config.CompressAxis_DelSpeed = FormUtil.GetIntValue(txtDelSpeed);
boxBean.Config.CompressAxis_EndSpeed = FormUtil.GetIntValue(txtTargetSpeed);
boxBean.Config.CompressAxis_MaxSpeed = FormUtil.GetIntValue(txtMaxSpeed);
boxBean.Config.UpdownAxis_ResolveSpeed = FormUtil.GetShortValue(txtURSpeed);
//boxBean.Config.CompressAxis_StartSpeed = FormUtil.GetIntValue(txtBeginSpeed);
//boxBean.Config.CompressAxis_AddSpeed = FormUtil.GetIntValue(txtAddSpeed);
//boxBean.Config.CompressAxis_DelSpeed = FormUtil.GetIntValue(txtDelSpeed);
//boxBean.Config.CompressAxis_EndSpeed = FormUtil.GetIntValue(txtTargetSpeed);
//boxBean.Config.CompressAxis_MaxSpeed = FormUtil.GetIntValue(txtMaxSpeed);
//boxBean.Config.CompressAxis_TargetSpeed = FormUtil.GetIntValue(txtCSpeed);
//boxBean.Config.CompressAxis_AccelTime = FormUtil.GetShortValue(txtCAtime);
//boxBean.Config.CompressAxis_DecelTime = FormUtil.GetShortValue(txtCDtime);
......
source/ACSingleStore/FrmStoreBox.cs
......@@ -91,24 +91,24 @@ namespace OnlineStore.ACSingleStore
List<string> port = new List<string>(SerialPort.GetPortNames());
comboBoxPortName.DataSource = port;
if (port.IndexOf(store.Config.CompressAxis_PortName) >= 0)
{
comboBoxPortName.SelectedIndex = port.IndexOf(store.Config.CompressAxis_PortName);
}
//if (port.IndexOf(store.Config.CompressAxis_PortName) >= 0)
//{
// comboBoxPortName.SelectedIndex = port.IndexOf(store.Config.CompressAxis_PortName);
//}
List<int> boteList = new List<int>();
boteList.Add(300);
boteList.Add(600);
boteList.Add(1200);
boteList.Add(4800);
boteList.Add(9600);
boteList.Add(19200);
boteList.Add(38400);
boteList.Add(57600);
boteList.Add(115200);
boteList.Add(230400);
txtAddr.Text = this.store.Config.CompressAxis_Slv.ToString();
//List<int> boteList = new List<int>();
//boteList.Add(300);
//boteList.Add(600);
//boteList.Add(1200);
//boteList.Add(4800);
//boteList.Add(9600);
//boteList.Add(19200);
//boteList.Add(38400);
//boteList.Add(57600);
//boteList.Add(115200);
//boteList.Add(230400);
//txtAddr.Text = this.store.Config.CompressAxis_Slv.ToString();
timer1.Enabled = true;
}
#endregion
......@@ -708,20 +708,20 @@ namespace OnlineStore.ACSingleStore
private void btnComP2_Click(object sender, EventArgs e)
{
int value = FormUtil.GetIntValue(txtComP2);
ShuoKeControls.AbsMove(store.Config.CompressAxis_Slv, value);
//int value = FormUtil.GetIntValue(txtComP2);
//ShuoKeControls.AbsMove(store.Config.CompressAxis_Slv, value);
}
private void btnComP1_Click(object sender, EventArgs e)
{
int value = FormUtil.GetIntValue(txtComP1);
ShuoKeControls.AbsMove(store.Config.CompressAxis_Slv, value);
//int value = FormUtil.GetIntValue(txtComP1);
//ShuoKeControls.AbsMove(store.Config.CompressAxis_Slv, value);
}
private void btnComP3_Click(object sender, EventArgs e)
{
int value = FormUtil.GetIntValue(txtComP3);
ShuoKeControls.AbsMove(store.Config.CompressAxis_Slv, value);
//int value = FormUtil.GetIntValue(txtComP3);
//ShuoKeControls.AbsMove(store.Config.CompressAxis_Slv, value);
}
int xWidth = SystemInformation.PrimaryMonitorSize.Width;//获取显示器屏幕宽度
int yHeight = SystemInformation.PrimaryMonitorSize.Height;//高度
......@@ -784,34 +784,34 @@ namespace OnlineStore.ACSingleStore
}
private void btnVolMove_Click(object sender, EventArgs e)
{
int speed = FormUtil.GetIntValue(txtSpeed);
ShuoKeControls.VolMove(store.Config.CompressAxis_Slv, speed);
//int speed = FormUtil.GetIntValue(txtSpeed);
//ShuoKeControls.VolMove(store.Config.CompressAxis_Slv, speed);
}
private void btnGetPosition_Click(object sender, EventArgs e)
{
ShuoKeControls.GetABSPosition(store.Config.CompressAxis_Slv);
//ShuoKeControls.GetABSPosition(store.Config.CompressAxis_Slv);
}
private void btnStop_Click(object sender, EventArgs e)
{
ShuoKeControls.SuddownStop(this.store.Config.CompressAxis_Slv);
//ShuoKeControls.SuddownStop(this.store.Config.CompressAxis_Slv);
}
private void btnClearPosition_Click(object sender, EventArgs e)
{
ShuoKeControls.PositionClear(this.store.Config.CompressAxis_Slv, ShuoKeCMD.AbsPositionClear);
ShuoKeControls.PositionClear(this.store.Config.CompressAxis_Slv, ShuoKeCMD.RelPositionClear);
//ShuoKeControls.PositionClear(this.store.Config.CompressAxis_Slv, ShuoKeCMD.AbsPositionClear);
//ShuoKeControls.PositionClear(this.store.Config.CompressAxis_Slv, ShuoKeCMD.RelPositionClear);
}
private void btnHomeMove_Click(object sender, EventArgs e)
{
ShuoKeControls.HomeMove(this.store.Config.CompressAxis_Slv, byte.Parse(cmbHomeType.SelectedIndex.ToString()));
//ShuoKeControls.HomeMove(this.store.Config.CompressAxis_Slv, byte.Parse(cmbHomeType.SelectedIndex.ToString()));
}
private void btnLineAbsMove_Click(object sender, EventArgs e)
{
int posi = FormUtil.GetIntValue(txtLinePosition);
ShuoKeControls.AbsMove(this.store.Config.CompressAxis_Slv, posi);
//int posi = FormUtil.GetIntValue(txtLinePosition);
//ShuoKeControls.AbsMove(this.store.Config.CompressAxis_Slv, posi);
}
private void btnStatusSearch_Click(object sender, EventArgs e)
{
ShuoKeControls.GetStatus(store.Config.CompressAxis_Slv);
//ShuoKeControls.GetStatus(store.Config.CompressAxis_Slv);
}
private void FormComStatus(bool isOpen)
{
......@@ -884,8 +884,8 @@ namespace OnlineStore.ACSingleStore
private void btnRelMove_Click(object sender, EventArgs e)
{
int posi = FormUtil.GetIntValue(txtLinePosition);
ShuoKeControls.RelativeMove(this.store.Config.CompressAxis_Slv, posi);
//int posi = FormUtil.GetIntValue(txtLinePosition);
//ShuoKeControls.RelativeMove(this.store.Config.CompressAxis_Slv, posi);
}
private void 料仓运转ONToolStripMenuItem_Click(object sender, EventArgs e)
......
source/DeviceLibrary/StoreConfig/AC/StoreConfig.csv
......@@ -24,9 +24,9 @@ DO,进料口门下降SOL,Door_Down,107,192.168.0.10,0,进料口门下降SOL,Y08,DO-08,0
DO,定位上升SOL,LocationCylinder_Up,108,192.168.0.10,0,定位上升SOL,Y09,DO-09,0
DO,定位下降SOL,LocationCylinder_Down,109,192.168.0.10,0,定位下降SOL,Y10,DO-10,0
DO,相机照明开,CameraLight_Power,110,192.168.0.10,0,相机照明开,Y11,DO-11,0
AXIS,（轴一）旋转轴,Middle_Axis,1,COM1,0,,,,
AXIS,（轴二）升降轴轴,UpDown_Axis,1,COM2,0,,,,
AXIS,（轴三）进出轴,InOut_Axis,1,COM3,0,,,,
AXIS,（轴一）旋转轴,Middle_Axis,1,COM3,0,,,,
AXIS,（轴二）升降轴轴,UpDown_Axis,1,COM4,0,,,,
AXIS,（轴三）进出轴,InOut_Axis,1,COM5,0,,,,
PRO,温湿度传感器地址,Temperate_ServerAddress,192.168.0.14,,,,,,
PRO,升降轴 进料口取料点 P1,UpDownAxis_DoorOPosition_P1,-886,,,,,,
PRO,升降轴 进料口出料前点 P2,UpDownAxis_DoorIPosition_P2,-900,,,,,,
......@@ -37,7 +37,7 @@ PRO,旋转轴（轴1）P1 待机原位点,MiddleAxis_P1_Position,219,,,,,,
PRO,进出轴（轴3）P1待机原位点,InOutAxis_P1_Position,0,,,,,,
PRO,押金轴（轴4）P1待机原位点,CompressAxis_P1_Position,360,,,,,,
,,,,,,,,,
PRO,是否使用压紧轴（1=使用）,IsHasCompress_Axis,1,,,,, ,
PRO,是否使用压紧轴（1=使用）,IsHasCompress_Axis,0,,,,, ,
PRO,设备是否处于调试状态（1=调试，0=正常）,IsInDebug,0,,,,,,
PRO,气压检测IO关闭需要持续的时间,AirCheckSeconds,3,,,,,,
PRO,温湿度传感器地址,TemperateServer_Port,9001,,,,,,
......
source/DeviceLibrary/acSingleStore/ACStoreManager.cs
......@@ -117,20 +117,21 @@ namespace OnlineStore.DeviceLibrary
public static bool OpenShuoKe(AC_SA_BoxBean box)
{
//打开硕科步进驱动器端口
Parity parity = (Parity)box.Config.CompressAxis_PortParity;
StopBits bit = (StopBits)box.Config.CompressAxis_StopBits;
bool result = ShuoKeControls.InitPort(box.Config.CompressAxis_PortName, box.Config.CompressAxis_PortBaudrate,
box.Config.CompressAxis_PortParity, 8, bit);
if (result)
{
LogUtil.info(box.StoreName + "打开硕科步进控制器【" + box.Config.CompressAxis_PortName + "】成功");
return true;
}
else
{
LogUtil.error(LOGGER, box.StoreName + "打开硕科步进控制器【" + box.Config.CompressAxis_PortName + "】失败，启动失败！");
return false;
}
//Parity parity = (Parity)box.Config.CompressAxis_PortParity;
//StopBits bit = (StopBits)box.Config.CompressAxis_StopBits;
//bool result = ShuoKeControls.InitPort(box.Config.CompressAxis_PortName, box.Config.CompressAxis_PortBaudrate,
// box.Config.CompressAxis_PortParity, 8, bit);
//if (result)
//{
// LogUtil.info(box.StoreName + "打开硕科步进控制器【" + box.Config.CompressAxis_PortName + "】成功");
// return true;
//}
//else
//{
// LogUtil.error(LOGGER, box.StoreName + "打开硕科步进控制器【" + box.Config.CompressAxis_PortName + "】失败，启动失败！");
// return false;
//}
return true;
}
}
}
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
......@@ -51,7 +51,7 @@ namespace OnlineStore.DeviceLibrary
{
IsDebug = true;
}
IsHasCompress_Axis = config.IsHasCompress_Axis.Equals(1);
StoreName = ("料仓BOX_" + config.Id + " ").ToUpper();
this.StoreID = config.Id;
this.Config = config;
......@@ -209,10 +209,13 @@ namespace OnlineStore.DeviceLibrary
{
LogUtil.info(LOGGER, StoreName + "开始启动，启动时间：" + StartTime.ToString());
if (ShuoKeControls.isRun == false && (!ACStoreManager.OpenShuoKe(this)))
if (IsHasCompress_Axis)
{
LogUtil.info(StoreName + "打开驱动器串口失败，启动失败！");
return false;
if (ShuoKeControls.isRun == false && (!ACStoreManager.OpenShuoKe(this)))
{
LogUtil.info(StoreName + "打开驱动器串口失败，启动失败！");
return false;
}
}
autoNext = false;
timersTimer.Enabled = false;
......@@ -276,22 +279,27 @@ namespace OnlineStore.DeviceLibrary
ACAxisHomeMove(Config.InOut_Axis);
LogUtil.info(LOGGER, StoreName + "开始原点返回，先把进出轴回原点");
//设置速度
SetShuokeSpeed();
StoreMove.WaitList.Add(WaitResultInfo.WaitTime(2000));
}
private void SetShuokeSpeed()
{
ShuoKeControls.SetSpeed(Config.CompressAxis_Slv, ShuoKeCMD.SetAddSpeed, Config.CompressAxis_AddSpeed);
Thread.Sleep(100);
ShuoKeControls.SetSpeed(Config.CompressAxis_Slv, ShuoKeCMD.SetDelSpeed, Config.CompressAxis_DelSpeed);
Thread.Sleep(100);
ShuoKeControls.SetSpeed(Config.CompressAxis_Slv, ShuoKeCMD.SetEndSpeed, Config.CompressAxis_EndSpeed);
Thread.Sleep(100);
ShuoKeControls.SetSpeed(Config.CompressAxis_Slv, ShuoKeCMD.SetHomeSpeed, Config.CompressAxis_HomeSpeed);
Thread.Sleep(100);
ShuoKeControls.SetSpeed(Config.CompressAxis_Slv, ShuoKeCMD.SetMaxSpeed, Config.CompressAxis_MaxSpeed);
Thread.Sleep(100);
ShuoKeControls.SetSpeed(Config.CompressAxis_Slv, ShuoKeCMD.SetStartSpeed, Config.CompressAxis_StartSpeed);
if (!IsHasCompress_Axis)
{
return;
}
//ShuoKeControls.SetSpeed(Config.CompressAxis_Slv, ShuoKeCMD.SetAddSpeed, Config.CompressAxis_AddSpeed);
//Thread.Sleep(100);
//ShuoKeControls.SetSpeed(Config.CompressAxis_Slv, ShuoKeCMD.SetDelSpeed, Config.CompressAxis_DelSpeed);
//Thread.Sleep(100);
//ShuoKeControls.SetSpeed(Config.CompressAxis_Slv, ShuoKeCMD.SetEndSpeed, Config.CompressAxis_EndSpeed);
//Thread.Sleep(100);
//ShuoKeControls.SetSpeed(Config.CompressAxis_Slv, ShuoKeCMD.SetHomeSpeed, Config.CompressAxis_HomeSpeed);
//Thread.Sleep(100);
//ShuoKeControls.SetSpeed(Config.CompressAxis_Slv, ShuoKeCMD.SetMaxSpeed, Config.CompressAxis_MaxSpeed);
//Thread.Sleep(100);
//ShuoKeControls.SetSpeed(Config.CompressAxis_Slv, ShuoKeCMD.SetStartSpeed, Config.CompressAxis_StartSpeed);
}
public void MoveToP1()
{
......@@ -419,9 +427,11 @@ namespace OnlineStore.DeviceLibrary
//重置和回原点要等轴3进出轴ORG亮了以后才能返回其他轴
LogUtil.info(LOGGER, StoreName + "重置中： 压紧轴，旋转轴，上下轴开始 原点返回");
StoreMove.NextMoveStep(StoreMoveStep.BOX_H_OtherAxisBack);
ShuoKeControls.HomeMove(Config.CompressAxis_Slv, 0);
StoreMove.WaitList.Add(WaitResultInfo.WaitShuoKe(Config.CompressAxis_Slv, 0, true));
if (IsHasCompress_Axis)
{
//ShuoKeControls.HomeMove(Config.CompressAxis_Slv, 0);
//StoreMove.WaitList.Add(WaitResultInfo.WaitShuoKe(Config.CompressAxis_Slv, 0, true));
}
ACAxisHomeMove(Config.Middle_Axis);
ACAxisHomeMove(Config.UpDown_Axis);
break;
......@@ -454,8 +464,11 @@ namespace OnlineStore.DeviceLibrary
case StoreMoveStep.BOX_M_H_TOP1_InOutToP1:
StoreMove.NextMoveStep(StoreMoveStep.BOX_M_H_TOP1_CompressHome);
LogUtil.info(LOGGER, StoreName + "到待机状态，压紧轴回原点，关闭舱门");
ShuoKeControls.HomeMove(Config.CompressAxis_Slv, 0);
StoreMove.WaitList.Add(WaitResultInfo.WaitShuoKe(Config.CompressAxis_Slv, 0, true));
if (IsHasCompress_Axis)
{
//ShuoKeControls.HomeMove(Config.CompressAxis_Slv, 0);
//StoreMove.WaitList.Add(WaitResultInfo.WaitShuoKe(Config.CompressAxis_Slv, 0, true));
}
//关闭舱门
KNDIOMove(IO_Type.Door_Down, IO_VALUE.HIGH);
KNDIOMove(IO_Type.Door_Up, IO_VALUE.LOW);
......@@ -537,10 +550,11 @@ namespace OnlineStore.DeviceLibrary
//重置和回原点要等轴3进出轴ORG亮了以后才能返回其他轴
LogUtil.info(LOGGER, StoreName + "原点返回中 ：压紧轴，旋转轴，上下轴开始原点返回");
StoreMove.NextMoveStep(StoreMoveStep.BOX_H_OtherAxisBack);
ShuoKeControls.HomeMove(Config.CompressAxis_Slv, 0);
StoreMove.WaitList.Add(WaitResultInfo.WaitShuoKe(Config.CompressAxis_Slv, 0, true));
if (IsHasCompress_Axis)
{
//ShuoKeControls.HomeMove(Config.CompressAxis_Slv, 0);
//StoreMove.WaitList.Add(WaitResultInfo.WaitShuoKe(Config.CompressAxis_Slv, 0, true));
}
ACAxisHomeMove(Config.Middle_Axis);
ACAxisHomeMove(Config.UpDown_Axis);
break;
......@@ -1146,7 +1160,7 @@ namespace OnlineStore.DeviceLibrary
ACServerManager.SuddenStop(Config.InOut_Axis.DeviceName, Config.InOut_Axis.GetAxisValue());
if (IsHasCompress_Axis)
{
ShuoKeControls.SuddownStop(Config.CompressAxis_Slv);
//ShuoKeControls.SuddownStop(Config.CompressAxis_Slv);
}
else
{
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
......@@ -331,8 +331,8 @@ namespace OnlineStore.DeviceLibrary
StoreMove.NextMoveStep(StoreMoveStep.SI_03_ReturnHome);
if (IsHasCompress_Axis)
{
ShuoKeControls.AbsMove(Config.CompressAxis_Slv, moveP.ComPress_P3);
StoreMove.WaitList.Add(WaitResultInfo.WaitShuoKe(Config.CompressAxis_Slv, moveP.ComPress_P3, false));
//ShuoKeControls.AbsMove(Config.CompressAxis_Slv, moveP.ComPress_P3);
//StoreMove.WaitList.Add(WaitResultInfo.WaitShuoKe(Config.CompressAxis_Slv, moveP.ComPress_P3, false));
}
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P1, Config.UpDownAxis_P1_Speed, Config.UpDown_Axis.StartSpeed);
ACAxisMove(Config.Middle_Axis, moveP.Middle_P1, Config.MiddleAxis_P1_Speed, Config.Middle_Axis.StartSpeed);
......@@ -341,10 +341,10 @@ namespace OnlineStore.DeviceLibrary
{
if (IsHasCompress_Axis)
{
InStoreLog(" 入库处理：(SI_04_CompressWare 压紧物品（有压紧轴的才需要此步骤），轴4（ 压紧） 至P3(压紧前点))开始");
StoreMove.NextMoveStep(StoreMoveStep.SI_04_CompressWare);
ShuoKeControls.AbsMove(Config.CompressAxis_Slv, moveP.ComPress_P3);
StoreMove.WaitList.Add(WaitResultInfo.WaitShuoKe(Config.CompressAxis_Slv, moveP.ComPress_P3, false));
//InStoreLog(" 入库处理：(SI_04_CompressWare 压紧物品（有压紧轴的才需要此步骤），轴4（ 压紧） 至P3(压紧前点))开始");
//StoreMove.NextMoveStep(StoreMoveStep.SI_04_CompressWare);
//ShuoKeControls.AbsMove(Config.CompressAxis_Slv, moveP.ComPress_P3);
//StoreMove.WaitList.Add(WaitResultInfo.WaitShuoKe(Config.CompressAxis_Slv, moveP.ComPress_P3, false));
}
else
{
......@@ -365,9 +365,8 @@ namespace OnlineStore.DeviceLibrary
StoreMove.NextMoveStep(StoreMoveStep.SI_06_DoorWarToDevice);
if (IsHasCompress_Axis)
{
ShuoKeControls.AbsMove(Config.CompressAxis_Slv, moveP.ComPress_P2);
StoreMove.WaitList.Add(WaitResultInfo.WaitShuoKe(Config.CompressAxis_Slv, moveP.ComPress_P2, false));
//ACAxisMove(Config.Compress_Axis, moveP.ComPress_P2, Config.CompressAxis_P2_Speed, Config.Compress_Axis.StartSpeed);
//ShuoKeControls.AbsMove(Config.CompressAxis_Slv, moveP.ComPress_P2);
//StoreMove.WaitList.Add(WaitResultInfo.WaitShuoKe(Config.CompressAxis_Slv, moveP.ComPress_P2, false));
System.Threading.Thread.Sleep(600);
}
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P7, Config.UpDownAxis_P7_Speed, Config.UpDown_Axis.StartSpeed);
......@@ -447,9 +446,8 @@ namespace OnlineStore.DeviceLibrary
StoreMove.NextMoveStep(StoreMoveStep.SI_12_PutWareToBag);
if (IsHasCompress_Axis)
{
ShuoKeControls.AbsMove(Config.CompressAxis_Slv, moveP.ComPress_P3);
StoreMove.WaitList.Add(WaitResultInfo.WaitShuoKe(Config.CompressAxis_Slv, moveP.ComPress_P3, false));
//ACAxisMove(Config.Compress_Axis, moveP.ComPress_P3, Config.CompressAxis_P3_Speed, Config.Compress_Axis.StartSpeed);
//ShuoKeControls.AbsMove(Config.CompressAxis_Slv, moveP.ComPress_P3);
//StoreMove.WaitList.Add(WaitResultInfo.WaitShuoKe(Config.CompressAxis_Slv, moveP.ComPress_P3, false));
}
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P4, Config.UpDownAxis_P4_Speed, Config.UpDown_Axis.StartSpeed);
}
......@@ -465,7 +463,6 @@ namespace OnlineStore.DeviceLibrary
//SendLineStatus(StoreID, posId, StoreStatus.InStoreEnd);
StoreMove.NextMoveStep(StoreMoveStep.SI_13_DeviceBackFromBag);
//ACAxisMove(Config.InOut_Axis, moveP.InOut_P1, Config.InOutAxis_P1_Speed, Config.InOut_Axis.StartSpeed);
InOutBackToP1(moveP.InOut_P1);
}
else if (StoreMove.MoveStep == StoreMoveStep.SI_13_DeviceBackFromBag)
......@@ -474,9 +471,8 @@ namespace OnlineStore.DeviceLibrary
StoreMove.NextMoveStep(StoreMoveStep.SI_14_GoBack);
if (IsHasCompress_Axis)
{
ShuoKeControls.AbsMove(Config.CompressAxis_Slv, moveP.ComPress_P1);
StoreMove.WaitList.Add(WaitResultInfo.WaitShuoKe(Config.CompressAxis_Slv, moveP.ComPress_P1, false));
//ACAxisMove(Config.Compress_Axis, moveP.ComPress_P1, Config.CompressAxis_P1_Speed, Config.Compress_Axis.StartSpeed);
//ShuoKeControls.AbsMove(Config.CompressAxis_Slv, moveP.ComPress_P1);
//StoreMove.WaitList.Add(WaitResultInfo.WaitShuoKe(Config.CompressAxis_Slv, moveP.ComPress_P1, false));
}
ACAxisMove(Config.Middle_Axis, moveP.Middle_P1, Config.MiddleAxis_P1_Speed, Config.Middle_Axis.StartSpeed);
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P1, Config.UpDownAxis_P1_Speed, Config.UpDown_Axis.StartSpeed);
......@@ -490,7 +486,6 @@ namespace OnlineStore.DeviceLibrary
{
string posId = StoreMove.MoveParam != null ? StoreMove.MoveParam.PositionNum : "";
LogUtil.info(LOGGER, StoreName + " 入库【" + posId + "】处理： 整个入库流程结束！", storeMoveColor);
//MoveEndEvent.Invoke(StoreID, StoreMoveType.InStore, StoreMove.MoveParam);//触发完成事件
StoreMove.EndMove();
storeRunStatus = StoreRunStatus.Runing;
//设备连接，入库后，BOX恢复原始状态
......@@ -569,7 +564,6 @@ namespace OnlineStore.DeviceLibrary
{
StoreMove.NextMoveStep(StoreMoveStep.SO_02_DeviceBack);
OutStoreLog(" 出库处理：(SO_02_DeviceBack 叉子先运动到P1 开始");
//ACAxisMove(Config.InOut_Axis, StoreMove.MoveParam.MoveP.InOut_P1, Config.InOutAxis_P1_Speed, Config.InOut_Axis.StartSpeed);
InOutBackToP1(StoreMove.MoveParam.MoveP.InOut_P1);
}
else if (StoreMove.MoveStep == StoreMoveStep.SO_02_DeviceBack)
......@@ -578,9 +572,8 @@ namespace OnlineStore.DeviceLibrary
OutStoreLog(" 出库处理：(SO_03_ToBagPosition 所有轴运行到库位， 轴4（ 压紧） 至P3(压紧前点) ,轴1（ 转盘） 至P2（ 库位点）,轴2(上下） 至P5(库位出库前点） ) 开始");
if (IsHasCompress_Axis)
{
ShuoKeControls.AbsMove(Config.CompressAxis_Slv, moveP.ComPress_P3);
StoreMove.WaitList.Add(WaitResultInfo.WaitShuoKe(Config.CompressAxis_Slv, moveP.ComPress_P3, false));
//ACAxisMove(Config.Compress_Axis, StoreMove.MoveParam.MoveP.ComPress_P3, Config.CompressAxis_P3_Speed, Config.Compress_Axis.StartSpeed);
//ShuoKeControls.AbsMove(Config.CompressAxis_Slv, moveP.ComPress_P3);
//StoreMove.WaitList.Add(WaitResultInfo.WaitShuoKe(Config.CompressAxis_Slv, moveP.ComPress_P3, false));
}
ACAxisMove(Config.Middle_Axis, StoreMove.MoveParam.MoveP.Middle_P2, Config.MiddleAxis_P2_Speed, Config.Middle_Axis.StartSpeed);
ACAxisMove(Config.UpDown_Axis, StoreMove.MoveParam.MoveP.UpDown_P5, Config.UpDownAxis_P5_Speed, Config.UpDown_Axis.StartSpeed);
......@@ -598,9 +591,8 @@ namespace OnlineStore.DeviceLibrary
//电缸微动至对应料盘的上端位置
if (IsHasCompress_Axis)
{
ShuoKeControls.AbsMove(Config.CompressAxis_Slv, moveP.ComPress_P2);
StoreMove.WaitList.Add(WaitResultInfo.WaitShuoKe(Config.CompressAxis_Slv, moveP.ComPress_P2, false));
//ACAxisMove(Config.Compress_Axis, moveP.ComPress_P2, Config.CompressAxis_P2_Speed, Config.Compress_Axis.StartSpeed);
//ShuoKeControls.AbsMove(Config.CompressAxis_Slv, moveP.ComPress_P2);
//StoreMove.WaitList.Add(WaitResultInfo.WaitShuoKe(Config.CompressAxis_Slv, moveP.ComPress_P2, false));
}
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P6, Config.UpDownAxis_P6_Speed, Config.UpDown_Axis.StartSpeed);
}
......@@ -684,9 +676,8 @@ namespace OnlineStore.DeviceLibrary
StoreMove.NextMoveStep(StoreMoveStep.SO_11_DevicePutWare);
if (IsHasCompress_Axis)
{
ShuoKeControls.AbsMove(Config.CompressAxis_Slv, moveP.ComPress_P1);
StoreMove.WaitList.Add(WaitResultInfo.WaitShuoKe(Config.CompressAxis_Slv, moveP.ComPress_P1, false));
//ACAxisMove(Config.Compress_Axis, moveP.ComPress_P1, Config.CompressAxis_P1_Speed, Config.Compress_Axis.StartSpeed);
//ShuoKeControls.AbsMove(Config.CompressAxis_Slv, moveP.ComPress_P1);
//StoreMove.WaitList.Add(WaitResultInfo.WaitShuoKe(Config.CompressAxis_Slv, moveP.ComPress_P1, false));
}
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P8, Config.UpDownAxis_P8_Speed, Config.UpDown_Axis.StartSpeed);
}
......@@ -694,7 +685,6 @@ namespace OnlineStore.DeviceLibrary
{
StoreMove.NextMoveStep(StoreMoveStep.SO_12_DeviceOutFromDoor);
OutStoreLog(" 出库处理：（SO_12_DeviceOutFromDoor叉子从出料口返回，，轴3（ 叉子） 动作至P1（ 待机点）)开始！");
//ACAxisMove(Config.InOut_Axis, moveP.InOut_P1, Config.InOutAxis_P1_Speed, Config.InOut_Axis.StartSpeed);
InOutBackToP1(moveP.InOut_P1);
}
else if (StoreMove.MoveStep == StoreMoveStep.SO_12_DeviceOutFromDoor)
......
source/LoadCVSLibrary/storeConfig/config/AC_SA_Config.cs
......@@ -42,63 +42,66 @@ namespace OnlineStore.LoadCSVLibrary
/// </summary>
[ConfigProAttribute("AirCheckSeconds")]
public int AirCheckSeconds { get; set; }
/// <summary>
/// PRO 硕科步进电机（压紧轴）控制端口号 CompressAxis_PortName COM4
/// </summary>
[ConfigProAttribute("CompressAxis_PortName")]
public string CompressAxis_PortName { get; set; }
/// <summary>
/// PRO 硕科步进电机（压紧轴）控制波特率 CompressAxis_PortBaudrate 9600
/// </summary>
[ConfigProAttribute("CompressAxis_PortBaudrate")]
public int CompressAxis_PortBaudrate { get; set; }
/// <summary>
/// PRO 硕科步进电机（压紧轴）控制奇偶校验 CompressAxis_PortParity 2
/// </summary>
[ConfigProAttribute("CompressAxis_PortParity")]
public int CompressAxis_PortParity { get; set; }
/// <summary>
/// PRO 硕科步进电机（压紧轴）控制停止位 CompressAxis_StopBits 1
/// </summary>
[ConfigProAttribute("CompressAxis_StopBits")]
public int CompressAxis_StopBits { get; set; }
/// <summary>
/// PRO 硕科步进电机（压紧轴）控制初速度 CompressAxis_StartSpeed 100
/// </summary>
[ConfigProAttribute("CompressAxis_StartSpeed")]
public int CompressAxis_StartSpeed { get; set; }
/// <summary>
/// PRO 硕科步进电机（压紧轴）控制最大速度 CompressAxis_MaxSpeed 10000
/// </summary>
[ConfigProAttribute("CompressAxis_MaxSpeed")]
public int CompressAxis_MaxSpeed { get; set; }
/// <summary>
/// PRO 硕科步进电机（压紧轴）控制末速度 CompressAxis_EndSpeed 10000
/// </summary>
[ConfigProAttribute("CompressAxis_EndSpeed")]
public int CompressAxis_EndSpeed { get; set; }
/// <summary>
/// PRO 硕科步进电机（压紧轴）控制加速度 CompressAxis_AddSpeed 5000
/// </summary>
[ConfigProAttribute("CompressAxis_AddSpeed")]
public int CompressAxis_AddSpeed { get; set; }
/// <summary>
/// PRO 硕科步进电机（压紧轴）控制减速度 CompressAxis_DelSpeed 1000
/// </summary>
[ConfigProAttribute("CompressAxis_DelSpeed")]
public int CompressAxis_DelSpeed { get; set; }
/// <summary>
/// PRO 硕科步进电机（压紧轴）控制归零速度（原点返回速度） CompressAxis_HomeSpeed 10000
/// </summary>
[ConfigProAttribute("CompressAxis_HomeSpeed")]
public int CompressAxis_HomeSpeed { get; set; }
/// <summary>
/// PRO,硕科步进电机轴地址（压紧轴),CompressAxis_Slv,1,,,,,,
/// IsHasCompress_Axis是否使用压紧轴
/// </summary>
[ConfigProAttribute("CompressAxis_Slv")]
public int CompressAxis_Slv { get; set; }
[ConfigProAttribute("IsHasCompress_Axis")]
public int IsHasCompress_Axis { get; set; }
///// <summary>
///// PRO 硕科步进电机（压紧轴）控制端口号 CompressAxis_PortName COM4
///// </summary>
//[ConfigProAttribute("CompressAxis_PortName")]
//public string CompressAxis_PortName { get; set; }
///// <summary>
///// PRO 硕科步进电机（压紧轴）控制波特率 CompressAxis_PortBaudrate 9600
///// </summary>
//[ConfigProAttribute("CompressAxis_PortBaudrate")]
//public int CompressAxis_PortBaudrate { get; set; }
///// <summary>
///// PRO 硕科步进电机（压紧轴）控制奇偶校验 CompressAxis_PortParity 2
///// </summary>
//[ConfigProAttribute("CompressAxis_PortParity")]
//public int CompressAxis_PortParity { get; set; }
///// <summary>
///// PRO 硕科步进电机（压紧轴）控制停止位 CompressAxis_StopBits 1
///// </summary>
//[ConfigProAttribute("CompressAxis_StopBits")]
//public int CompressAxis_StopBits { get; set; }
///// <summary>
///// PRO 硕科步进电机（压紧轴）控制初速度 CompressAxis_StartSpeed 100
///// </summary>
//[ConfigProAttribute("CompressAxis_StartSpeed")]
//public int CompressAxis_StartSpeed { get; set; }
///// <summary>
///// PRO 硕科步进电机（压紧轴）控制最大速度 CompressAxis_MaxSpeed 10000
///// </summary>
//[ConfigProAttribute("CompressAxis_MaxSpeed")]
//public int CompressAxis_MaxSpeed { get; set; }
///// <summary>
///// PRO 硕科步进电机（压紧轴）控制末速度 CompressAxis_EndSpeed 10000
///// </summary>
//[ConfigProAttribute("CompressAxis_EndSpeed")]
//public int CompressAxis_EndSpeed { get; set; }
///// <summary>
///// PRO 硕科步进电机（压紧轴）控制加速度 CompressAxis_AddSpeed 5000
///// </summary>
//[ConfigProAttribute("CompressAxis_AddSpeed")]
//public int CompressAxis_AddSpeed { get; set; }
///// <summary>
///// PRO 硕科步进电机（压紧轴）控制减速度 CompressAxis_DelSpeed 1000
///// </summary>
//[ConfigProAttribute("CompressAxis_DelSpeed")]
//public int CompressAxis_DelSpeed { get; set; }
///// <summary>
///// PRO 硕科步进电机（压紧轴）控制归零速度（原点返回速度） CompressAxis_HomeSpeed 10000
///// </summary>
//[ConfigProAttribute("CompressAxis_HomeSpeed")]
//public int CompressAxis_HomeSpeed { get; set; }
///// <summary>
///// PRO,硕科步进电机轴地址（压紧轴),CompressAxis_Slv,1,,,,,,
///// </summary>
//[ConfigProAttribute("CompressAxis_Slv")]
//public int CompressAxis_Slv { get; set; }
/// <summary>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!