xhouse/EF3-Interface
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

验证档位速度，修改测试用例

Browse Source
This commit is contained in:
zhengxuan.zhang
2022-11-15 16:07:51 +08:00
parent 7920c49743
commit 593080a025
4 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HSI_HexagonMI_EF3/HSI_Motion.cpp
+7 -6
View File
@@ -1891,6 +1891,7 @@ HSI_STATUS HSI_Motion::Jog(UINT AxisTypes, double Speed)
//ÊÇ·ñ»Ø¹ý¼ÒÅжÏ
if (m_Home_Machine_Axis[AxisNumber] == 0)
{
g_pLogger->SendAndFlushWithTime(L"[Jog] Current Axis[%d] not homed \n",AxisNumber);
return rStatus;
}
@@ -1902,7 +1903,7 @@ HSI_STATUS HSI_Motion::Jog(UINT AxisTypes, double Speed)
int limitSDPul = 0;
double time;
/*GetPositionXyz(1, now_pos[0], now_pos[1], now_pos[2], time);*/
GetPositionEncPrfMulti(1, now_pos, Prf_pos, 1);
//GetPositionEncPrfMulti(1, now_pos, Prf_pos, 1);
JogSpeed = abs(SpeedPercent(AxisNumber, Speed, DriveSpeed, StartSpeed, AccLine, DecLine, AccCurve, DecCurve));
@@ -3915,16 +3916,16 @@ HSI_STATUS HSI_Motion::Load_EF3_Motion_Inifile(CString GoogolIniFile)
csAppPath);
m_SpeedMax[i] = GetPrivateProfileInt(L"SET_POSITION_SPEED", L"SPEED_RUNMAX_" + axisNum[i], 150, csAppPath);
}
for (int i = 0; i < 5; i++)
for (int i = 0; i < 5; i++)// i 轴
{
for (int j = 1; j < 5; j++)
for (int j = 1; j < 5; j++) //j 档位
{
GetPrivateProfileString(L"JOG_SPEED", L"JOG_DRIVESPEED_" + strGear[i] + axisNum[j], L"10",
temp.GetBufferSetLength(50), 10, csAppPath);
float speed = (atof(T2A(temp)));
m_JogDriveSpeed[j][i] = GetPrivateProfileInt(L"JOG_SPEED", L"JOG_DRIVESPEED_" , 10, csAppPath);
//m_JogDriveSpeed[j][i] = speed / (m_Resolution[j] * 50);
g_pLogger->SendAndFlushWithTime(L"[Load_EF3_Motion_Inifile] m_JogDriveSpeed[%d][%d]: %lf %d\n", j, i, speed,m_JogDriveSpeed[j][i]);//打印配置文件 档位速度
/*m_JogDriveSpeed[j][i] = GetPrivateProfileInt(L"JOG_SPEED", L"JOG_DRIVESPEED_" , 10, csAppPath);*/
m_JogDriveSpeed[j][i] = speed / (m_Resolution[j] * 50);
g_pLogger->SendAndFlushWithTime(L"[Load_EF3_Motion_Inifile] m_JogDriveSpeed[%d][%d]: %.4f %ld\n", i,j,speed,m_JogDriveSpeed[i][j]);//打印配置文件 档位速度
GetPrivateProfileString(L"JOG_SPEED", L"JOG_STARTSPEED_" + strGear[i] + axisNum[j], L"10",
temp.GetBufferSetLength(50), 10, csAppPath);