diff --git a/Doc/LGPRI문서/유니셀 PtoP 단동기 Laser Interface_260617.xlsx b/Doc/LGPRI문서/유니셀 PtoP 단동기 Laser Interface_260617.xlsx deleted file mode 100644 index 709c1a7..0000000 Binary files a/Doc/LGPRI문서/유니셀 PtoP 단동기 Laser Interface_260617.xlsx and /dev/null differ diff --git a/Doc/LGPRI문서/유니셀 PtoP 단동기 Laser Interface_260618.xlsx b/Doc/LGPRI문서/유니셀 PtoP 단동기 Laser Interface_260618.xlsx index 42de842..05454e8 100644 Binary files a/Doc/LGPRI문서/유니셀 PtoP 단동기 Laser Interface_260618.xlsx and b/Doc/LGPRI문서/유니셀 PtoP 단동기 Laser Interface_260618.xlsx differ diff --git a/WeldingComponents/WeldingCommon/Views/Manual/Scanner/UCScannerLaserControlViewModel.cs b/WeldingComponents/WeldingCommon/Views/Manual/Scanner/UCScannerLaserControlViewModel.cs index 5dd88ab..046507f 100644 --- a/WeldingComponents/WeldingCommon/Views/Manual/Scanner/UCScannerLaserControlViewModel.cs +++ b/WeldingComponents/WeldingCommon/Views/Manual/Scanner/UCScannerLaserControlViewModel.cs @@ -251,8 +251,8 @@ namespace WeldingCommon.Views private void ReadbackAnalogOut() { - int raw1 = _Scanner.GetAnalogOut((uint)eAnalogPortOut.DA1); - int raw2 = _Scanner.GetAnalogOut((uint)eAnalogPortOut.DA2); + int raw1 = (_Scanner.GetAnalogOut((uint)eAnalogPortOut.DA1) & 0x000FFFF0) >> 4; + int raw2 = (_Scanner.GetAnalogOut((uint)eAnalogPortOut.DA2) & 0x000FFFF0) >> 4; // -1 은 Scanner 미활성(IsActivated == false) sentinel AnalogOut1Voltage = raw1 < 0 ? 0 : raw1 / 4095.0 * 10.0;