From 1ac2a8a70cc1aa1034096e920d1247b8ad6809c5 Mon Sep 17 00:00:00 2001 From: "zhengxuan.zhang" Date: Fri, 23 May 2025 17:49:32 +0800 Subject: [PATCH] =?UTF-8?q?#=20=E5=AF=B9=E4=B8=93=E6=9C=BA2=E6=94=AF?= =?UTF-8?q?=E6=8C=81=EF=BC=8C=E5=B0=86=20PTP=E8=BF=90=E5=8A=A8=E7=94=B1=20?= =?UTF-8?q?toPointM=20=E8=BF=90=E5=8A=A8=E6=94=B9=E4=B8=BA=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA=E5=8D=95=E8=BD=B4=E7=8B=AC=E7=AB=8B=E8=BF=90=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HSI_HexagonMI_EF3/HSI.cpp | 6 +- HSI_HexagonMI_EF3/HSI.h | 2 +- HSI_HexagonMI_EF3/HSI_Motion.cpp | 57 ++++++++++++------ HSI_HexagonMI_EF3/version.cmd | 2 +- HSI_HexagonMI_EF3/version.h | 10 +-- .../bin/Debug/Config/EF3_Config.ini | Bin 8168 -> 8164 bytes 6 files changed, 50 insertions(+), 27 deletions(-) diff --git a/HSI_HexagonMI_EF3/HSI.cpp b/HSI_HexagonMI_EF3/HSI.cpp index 5acdbed..7e512e2 100644 --- a/HSI_HexagonMI_EF3/HSI.cpp +++ b/HSI_HexagonMI_EF3/HSI.cpp @@ -35,7 +35,11 @@ static bool g_bOfflineOnly = false; //V0.1.10 2024/04/07 // --------------------------------------- //1、配合专机2使用，增加了方向的传递接口 江苏高光半导体掩膜板瑕疵检测项目 -// +//2、配合专机2使用，屏蔽了SetSpeedEx 接口，对SetPositionXyz接口 由 acsc_ToPointM 改为 acsc_ToPoint 多个单轴独立运动 +// +// +// +// //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/HSI_HexagonMI_EF3/HSI.h b/HSI_HexagonMI_EF3/HSI.h index 5246c5d..f907efc 100644 --- a/HSI_HexagonMI_EF3/HSI.h +++ b/HSI_HexagonMI_EF3/HSI.h @@ -21,7 +21,7 @@ #endif const int HSI_APIVersionMajor = 1; -const int HSI_APIVersionMinor = 10; +const int HSI_APIVersionMinor = 9; const int HSI_MaxStringLength = 255; // Maximum string length (buffer size - 1) /////////////////////////////////////////////////////////////////////////////// // Interface API diff --git a/HSI_HexagonMI_EF3/HSI_Motion.cpp b/HSI_HexagonMI_EF3/HSI_Motion.cpp index 84a2f22..0d4a6f0 100644 --- a/HSI_HexagonMI_EF3/HSI_Motion.cpp +++ b/HSI_HexagonMI_EF3/HSI_Motion.cpp @@ -3615,11 +3615,30 @@ HSI_STATUS HSI_Motion::SetPositionXyz(UINT AxisTypes, double PositionX, double P //开始运动到指定位置，多轴运动 double Points[] = { PositionX, PositionY, PositionZ }; //目标位置点 - if (!acsc_ToPointM(handleACS, 0, ACSAxisNumbers, Points, nullptr)) //移动到绝对位置 + + //if (!acsc_ToPointM(handleACS, 0, ACSAxisNumbers, Points, nullptr)) //移动到绝对位置 + //{ + // g_pLogger->SendAndFlushWithTime(L"[SetPositionXyz] ACS Multi Motion Error\n"); + // ErrorsHandler(); + //} + + //使用三个轴的分别运动，替代整体运动 acsc_ToPointM，来解决多轴不同速度运动的问题 + if (!acsc_ToPoint(handleACS, 0, ACSAxisNumbers[0], PositionX, nullptr)) //移动到绝对位置 { - g_pLogger->SendAndFlushWithTime(L"[SetPositionXyz] ACS Multi Motion Error\n"); + g_pLogger->SendAndFlushWithTime(L"[SetPositionXyz] X轴移动出错 \n"); ErrorsHandler(); } + if (!acsc_ToPoint(handleACS, 0, ACSAxisNumbers[1], PositionY, nullptr)) //移动到绝对位置 + { + g_pLogger->SendAndFlushWithTime(L"[SetPositionXyz] Y轴移动出错\n"); + ErrorsHandler(); + } + if (!acsc_ToPoint(handleACS, 0, ACSAxisNumbers[2], PositionZ, nullptr)) //移动到绝对位置 + { + g_pLogger->SendAndFlushWithTime(L"[SetPositionXyz] Z轴移动出错\n"); + ErrorsHandler(); + } + //状态更新 if (eType == HSI_MOTION_MOVE_NOWAIT) //非等待 @@ -8452,24 +8471,24 @@ HSI_STATUS HSI_Motion::SetSpeedExOld(UINT AxisTypes, double Speed) HSI_STATUS HSI_Motion::SetSpeedEx(UINT AxisTypes, double Speed) { auto rStatus = HSI_STATUS_NORMAL; - //g_pLogger->SendAndFlushWithTime(L"[SetSpeedEx] In\n"); - short AxisNumber = AxisConvertIndex(AxisTypes); - if (Speed <= 0) - { - m_SetPotion_DriveSpeed[AxisNumber] = 0; - g_pLogger->SendAndFlushWithTime(L"[SetSpeedEx] Speed <= 0 \n"); - } + g_pLogger->SendAndFlushWithTime(L"[SetSpeedEx] Method not implemented\n"); + //short AxisNumber = AxisConvertIndex(AxisTypes); + //if (Speed <= 0) + //{ + // m_SetPotion_DriveSpeed[AxisNumber] = 0; + // g_pLogger->SendAndFlushWithTime(L"[SetSpeedEx] Speed <= 0 \n"); + //} - if (AxisNumber >= 0 && AxisNumber <= 8) - { - m_SetPotion_DriveSpeed[1] = static_cast(Speed); - g_pLogger->SendAndFlushWithTime(L"[SetSpeedEx] AxisNumber = %d,Speed = %d \n", AxisNumber, m_SetPotion_DriveSpeed[1]); - } - else - { - //打印日志 轴号不在1-4之间 - g_pLogger->SendAndFlushWithTime(L"[SetSpeedEx] 轴号不在0-8之间\n"); - } + //if (AxisNumber >= 0 && AxisNumber <= 8) + //{ + // m_SetPotion_DriveSpeed[1] = static_cast(Speed); + // g_pLogger->SendAndFlushWithTime(L"[SetSpeedEx] AxisNumber = %d,Speed = %d \n", AxisNumber, m_SetPotion_DriveSpeed[1]); + //} + //else + //{ + // //打印日志 轴号不在1-4之间 + // g_pLogger->SendAndFlushWithTime(L"[SetSpeedEx] 轴号不在0-8之间\n"); + //} //g_pLogger->SendAndFlushWithTime(L"[SetSpeedEx] Out\n"); return rStatus; } diff --git a/HSI_HexagonMI_EF3/version.cmd b/HSI_HexagonMI_EF3/version.cmd index 6baf6c4..d0fdafa 100644 --- a/HSI_HexagonMI_EF3/version.cmd +++ b/HSI_HexagonMI_EF3/version.cmd @@ -5,7 +5,7 @@ echo Generate release version ::需要人工设置的版本号---------------------------------------------------------------------------------- set major_ver=0 set minor_ver=0 -set revsion_ver=3 +set revsion_ver=4 ::------------------------------------------------------------------------------------------------------ set revfile="%~dp0version.h" diff --git a/HSI_HexagonMI_EF3/version.h b/HSI_HexagonMI_EF3/version.h index 1800c27..dee33ae 100644 --- a/HSI_HexagonMI_EF3/version.h +++ b/HSI_HexagonMI_EF3/version.h @@ -4,13 +4,13 @@ #define HSI_VERSION_NUM #define HSI_VERSION_SET _T("") /// -#define HSI_VERSION "0.0.3" -#define HSI_VERSION_CSTRING _T("0.0.3") +#define HSI_VERSION "0.0.4" +#define HSI_VERSION_CSTRING _T("0.0.4") #define HSI_VERSION_MAJOR 0 #define HSI_VERSION_MINOR 0 -#define HSI_VERSION_REVISION 3 +#define HSI_VERSION_REVISION 4 #define HSI_VERSION_REVNUM #define HSI_VERSION_BUILD_DATE _T(__DATE__ ) #define HSI_VERSION_BUILD_TIME _T(__TIME__ ) -#define HSI_FILE_DESCRIPTION "2025.04.07 / 16:25 " -#define HSI_FILE_CSDESCRIPTION _T("2025.04.07 / 16:25 ") +#define HSI_FILE_DESCRIPTION "2025.05.23 / 16:01 " +#define HSI_FILE_CSDESCRIPTION _T("2025.05.23 / 16:01 ") diff --git a/HSI_SEVENOCEAN_EF1_CsTest/bin/Debug/Config/EF3_Config.ini b/HSI_SEVENOCEAN_EF1_CsTest/bin/Debug/Config/EF3_Config.ini index fa75c88b9ec86f8f8ed273cf5980e22d7286f77c..999bffff7fa141eef7803736b0ceadbc14b7286a 100644 GIT binary patch delta 12 TcmaE1|HOWS7UO0;#$9p%B{&4& delta 12 TcmaE2|H6KQ7UO0$#(i=CB^U(U