diff --git a/HSI_HexagonMI_EF3/HSI.cpp b/HSI_HexagonMI_EF3/HSI.cpp index e1004b6..4aaeb68 100644 --- a/HSI_HexagonMI_EF3/HSI.cpp +++ b/HSI_HexagonMI_EF3/HSI.cpp @@ -382,7 +382,6 @@ HSI_API HSI_STATUS WINAPI HSI_MOTION_IS_SUPPORTED(UINT& Types) #pragma region 后续考虑 - //=========================================================================== HSI_API HSI_STATUS WINAPI HSI_MOTION_GET_FOCUSSPEED_XYZ(double &Speed) { diff --git a/HSI_HexagonMI_EF3/HSI.h b/HSI_HexagonMI_EF3/HSI.h index de4612b..f47e535 100644 --- a/HSI_HexagonMI_EF3/HSI.h +++ b/HSI_HexagonMI_EF3/HSI.h @@ -107,74 +107,43 @@ enum HSI_EVENT_FUNCTION_ID // EventData { // Send Receive // V4.2 & V4.3 + - HSI_EVENT_DONE = 0, - // N/A N/A - HSI_EVENT_TAKE_HIT = 1, - // N/A N/A - HSI_EVENT_ERASE_HIT = 2, - // N/A N/A - HSI_EVENT_TIME_CRITICAL = 3, - // "ON", or "OFF" N/A - HSI_EVENT_ZOOM_IN = 4, - // "MAX", "COARSE", or "FINE" N/A - HSI_EVENT_ZOOM_OUT = 5, - // "MAX", "COARSE", or "FINE" N/A - HSI_EVENT_REFRESH_LIVE_VIEW = 6, - // N/A N/A - HSI_EVENT_UPDATE_READOUTS = 7, - // "AxisFlags,%lf{x},%lf{y},%lf{z},%lf{r}" N/A - HSI_EVENT_READ_MC_POSITION = 8, - // "AxisFlags" "AxisFlags,%lf{x},%lf{y},%lf{z},%lf{r}" - HSI_EVENT_MOVE_MC_POSITION = 9, - // "AxisFlags,%lf{x},%lf{y},%lf{z},%lf{r},%lf{speed},%1d{bWait}" N/A - HSI_EVENT_CONVERT_MC_TO_GLOBAL = 10, - // "%lf{x},%lf{y},%lf{z}" "%lf{x},%lf{y},%lf{z}" - HSI_EVENT_UPDATE_STATUS_MESSAGE = 11, - // N/A N/A - HSI_EVENT_OPENFILE_DLG = 12, - // N/A "FileName" - HSI_EVENT_DISPLAY_YESNO_MESSAGE = 13, - // N/A N/A - HSI_EVENT_DISPLAY_OKCANCEL_MESSAGE = 14, - // N/A N/A - HSI_EVENT_DISPLAY_OK_MESSAGE = 15, - // N/A N/A + HSI_EVENT_DONE = 0,// N/A N/A + HSI_EVENT_TAKE_HIT = 1,// N/A N/A + HSI_EVENT_ERASE_HIT = 2,// N/A N/A + HSI_EVENT_TIME_CRITICAL = 3,// "ON", or "OFF" N/A + HSI_EVENT_ZOOM_IN = 4,// "MAX", "COARSE", or "FINE" N/A + HSI_EVENT_ZOOM_OUT = 5,// "MAX", "COARSE", or "FINE" N/A + HSI_EVENT_REFRESH_LIVE_VIEW = 6,// N/A N/A + HSI_EVENT_UPDATE_READOUTS = 7,// "AxisFlags,%lf{x},%lf{y},%lf{z},%lf{r}" N/A + HSI_EVENT_READ_MC_POSITION = 8,// "AxisFlags" "AxisFlags,%lf{x},%lf{y},%lf{z},%lf{r}" + HSI_EVENT_MOVE_MC_POSITION = 9,// "AxisFlags,%lf{x},%lf{y},%lf{z},%lf{r},%lf{speed},%1d{bWait}" N/A + HSI_EVENT_CONVERT_MC_TO_GLOBAL = 10,// "%lf{x},%lf{y},%lf{z}" "%lf{x},%lf{y},%lf{z}" + HSI_EVENT_UPDATE_STATUS_MESSAGE = 11,// N/A N/A + HSI_EVENT_OPENFILE_DLG = 12,// N/A "FileName" + HSI_EVENT_DISPLAY_YESNO_MESSAGE = 13,// N/A N/A + HSI_EVENT_DISPLAY_OKCANCEL_MESSAGE = 14,// N/A N/A + HSI_EVENT_DISPLAY_OK_MESSAGE = 15,// N/A N/A // V4.3 + Only - HSI_EVENT_DEBUG_LOG = 20, - // "%s" N/A - HSI_EVENT_MOVE_MC_POSITION_AND_SETTLE = 21, - // "AxisFlags,%lf{x},%lf{y},%lf{z},%lf{r},%lf{speed}" N/A - HSI_EVENT_CONVERT_GLOBAL_TO_MM = 22, - // "%lf{x},%lf{y},%lf{z}" "%lf{x},%lf{y},%lf{z}" - HSI_EVENT_CONVERT_ROT_TO_TABLE_POINT = 23, - // "%lf{x},%lf{y},%lf{z}" "%lf{x},%lf{y},%lf{z}" - HSI_EVENT_CONVERT_ROT_OUT_TABLE_POINT = 24, - // "%lf{x},%lf{y},%lf{z}" "%lf{x},%lf{y},%lf{z}" - HSI_EVENT_CONVERT_ROT_TO_TABLE_VECTOR = 25, - // "%lf{x},%lf{y},%lf{z}" "%lf{x},%lf{y},%lf{z}" - HSI_EVENT_CONVERT_ROT_OUT_TABLE_VECTOR = 26, - // "%lf{x},%lf{y},%lf{z}" "%lf{x},%lf{y},%lf{z}" + HSI_EVENT_DEBUG_LOG = 20,// "%s" N/A + HSI_EVENT_MOVE_MC_POSITION_AND_SETTLE = 21,// "AxisFlags,%lf{x},%lf{y},%lf{z},%lf{r},%lf{speed}" N/A + HSI_EVENT_CONVERT_GLOBAL_TO_MM = 22,// "%lf{x},%lf{y},%lf{z}" "%lf{x},%lf{y},%lf{z}" + HSI_EVENT_CONVERT_ROT_TO_TABLE_POINT = 23,// "%lf{x},%lf{y},%lf{z}" "%lf{x},%lf{y},%lf{z}" + HSI_EVENT_CONVERT_ROT_OUT_TABLE_POINT = 24,// "%lf{x},%lf{y},%lf{z}" "%lf{x},%lf{y},%lf{z}" + HSI_EVENT_CONVERT_ROT_TO_TABLE_VECTOR = 25,// "%lf{x},%lf{y},%lf{z}" "%lf{x},%lf{y},%lf{z}" + HSI_EVENT_CONVERT_ROT_OUT_TABLE_VECTOR = 26,// "%lf{x},%lf{y},%lf{z}" "%lf{x},%lf{y},%lf{z}" HSI_EVENT_ILLUMINATION_REFRESH = 27, HSI_EVENT_ILLUMINATION_LOCK = 28, HSI_EVENT_ILLUMINATION_STORE_SET = 29, HSI_EVENT_ILLUMINATION_RESTORE_SET = 30, - HSI_EVENT_ILLUMINATION_DECREASE_ACTIVE = 31, - // "%d" - HSI_EVENT_ILLUMINATION_INCREASE_ACTIVE = 32, - // "%d" - HSI_EVENT_ILLUMINATION_DECREASE_ALL = 33, - // "%d" - HSI_EVENT_ILLUMINATION_INCREASE_ALL = 34, - // "%d" - HSI_EVENT_ILLUMINATION_SELECT_LAMP = 35, - // "%d" - HSI_EVENT_ILLUMINATION_SET_LAMP_INTENSITY = 36, - // "%d" - HSI_EVENT_ILLUMINATION_GET_LAMP_INTENSITY = 37, - // "%d" - HSI_EVENT_ILLUMINATION_SET_LAMP_CALIBRATION_OVERRIDE = 38, - // "%d" + HSI_EVENT_ILLUMINATION_DECREASE_ACTIVE = 31,// "%d" + HSI_EVENT_ILLUMINATION_INCREASE_ACTIVE = 32,// "%d" + HSI_EVENT_ILLUMINATION_DECREASE_ALL = 33,// "%d" + HSI_EVENT_ILLUMINATION_INCREASE_ALL = 34,// "%d" + HSI_EVENT_ILLUMINATION_SELECT_LAMP = 35,// "%d" + HSI_EVENT_ILLUMINATION_SET_LAMP_INTENSITY = 36,// "%d" + HSI_EVENT_ILLUMINATION_GET_LAMP_INTENSITY = 37,// "%d" + HSI_EVENT_ILLUMINATION_SET_LAMP_CALIBRATION_OVERRIDE = 38,// "%d" HSI_EVENT_ILLUMINATION_NEXT_RING = 39, HSI_EVENT_ILLUMINATION_PREV_RING = 40, HSI_EVENT_ILLUMINATION_NEXT_SECTOR = 41, @@ -185,52 +154,31 @@ enum HSI_EVENT_FUNCTION_ID // EventData HSI_EVENT_ILLUMINATION_ALLOFF = 46, HSI_EVENT_ILLUMINATION_ALLON = 47, HSI_EVENT_ILLUMINATION_UNLOCK = 48, - HSI_EVENT_IS_PROGRAMMING_MODE = 49, - // 1/0 - HSI_EVENT_IS_PORTLOCK_DCC = 50, - // 1/0 - HSI_EVENT_IS_ROTAB_ENABLED = 51, - // 1/0 - HSI_EVENT_IS_TIME_CRITICAL = 52, - // 1/0 + HSI_EVENT_IS_PROGRAMMING_MODE = 49,// 1/0 + HSI_EVENT_IS_PORTLOCK_DCC = 50,// 1/0 + HSI_EVENT_IS_ROTAB_ENABLED = 51,// 1/0 + HSI_EVENT_IS_TIME_CRITICAL = 52, // 1/0 HSI_EVENT_CONVERT_MM_TO_GLOBAL = 53, HSI_EVENT_CONVERT_GLOBAL_TO_MC = 54, - HSI_EVENT_LASER_FOCUS_ENABLE = 55, - // "%d" 0 = not available, 1 = available - HSI_EVENT_MOVE_POINT = 56, - // N/A N/A + HSI_EVENT_LASER_FOCUS_ENABLE = 55,// "%d" 0 = not available, 1 = available + HSI_EVENT_MOVE_POINT = 56,// N/A N/A HSI_EVENT_MAG_CHANGED = 57, - HSI_EVENT_ILLUMINATION_SET_LAMP_INTENSITY_IN_MACHINE_LEVELx100 = 58, - // "%d" //PR251359-- Instructed to "Please focus on slide" but it's rather unhelpfully turned the lights off for us. - HSI_EVENT_DCC_SCAN_POINTS_AVAILABLE = 59, - // "%d" = more to come, 1 = last set N/A - HSI_EVENT_ILLUMINATION_IS_ALL_OFF = 60, - // 1/0 //PR253777-- Sensilight does not work if the target has 'ALL OFF' for illum setting--4/16/2008 - HSI_EVENT_ILLUMINATION_DECREASE_ALL_NONZERO = 61, - // Sensilight command that wont change a lamp currently set to zero - HSI_EVENT_ILLUMINATION_INCREASE_ALL_NONZERO = 62, - // Sensilight command that wont change a lamp currently set to zero22 - - HSI_EVENT_LP_QUALITY = 63, - // "%d" 0-100% - HSI_EVENT_TP_QUALITY = 64, - // "%d" 0-100% - HSI_EVENT_VP_QUALITY = 65, - // "%d" 0-100% - - HSI_EVENT_FLYMODE_MOVE_COMPLETE = 66, - // A queued flymode move has completed - HSI_EVENT_PENDANT_SPEED_PERCENT = 67, - // 108336 HMV : Add calls to HSI.H for Speed - HSI_EVENT_PENDANT_AXES_SELECTED = 68, - // 108335 HMV : Need to add calls to the HSI.H for Stacked Rotary - + HSI_EVENT_ILLUMINATION_SET_LAMP_INTENSITY_IN_MACHINE_LEVELx100 = 58,// "%d" //PR251359-- Instructed to "Please focus on slide" but it's rather unhelpfully turned the lights off for us. + HSI_EVENT_DCC_SCAN_POINTS_AVAILABLE = 59,// "%d" = more to come, 1 = last set N/A + HSI_EVENT_ILLUMINATION_IS_ALL_OFF = 60,// 1/0 //PR253777-- Sensilight does not work if the target has 'ALL OFF' for illum setting--4/16/2008 + HSI_EVENT_ILLUMINATION_DECREASE_ALL_NONZERO = 61,// Sensilight command that wont change a lamp currently set to zero + HSI_EVENT_ILLUMINATION_INCREASE_ALL_NONZERO = 62,// Sensilight command that wont change a lamp currently set to zero22 + HSI_EVENT_LP_QUALITY = 63,// "%d" 0-100% + HSI_EVENT_TP_QUALITY = 64,// "%d" 0-100% + HSI_EVENT_VP_QUALITY = 65,// "%d" 0-100% + HSI_EVENT_FLYMODE_MOVE_COMPLETE = 66,// A queued flymode move has completed + HSI_EVENT_PENDANT_SPEED_PERCENT = 67,// 108336 HMV : Add calls to HSI.H for Speed + HSI_EVENT_PENDANT_AXES_SELECTED = 68,// 108335 HMV : Need to add calls to the HSI.H for Stacked Rotary HSI_EVENT_MOTION = 500, HSI_EVENT_MOTION_DCC_HOME = 501, HSI_EVENT_MOTION_FOCUS_HOME = 502, HSI_EVENT_MOTION_EMERGENT_STOP = 503, - HSI_EVENT_SHUTDOWN_ = 999, - // N/A N/A + HSI_EVENT_SHUTDOWN_ = 999,// N/A N/A HSI_EVENT_MOTION_DRIVER_ALARM = 1000, HSI_EVENT_MOTION_PROBE = 1001, HSI_EVENT_MOTION_DISPENSER = 1002 @@ -240,7 +188,6 @@ enum HSI_NOTIFY_TYPE { HSI_NOTIFY_PROGRAM_EXECUTION_START = 0, HSI_NOTIFY_PROGRAM_EXECUTION_STOP = 1, - HSI_NOTIFY_TIME_CRITICAL_EVENT_START = 2, HSI_NOTIFY_TIME_CRITICAL_EVENT_STOP = 3, HSI_NOTIFY_PROGRAM_OPEN = 4, @@ -382,15 +329,11 @@ enum HSI_SCAN_MOTION_TYPE { HSI_SCAN_MOTION_LINEAR = 1, HSI_SCAN_MOTION_CIRCULAR, - - HSI_SCAN_MOTION_SPEC_LOCA = 100, - //EF1 + HSI_SCAN_MOTION_SPEC_LOCA = 100,//EF1 HSI_SCAN_MOTION_EQ_DIS, HSI_SCAN_MOTION_EQ_DIS_II, - HSI_SCAN_MOTION_LINEAR_TEST, - //测试使用 - HSI_SCAN_MOTION_EQ_TEST, - //测试使用 + HSI_SCAN_MOTION_LINEAR_TEST,//测试使用 + HSI_SCAN_MOTION_EQ_TEST,//测试使用 HSI_SCAN_MOTION_MANUAL_TEST //测试使用 }; @@ -428,7 +371,10 @@ HSI_API HSI_STATUS WINAPI HSI_MOTION_ABORT_MOTION(); HSI_API HSI_STATUS WINAPI HSI_MOTION_IS_HOMED(bool& bHomed); HSI_API HSI_STATUS WINAPI HSI_MOTION_GET_DIO(UINT IOChannel, UINT& _Status); HSI_API HSI_STATUS WINAPI HSI_MOTION_SET_DIO(UINT IOChannel, UINT _Status); +// 第一阶段结束 + +// 第二阶段需要重写的API 函数 HSI_API HSI_STATUS WINAPI HSI_MOTION_IS_SUPPORTED(UINT &Types); HSI_API HSI_STATUS WINAPI HSI_MOTION_GET_SPEED_XYZ(double &Speed); HSI_API HSI_STATUS WINAPI HSI_MOTION_SET_SPEED_XYZ(double Speed); @@ -448,21 +394,18 @@ HSI_API HSI_STATUS WINAPI HSI_MOTION_SET_POSITION_XYZ_CACHE(UINT AxisTypes, HSI_ HSI_API HSI_STATUS WINAPI HSI_MOTION_GET_POSITION_R(UINT AxisTypes, double &PositionR, double &Time); HSI_API HSI_STATUS WINAPI HSI_MOTION_SET_POSITION_R(UINT AxisTypes, double PositionR, HSI_MOTION_AXIS_R_MOVE_TYPE DirectionType, bool bWait); HSI_API HSI_STATUS WINAPI HSI_MOTION_SET_PLAN_SCAN(double *pdStartPosX, double *pdStartPosY, double *pdStartPosZ, double *pdEndPosX, double *pdEndPosY, double *pdEndPosZ, double *pdStepDis, bool *pbTrig, int iCount); - HSI_API HSI_STATUS WINAPI HSI_MOTION_DCC_SCAN_SET_DATA(UINT AxisTypes, HSI_SCAN_MOTION_TYPE eType, UINT lTrigNumber, double* dTrigDis); HSI_API HSI_STATUS WINAPI HSI_MOTION_DCC_SCAN_START(); HSI_API HSI_STATUS WINAPI HSI_MOTION_DCC_SCAN_STOP(); - - -//HSI_API HSI_STATUS WINAPI HSI_MOTION_IS_SUPPORTED_EX(UINT AxisTypes, UINT &Types); -//HSI_API HSI_STATUS WINAPI HSI_MOTION_STARTUP_EX(UINT AxisTypes, bool bHome); -//HSI_API HSI_STATUS WINAPI HSI_MOTION_GET_SCALE_RESOLUTION_EX(UINT AxisTypes, double &Scale); -//HSI_API HSI_STATUS WINAPI HSI_MOTION_SET_SCALE_RESOLUTION_EX(UINT AxisTypes, double Scale); -//HSI_API HSI_STATUS WINAPI HSI_MOTION_GET_POSITION_EX(UINT AxisTypes, double &Position, double &Time); -//HSI_API HSI_STATUS WINAPI HSI_MOTION_SET_POSITION_EX(UINT AxisTypes, double Position, HSI_MOTION_MOVE_TYPE eType, double dSpeedGear); -//HSI_API HSI_STATUS WINAPI HSI_MOTION_GET_SPEED_EX(UINT AxisTypes, double &Speed); -//HSI_API HSI_STATUS WINAPI HSI_MOTION_GET_ACCELERATION_EX(UINT AxisTypes, double &Accel); -//HSI_API HSI_STATUS WINAPI HSI_MOTION_SET_ACCELERATION_EX(UINT AxisTypes, double Accel); +HSI_API HSI_STATUS WINAPI HSI_MOTION_IS_SUPPORTED_EX(UINT AxisTypes, UINT &Types); +HSI_API HSI_STATUS WINAPI HSI_MOTION_STARTUP_EX(UINT AxisTypes, bool bHome); +HSI_API HSI_STATUS WINAPI HSI_MOTION_GET_SCALE_RESOLUTION_EX(UINT AxisTypes, double &Scale); +HSI_API HSI_STATUS WINAPI HSI_MOTION_SET_SCALE_RESOLUTION_EX(UINT AxisTypes, double Scale); +HSI_API HSI_STATUS WINAPI HSI_MOTION_GET_POSITION_EX(UINT AxisTypes, double &Position, double &Time); +HSI_API HSI_STATUS WINAPI HSI_MOTION_SET_POSITION_EX(UINT AxisTypes, double Position, HSI_MOTION_MOVE_TYPE eType, double dSpeedGear); +HSI_API HSI_STATUS WINAPI HSI_MOTION_GET_SPEED_EX(UINT AxisTypes, double &Speed); +HSI_API HSI_STATUS WINAPI HSI_MOTION_GET_ACCELERATION_EX(UINT AxisTypes, double &Accel); +HSI_API HSI_STATUS WINAPI HSI_MOTION_SET_ACCELERATION_EX(UINT AxisTypes, double Accel); //暂未实现 diff --git a/HSI_HexagonMI_EF3/HSI_Motion.cpp b/HSI_HexagonMI_EF3/HSI_Motion.cpp index 0df3ef9..5342081 100644 --- a/HSI_HexagonMI_EF3/HSI_Motion.cpp +++ b/HSI_HexagonMI_EF3/HSI_Motion.cpp @@ -4618,6 +4618,7 @@ HSI_STATUS HSI_Motion::GetDIO(UINT IOChannel, UINT& _Status) auto rStatus = HSI_STATUS_NORMAL; if (g_pHSI_Motion) { + g_pLogger->SendAndFlushWithTime(L"[GetDIO] In\n"); if (m_SO7_Serial.m_RecvData[0] == 2) { if (IOChannel == HSI_MOTION_INPUT_LIMIT_SWITCH) @@ -4662,6 +4663,7 @@ HSI_STATUS HSI_Motion::GetDIO(UINT IOChannel, UINT& _Status) { g_pLogger->SendAndFlushWithTime(L"[GetDIO] failed\n"); } + g_pLogger->SendAndFlushWithTime(L"[GetDIO] Out\n"); } //-----------TEST Begin------------------ _Status = 0; @@ -4735,6 +4737,7 @@ HSI_STATUS HSI_Motion::SetDIO(UINT IOChannel, UINT _Status) auto rStatus = HSI_STATUS_NORMAL; if (g_pHSI_Motion) { + g_pLogger->SendAndFlushWithTime(L"[SetDIO] In\n"); if (m_bISUseMoreLights > 0 && (m_ForStatus != _Status)) { if (m_Led8MotionFlag[m_selectedIndex]) @@ -4780,12 +4783,11 @@ HSI_STATUS HSI_Motion::SetDIO(UINT IOChannel, UINT _Status) m_WriteByte = Send_Command(0, (const char*)m_cSendData, m_SendDataLength); Sleep(5); } + g_pLogger->SendAndFlushWithTime(L"[SetDIO] Out\n"); } //-----------TEST Begin------------------ _Status = 0; - - //-----------TEST End------------------ return rStatus; } diff --git a/HSI_HexagonMI_EF3/HSI_Motion.h b/HSI_HexagonMI_EF3/HSI_Motion.h index b7cb9bb..ac0e555 100644 --- a/HSI_HexagonMI_EF3/HSI_Motion.h +++ b/HSI_HexagonMI_EF3/HSI_Motion.h @@ -282,7 +282,6 @@ public: * \return */ HSI_STATUS Shutdown() override; - //HSI_STATUS ShutdownOld() override; HSI_STATUS IsSupportedEx(UINT AxisTypes, UINT& Types); HSI_STATUS StartupEx(UINT AxisTypes, bool bHome); HSI_STATUS GetScaleResolutionEx(UINT AxisTypes, double& Scale); diff --git a/HSI_HexagonMI_EF3/version.h b/HSI_HexagonMI_EF3/version.h index 219d53b..a3dab91 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 "2022.11.01 / 11:45 " -#define HSI_FILE_CSDESCRIPTION _T("2022.11.01 / 11:45 ") +#define HSI_FILE_DESCRIPTION "2022.11.01 / 12:05 " +#define HSI_FILE_CSDESCRIPTION _T("2022.11.01 / 12:05 ")