diff --git a/LaiPuLaser/LaiPuLaser/LaserDevicePhotonics.cpp b/LaiPuLaser/LaiPuLaser/LaserDevicePhotonics.cpp index 6cd174e..4a20b4e 100644 --- a/LaiPuLaser/LaiPuLaser/LaserDevicePhotonics.cpp +++ b/LaiPuLaser/LaiPuLaser/LaserDevicePhotonics.cpp @@ -1486,6 +1486,18 @@ void CLaserDevicePhotonics::OprateLaserLdd(eLaserDeviceType LaserDeviceType,bool LogInfo.m_LogMsg = Bool2CStringOnOff(bOpen); gLogMgr->WriteLogInfo(LogInfo); + CString LaserHead; + if (LaserDeviceType == _LaserDeviceType_MainLaser1) + { + LaserHead = Photonics_LaserHead_00; + m_CurOperateType = _ELaserDeviceOperateType_Ldd1; + } + if (LaserDeviceType == _LaserDeviceType_MainLaser2) + { + LaserHead = Photonics_LaserHead_01; + m_CurOperateType = _ELaserDeviceOperateType_Ldd2; + } + //检查Power 和Enable key if(!GetBitState(Photonics_Power)) { @@ -1529,15 +1541,6 @@ void CLaserDevicePhotonics::OprateLaserLdd(eLaserDeviceType LaserDeviceType,bool gWarningMgr->OperateAlarmState(OperateAlarmPar); } } - CString LaserHead; - if(LaserDeviceType==_LaserDeviceType_MainLaser1) - { - LaserHead = Photonics_LaserHead_00; - } - if(LaserDeviceType==_LaserDeviceType_MainLaser2) - { - LaserHead = Photonics_LaserHead_01; - } if(bOpen) { //先打开shutter