diff --git a/HSI_HexagonMI_EF3/HSI_Motion.cpp b/HSI_HexagonMI_EF3/HSI_Motion.cpp index e88e73b..29d5108 100644 --- a/HSI_HexagonMI_EF3/HSI_Motion.cpp +++ b/HSI_HexagonMI_EF3/HSI_Motion.cpp @@ -254,9 +254,9 @@ HSI_Motion::HSI_Motion() m_JogDriveSpeed[j][i] = 20; //表示5个档位 轴号,从1开始;5:档位 m_JogStartSpeed[j][i] = 20; m_JogAccLine[j][i] = 5; - m_JogAccCurve[j][i] = 0; m_JogDecLine[j][i] = 5; - m_JogDecCurve[j][i] = 0; + m_JogAccCurve[j][i] = 5; + m_JogDecCurve[j][i] = 5; } m_Home_Machine_Axis[i] = 1; //用于启动时需要回原点的轴号选择,赋值1表示该轴需要回家 m_Home_Pos_Axis[i] = 0; //记住关闭电源时的位置,用于判断是否还需要回原点 @@ -1978,7 +1978,7 @@ HSI_STATUS HSI_Motion::Jog(UINT AxisTypes, double Speed) //转到真实ACS平台轴号,并开始执行 byte AxisNumber = static_cast(AxisConvertIndex(AxisTypes)); //Jog - double motionParam[5] = { DriveSpeed,AccLine*10 , DecLine*10, AccCurve,DecCurve }; //速度,加速度,减速度,Kill, jerk + double motionParam[5] = { DriveSpeed,AccLine , DecLine, AccCurve,DecCurve }; //速度,加速度,减速度,Kill, jerk SetSingleAxisMotionParams(AxisNumber, motionParam); // 急停判断 @@ -7637,8 +7637,8 @@ int HSI_Motion::SpeedPercent(int AxisNum, double& Speed, int& DirveSpeed, int& S StartSpeed = m_JogStartSpeed[AxisNum][0]; AccLine = m_JogAccLine[AxisNum][0]; DecLine = m_JogDecLine[AxisNum][0]; - AccCurve = m_JogAccCurve[AxisNum][0]; - DecCurve = m_JogDecCurve[AxisNum][0]; + AccCurve = m_JogAccLine[AxisNum][0]*10; + DecCurve = m_JogDecLine[AxisNum][0]*10; g_pLogger->SendAndFlushWithTime( L"[SpeedPercent] 0.81 DriveSpeed: [%d], StartSpeed: [%d], AccLine: [%d], DecLine: [%d], AccCurve: [%d], DecCurve: [%d]\n", DirveSpeed, StartSpeed, AccLine, DecLine, AccCurve, DecCurve); @@ -7649,8 +7649,8 @@ int HSI_Motion::SpeedPercent(int AxisNum, double& Speed, int& DirveSpeed, int& S StartSpeed = m_JogStartSpeed[AxisNum][1]; AccLine = m_JogAccLine[AxisNum][1]; DecLine = m_JogDecLine[AxisNum][1]; - AccCurve = m_JogAccCurve[AxisNum][1]; - DecCurve = m_JogDecCurve[AxisNum][1]; + AccCurve = m_JogAccLine[AxisNum][1]*10; + DecCurve = m_JogDecLine[AxisNum][1]*10; g_pLogger->SendAndFlushWithTime( L"[SpeedPercent] 0.61 DriveSpeed: [%d], StartSpeed: [%d], AccLine: [%d], DecLine: [%d], AccCurve: [%d], DecCurve: [%d]\n", DirveSpeed, StartSpeed, AccLine, DecLine, AccCurve, DecCurve); @@ -7661,8 +7661,8 @@ int HSI_Motion::SpeedPercent(int AxisNum, double& Speed, int& DirveSpeed, int& S StartSpeed = m_JogStartSpeed[AxisNum][2]; AccLine = m_JogAccLine[AxisNum][2]; DecLine = m_JogDecLine[AxisNum][2]; - AccCurve = m_JogAccCurve[AxisNum][2]; - DecCurve = m_JogDecCurve[AxisNum][2]; + AccCurve = m_JogAccLine[AxisNum][2]*10; + DecCurve = m_JogDecLine[AxisNum][2]*10; g_pLogger->SendAndFlushWithTime( L"[SpeedPercent] 0.41 DriveSpeed: [%d], StartSpeed: [%d], AccLine: [%d], DecLine: [%d], AccCurve: [%d], DecCurve: [%d]\n", DirveSpeed, StartSpeed, AccLine, DecLine, AccCurve, DecCurve); @@ -7673,8 +7673,8 @@ int HSI_Motion::SpeedPercent(int AxisNum, double& Speed, int& DirveSpeed, int& S StartSpeed = m_JogStartSpeed[AxisNum][3]; AccLine = m_JogAccLine[AxisNum][3]; DecLine = m_JogDecLine[AxisNum][3]; - AccCurve = m_JogAccCurve[AxisNum][3]; - DecCurve = m_JogDecCurve[AxisNum][3]; + AccCurve = m_JogAccLine[AxisNum][3]*10; + DecCurve = m_JogDecLine[AxisNum][3]*10; g_pLogger->SendAndFlushWithTime( L"[SpeedPercent] 0.21 DriveSpeed: [%d], StartSpeed: [%d], AccLine: [%d], DecLine: [%d], AccCurve: [%d], DecCurve: [%d]\n", DirveSpeed, StartSpeed, AccLine, DecLine, AccCurve, DecCurve); @@ -7685,8 +7685,8 @@ int HSI_Motion::SpeedPercent(int AxisNum, double& Speed, int& DirveSpeed, int& S StartSpeed = m_JogStartSpeed[AxisNum][4]; AccLine = m_JogAccLine[AxisNum][4]; DecLine = m_JogDecLine[AxisNum][4]; - AccCurve = m_JogAccCurve[AxisNum][4]; - DecCurve = m_JogDecCurve[AxisNum][4]; + AccCurve = m_JogAccLine[AxisNum][4]*10; + DecCurve = m_JogDecLine[AxisNum][4]*10; g_pLogger->SendAndFlushWithTime( L"[SpeedPercent] 0.01 DriveSpeed: [%d], StartSpeed: [%d], AccLine: [%d], DecLine: [%d], AccCurve: [%d], DecCurve: [%d]\n", DirveSpeed, StartSpeed, AccLine, DecLine, AccCurve, DecCurve); diff --git a/HSI_HexagonMI_EF3/version.h b/HSI_HexagonMI_EF3/version.h index cff58f9..d229786 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:32 " -#define HSI_FILE_CSDESCRIPTION _T("周三 2.24.07 / 10:32 ") +#define HSI_FILE_DESCRIPTION "周三 2.24.07 / 10:47 " +#define HSI_FILE_CSDESCRIPTION _T("周三 2.24.07 / 10:47 ")