|
|
|
@ -1822,7 +1822,7 @@ void CCommonFlowMgr::InsertMoveRetListExt(CListCtrl &List,int Line,int Idx,CMove
|
|
|
|
|
#endif
|
|
|
|
|
#if 1
|
|
|
|
|
//创建点检准备cmd
|
|
|
|
|
void CCommonFlowMgr::CreatPowCheckPrepareCmd(CWorkCmdInvoker &WorkCmdInvoker)
|
|
|
|
|
void CCommonFlowMgr::CreatPowCheckPrepareCmd(CWorkCmdInvoker &WorkCmdInvoker, eLaserDeviceType PowCheckType)
|
|
|
|
|
{
|
|
|
|
|
CMotor &MotorZ = *(CMotor::GetMotor(MOTOR_Z));
|
|
|
|
|
//关闭光闸
|
|
|
|
@ -1833,6 +1833,25 @@ void CCommonFlowMgr::CreatPowCheckPrepareCmd(CWorkCmdInvoker &WorkCmdInvoker)
|
|
|
|
|
pCmd->SetBoolParVal(bCLOSE);
|
|
|
|
|
WorkCmdInvoker.AddCmd(pCmd);
|
|
|
|
|
}
|
|
|
|
|
//¼ì²éLDD ״̬
|
|
|
|
|
if (gDeviceStateMgr->QueryUsedFunc(_EUsedFunc_LaserDeviceCtrl))
|
|
|
|
|
{
|
|
|
|
|
eFlowCheckType FlowCheckType = _FlowCheck_Null;
|
|
|
|
|
if (_LaserDeviceType_MainLaser1 == PowCheckType)
|
|
|
|
|
{
|
|
|
|
|
FlowCheckType = _FlowCheck_Laser1LDD;
|
|
|
|
|
}
|
|
|
|
|
else if (_LaserDeviceType_MainLaser2 == PowCheckType)
|
|
|
|
|
{
|
|
|
|
|
FlowCheckType = _FlowCheck_Laser2LDD;
|
|
|
|
|
}
|
|
|
|
|
CWorkCmdExcuteAction *pCmd = new CWorkCmdExcuteAction();
|
|
|
|
|
CExcuteActionPar ActionPar;
|
|
|
|
|
ActionPar.m_ExcuteAction = _ExcuteAction_FlowCheck;
|
|
|
|
|
ActionPar.AddFlowCheck(FlowCheckType);
|
|
|
|
|
pCmd->SetExcuteActionPar(ActionPar);
|
|
|
|
|
WorkCmdInvoker.AddCmd(pCmd);
|
|
|
|
|
}
|
|
|
|
|
if(gDeviceStateMgr->QueryUsedFunc(_EUsedFunc_RotatoDimmer))
|
|
|
|
|
{
|
|
|
|
|
//衰减器1旋转到0 (Home)
|
|
|
|
@ -1948,7 +1967,7 @@ bool CCommonFlowMgr::LaserPowCheckFlow(bool bWaitcooling)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
//创建点检准备cmd
|
|
|
|
|
CreatPowCheckPrepareCmd(WorkCmdInvoker);
|
|
|
|
|
CreatPowCheckPrepareCmd(WorkCmdInvoker, CurPowCheckType);
|
|
|
|
|
|
|
|
|
|
CSetMainLaserPar CurLaserPar;
|
|
|
|
|
CurLaserPar.m_Laser1_PRF = CurPowCheckPar.m_PulseFre;//点检的激光频率
|
|
|
|
|