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

格式整理，在原来基础上做减法 减去遥杆、光照、探针等功能

Browse Source
This commit is contained in:
wio
2022-09-30 16:45:28 +08:00
parent 7c4c565d09
commit 2f481baaa2
57 changed files with 84021 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HSI_HexagonMI_EF3/HSI.cpp
+42 -31
View File
@@ -84,24 +84,24 @@ HSI_API HSI_STATUS WINAPI HSI_SHUTDOWM()
delete g_pLogger2;
g_pLogger2 = NULL;
}
if (g_pHSI_Illumination)
{
rStatus = g_pHSI_Illumination->Shutdown();
delete g_pHSI_Illumination;
g_pHSI_Illumination = nullptr;
}
//if (g_pHSI_Illumination)
//{
// rStatus = g_pHSI_Illumination->Shutdown();
// delete g_pHSI_Illumination;
// g_pHSI_Illumination = nullptr;
//}
if (g_pHSI_Motion)
{
rStatus = g_pHSI_Motion->Shutdown();
delete g_pHSI_Motion;
g_pHSI_Motion = nullptr;
}
if (g_pHSI_JoyStick)
{
g_pHSI_JoyStick->SuspendJoyStickThread();
delete g_pHSI_JoyStick;
g_pHSI_JoyStick = nullptr;
}
//if (g_pHSI_JoyStick)
//{
// g_pHSI_JoyStick->SuspendJoyStickThread();
// delete g_pHSI_JoyStick;
// g_pHSI_JoyStick = nullptr;
//}
if (g_pHSI_Sevenocean_EF3)
{
g_pHSI_Sevenocean_EF3->Shutdown();
@@ -170,11 +170,11 @@ HSI_API HSI_STATUS WINAPI HSI_MOTION_STARTUP(bool bHome)
case 0:
break;
case 1:
if (!g_pHSI_JoyStick)
{
g_pHSI_JoyStick = new HSI_Joystick(g_pHSI_Motion);
g_pHSI_JoyStick->ResumeJoyStickThread();
}
//if (!g_pHSI_JoyStick)
//{
// g_pHSI_JoyStick = new HSI_Joystick(g_pHSI_Motion);
// g_pHSI_JoyStick->ResumeJoyStickThread();
//}
break;
default:
break;
@@ -188,19 +188,25 @@ HSI_API HSI_STATUS WINAPI HSI_MOTION_STARTUP(bool bHome)
return rStatus;
}
//===========================================================================
HSI_API HSI_STATUS WINAPI HSI_MOTION_IS_HOMED(bool &bHomed)
{
auto rStatus = HSI_STATUS_NORMAL;
if (g_pHSI_Motion)
{
rStatus = g_pHSI_Motion->IsHomed(bHomed);
}
else
{
rStatus = HSI_STATUS_FAILED;
}
return rStatus;
}
/**
* .询问机台是否在原点
*
* \param bHomed 是否在 原 点
* \return
*/
//HSI_API HSI_STATUS WINAPI HSI_MOTION_IS_HOMED(bool &bHomed)
//{
// auto rStatus = HSI_STATUS_NORMAL;
// if (g_pHSI_Motion)
// {
// rStatus = g_pHSI_Motion->IsHomed(bHomed);
// }
// else
// {
// rStatus = HSI_STATUS_FAILED;
// }
// return rStatus;
//}
//===========================================================================
HSI_API HSI_STATUS WINAPI HSI_EF3MOTION_GET_SPEED_XYZ(int axis,double &Speed)
{
@@ -974,8 +980,10 @@ HSI_API HSI_STATUS WINAPI HSI_MOTION_FINDORIGINTEST(bool type)
return rStatus;
}
#if 0
/////////////////////////////////////////////////////////////////////////////
#pragma region // ILLUMINATION API
//===========================================================================
HSI_API HSI_STATUS WINAPI HSI_ILLUMINATION_IS_SUPPORTED(UINT &Types)
@@ -1144,6 +1152,7 @@ HSI_API HSI_STATUS WINAPI HSI_ILLUMINATION_TESTLIGHT(bool flag)
}
//===========================================================================
#pragma endregion
// 0
/////////////////////////////////////////////////////////////////////////////
#pragma region probe
//===========================================================================
@@ -1335,6 +1344,8 @@ HSI_API HSI_STATUS WINAPI HSI_TP_SHUTDOWN()
//===========================================================================
#pragma endregion
#endif
#pragma region Test
//===========================================================================
HSI_API HSI_STATUS WINAPI HSI_MOTION_COLLECTPOS(bool isEnable, MOTOR_AXISCHOOES_CMD axis, short cycle)