From 3211cdbb13dcee807e3b151c5a67e6a2fb475075 Mon Sep 17 00:00:00 2001 From: "zhengxuan.zhang" Date: Wed, 17 Jul 2024 11:14:23 +0800 Subject: [PATCH] =?UTF-8?q?#0009:=20=E5=90=84=E9=80=9F=E5=BA=A6=E8=AE=BE?= =?UTF-8?q?=E5=AE=9A=EF=BC=9A=201=E3=80=81=E6=89=AB=E6=8F=8F=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E4=BF=A1=E4=BB=BBmetus=E6=89=AB=E6=8F=8F=E9=80=9F?= =?UTF-8?q?=E5=BA=A6=E8=AE=BE=E7=BD=AE=EF=BC=8C2=E3=80=81=E5=AE=9A?= =?UTF-8?q?=E4=BD=8D=E5=8A=A8=E4=BD=9C=EF=BC=8C=E9=87=87=E7=94=A8=E5=AE=9A?= =?UTF-8?q?=E4=BD=8D=E5=90=88=E6=88=90=E9=80=9F=E5=BA=A6=203=E3=80=81Jog?= =?UTF-8?q?=E8=BF=90=E5=8A=A8=EF=BC=8C=E6=8C=89=E7=85=A7Jog=E9=80=9F?= =?UTF-8?q?=E5=BA=A6=E6=A1=A3=E4=BD=8D=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HSI_HexagonMI_EF3/HSI_Motion.cpp | 6 ++++-- HSI_HexagonMI_EF3/version.h | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/HSI_HexagonMI_EF3/HSI_Motion.cpp b/HSI_HexagonMI_EF3/HSI_Motion.cpp index 29d5108..1a51bff 100644 --- a/HSI_HexagonMI_EF3/HSI_Motion.cpp +++ b/HSI_HexagonMI_EF3/HSI_Motion.cpp @@ -3546,6 +3546,7 @@ HSI_STATUS HSI_Motion::SetPositionXyz(UINT AxisTypes, double PositionX, double P }; SetSingleAxisMotionParams(ACSC_AXIS_1, X_SetmotionParam);//设置X轴定位速度 + m_SetPotion_DriveSpeed[ACSC_AXIS_1] = X_SetmotionParam[0];// 记录X轴速度 g_pLogger->SendAndFlushWithTime(L"[SetPositionXyz] 设置Y轴定位速度 %d\n", m_SetPotion_DriveSpeed[2]); double Y_SetmotionParam[5] = { @@ -3558,6 +3559,7 @@ HSI_STATUS HSI_Motion::SetPositionXyz(UINT AxisTypes, double PositionX, double P SetSingleAxisMotionParams(ACSC_AXIS_0, Y_SetmotionParam);//设置Y轴定位速度 + m_SetPotion_DriveSpeed[ACSC_AXIS_0] = Y_SetmotionParam[0];// 记录Y轴速度 g_pLogger->SendAndFlushWithTime(L"[SetPositionXyz] 设置Z轴定位速度 %d\n", m_SetPotion_DriveSpeed[3]); double Z_SetmotionParam[5] = { @@ -3569,7 +3571,7 @@ HSI_STATUS HSI_Motion::SetPositionXyz(UINT AxisTypes, double PositionX, double P }; SetSingleAxisMotionParams(ACSC_AXIS_8, Z_SetmotionParam);//设置Z轴定位速度 - + m_SetPotion_DriveSpeed[ACSC_AXIS_8] = Z_SetmotionParam[0]; //记录Z轴速度 //使能电机 int Axes[] = { ACSC_AXIS_1, ACSC_AXIS_0, ACSC_AXIS_8, -1 }; //根据电气层面定义，这里的0对应X轴，1对应Y轴，8对应Z轴 @@ -8292,7 +8294,7 @@ HSI_STATUS HSI_Motion::SetSpeedEx(UINT AxisTypes, double Speed) if (AxisNumber >= 0 && AxisNumber <= 8) { m_SetPotion_DriveSpeed[1] = static_cast(Speed); - g_pLogger->SendAndFlushWithTime(L"[SetSpeedEx] AxisNumber = %d,Speed = %f \n", AxisNumber, m_SetPotion_DriveSpeed[1]); + g_pLogger->SendAndFlushWithTime(L"[SetSpeedEx] AxisNumber = %d,Speed = %d \n", AxisNumber, m_SetPotion_DriveSpeed[1]); } else { diff --git a/HSI_HexagonMI_EF3/version.h b/HSI_HexagonMI_EF3/version.h index d229786..96334d7 100644 --- a/HSI_HexagonMI_EF3/version.h +++ b/HSI_HexagonMI_EF3/version.h @@ -12,5 +12,5 @@ #define HSI_VERSION_REVNUM #define HSI_VERSION_BUILD_DATE _T(__DATE__ ) #define HSI_VERSION_BUILD_TIME _T(__TIME__ ) -#define HSI_FILE_DESCRIPTION "周三 2.24.07 / 10:47 " -#define HSI_FILE_CSDESCRIPTION _T("周三 2.24.07 / 10:47 ") +#define HSI_FILE_DESCRIPTION "周三 2.24.07 / 10:59 " +#define HSI_FILE_CSDESCRIPTION _T("周三 2.24.07 / 10:59 ")