diff --git a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/CMD_H.h b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/CMD_H.h index 82590b4..56f4d22 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/CMD_H.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/CMD_H.h @@ -341,9 +341,11 @@ enum PRO_DATA CT_CLEAR_PROBE_FLAG, CT_READ_IO_DAT, - CT_WRITE_IO_DAT, - - + CT_WRITE_IO_DAT, + + CT_READ_SEQ_NUMBER, + CT_WRITE_SEQ_NUMBER, + CT_DATA_TOTAL=255 }; diff --git a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp index 4a98b4c..d0e25d1 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp @@ -241,6 +241,10 @@ void CSO7_Proto::_process_rcv_transfer_data(int iEP) case CT_READ_SYSTEM: _process_SO7_CMD_READ_DATA_FROM_FPGA(); break; + case CT_READ_SEQ_NUMBER: + _process_SO7_CMD_GET_SEQ_NUMBER(); + break; + default: TRACE1("_process_rcv_transfer_data() : Unknown ep_buff[EP_02_CMD_IDX]._save_send_cmd : %X \r\n", ep_buff[EP_02_CMD_IDX]._save_send_cmd); TRACE1("_process_rcv_transfer_data() : Unknown ep_buff[EP_81_DATA_IDX]._buffer[0] : %X \r\n", ep_buff[EP_81_DATA_IDX]._buffer[0]); @@ -499,7 +503,7 @@ CSO7_Proto::CSO7_Proto() g_machine.dRotaryCirclDis=100; g_machine.Light_Size=0; g_machine.Light_Switch=0; - + g_machine.SEQ_NUMBER=0; g_machine.s_machine_config.x_axis._scale_resolution=0.5; g_machine.s_machine_config.y_axis._scale_resolution=0.5; g_machine.s_machine_config.z_axis._scale_resolution=0.5; @@ -4628,7 +4632,42 @@ SSI_STATUS_MOTION CSO7_Proto::_send_cmd_SO7_CMD_MOVE_XY(char SpeedGearX,char Spe ReleaseMutex(g_hEP02_Serial_Mutex); return SSI_STATUS_MOTION_NORMAL; } +//============================================================== +SSI_STATUS_MOTION CSO7_Proto::_send_cmd_SO7_CMD_SET_SEQ_NUMBER() +{ + WaitForSingleObject(g_hEP02_Serial_Mutex, INFINITE); + memset(ep_buff[EP_02_CMD_IDX]._buffer, 0x00, MAX_BUFF_SIZE); + *(ep_buff[EP_02_CMD_IDX]._buffer) = CT_DATA; + *(ep_buff[EP_02_CMD_IDX]._buffer+1) = CT_WRITE_SEQ_NUMBER; + *(ep_buff[EP_02_CMD_IDX]._buffer+2)=g_machine.SEQ_NUMBER; + + ep_buff[EP_02_CMD_IDX]._size = 0x03; + ep_buff[EP_81_DATA_IDX]._size = 0x45; + + g_hEP02_Thread_State=THREAD_RUNNING_STATE2; + _do_single_threaded_usb_comm(EP_02_CMD_IDX); + ReleaseMutex(g_hEP02_Serial_Mutex); + return SSI_STATUS_MOTION_NORMAL; +} +//============================================================== +SSI_STATUS_MOTION CSO7_Proto::_send_cmd_SO7_CMD_GET_SEQ_NUMBER() +{ + WaitForSingleObject(g_hEP02_Serial_Mutex, INFINITE); + memset(ep_buff[EP_02_CMD_IDX]._buffer, 0x00, MAX_BUFF_SIZE); + + *(ep_buff[EP_02_CMD_IDX]._buffer) = CT_DATA; + *(ep_buff[EP_02_CMD_IDX]._buffer+1) = CT_READ_SEQ_NUMBER; + + ep_buff[EP_02_CMD_IDX]._size = 0x02; + ep_buff[EP_82_DATA_IDX]._size = 0x01; + + g_hEP02_Thread_State=THREAD_RUNNING_STATE1; + g_hEP8x_Thread_State=THREAD_RUNNING_STATE2; + _do_single_threaded_usb_comm(EP_02_CMD_IDX); + ReleaseMutex(g_hEP02_Serial_Mutex); + return SSI_STATUS_MOTION_NORMAL; +} //============================================================== SSI_STATUS_MOTION CSO7_Proto::_process_SO7_CMD_MOVE_X() { @@ -4976,4 +5015,10 @@ SSI_STATUS_MOTION CSO7_Proto::_process_SO7_CMD_GET_INTERRUPT_MSG(BYTE Type) g_machine.GetInterruptMsg[Type][0]=*(ep_buff[EP_82_DATA_IDX]._buffer); g_machine.GetInterruptMsg[Type][1]=*(ep_buff[EP_82_DATA_IDX]._buffer+1); return SSI_STATUS_MOTION_NORMAL; +} +//============================================================== +SSI_STATUS_MOTION CSO7_Proto::_process_SO7_CMD_GET_SEQ_NUMBER() +{ + g_machine.SEQ_NUMBER=*(ep_buff[EP_82_DATA_IDX]._buffer); + return SSI_STATUS_MOTION_NORMAL; } \ No newline at end of file diff --git a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h index 0a1df0d..1cf8245 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h @@ -235,7 +235,7 @@ struct struct_so7_machine BOOL IsOffline; BOOL IsSupportReadInterrputMsg; double dRotaryCirclDis; - + char SEQ_NUMBER; struct s_so7_axis x; struct s_so7_axis y; struct s_so7_axis z; @@ -448,6 +448,8 @@ public: SSI_STATUS_MOTION _send_cmd_SO7_CMD_SET_GET_INTERRUPT_MSG_METHOD(char Method); SSI_STATUS_MOTION _send_cmd_SO7_CMD_MOVE_XY(char SpeedGearX,char SpeedGearY); SSI_STATUS_MOTION _send_cmd_SO7_CMD_SET_CONSTANT_SPEED(int iSpeed,char axis_type,char xyz_gear); + SSI_STATUS_MOTION _send_cmd_SO7_CMD_SET_SEQ_NUMBER(); + SSI_STATUS_MOTION _send_cmd_SO7_CMD_GET_SEQ_NUMBER(); static SSI_STATUS_MOTION _process_SO7_CMD_MOVE_X(); @@ -486,6 +488,8 @@ public: static SSI_STATUS_MOTION _process_SO7_CMD_READ_DATA_FROM_FPGA(); static SSI_STATUS_MOTION _process_SO7_CMD_READ_FIRMWARE_VERSION_INFO(); static SSI_STATUS_MOTION _process_SO7_CMD_GET_INTERRUPT_MSG(BYTE Type); + static SSI_STATUS_MOTION _process_SO7_CMD_GET_SEQ_NUMBER(); + }; #endif diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log index b737aeb..7d9a5e4 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log @@ -3742,3 +3742,79 @@ Init:Open device succeed . _start_machine Exit: Exit_SO7Usb Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Init:Open device succeed . +_start_machine +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/Utility_Config.ini b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/Utility_Config.ini index ec4ad02..3b655eb 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/Utility_Config.ini +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/Utility_Config.ini @@ -11,11 +11,11 @@ MOVETOSPEED_FAST_Z=0.00000000 MOVETOSPEED_SLOW_Z=0.00000000 MOVETOSPEED_SCALE_Z=1.00000000 ; -SPEED_BASE_X1=20 +SPEED_BASE_X1=28 SPEED_MAX_X1=20 SPEED_START_X1=20 SPEED_FRESH_X1=8 -SPEED_SLOW_X1=3.300 +SPEED_SLOW_X1=3.400 ; SPEED_BASE_X2=16 SPEED_MAX_X2=10 diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc index 8a785f5..7fecc25 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc @@ -27,7 +27,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED // Dialog // -IDD_SO7_UTIL_DIALOG DIALOGEX 0, 0, 460, 410 +IDD_SO7_UTIL_DIALOG DIALOGEX 0, 0, 461, 410 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "SevenOcean Utility" FONT 8, "MS Shell Dlg", 400, 0, 0x1 @@ -51,20 +51,20 @@ BEGIN CONTROL "Fourth",IDC_RADIO_SPEED_GEAR4,"Button",BS_AUTORADIOBUTTON,170,236,37,10 CONTROL "Fifth",IDC_RADIO_SPEED_GEAR5,"Button",BS_AUTORADIOBUTTON,170,249,31,10 GROUPBOX "R/W IO PORT",IDC_STATIC,301,129,144,69 - PUSHBUTTON "Start_Machine",IDC_BUTTON_START_SO7MACHINE,25,24,63,18 - PUSHBUTTON "Stop_Machine",IDC_BUTTON_STOP_SO7MACHINE,25,50,63,18 - PUSHBUTTON "Read XYZ Axis",IDC_BUTTON_SO7_READ_AXIS_XYZ,114,27,62,15 - PUSHBUTTON "EnProbe OFF",IDC_BUTTON_READ_PROBE,114,43,62,15 - PUSHBUTTON "Read V Axis",IDC_BUTTON_SO7_READ_AXIS_V,114,59,62,15 - PUSHBUTTON "Get Fixture Value",IDC_BUTTON_GET_FIXTURE_FLAG,114,75,62,15 - PUSHBUTTON "Get Reset Flag",IDC_BUTTON_SO7_GET_RESET_FLAG,114,91,62,15 - EDITTEXT IDC_EDIT_AXIAL_LIGHT,303,27,29,12,ES_AUTOHSCROLL | NOT WS_TABSTOP - EDITTEXT IDC_EDIT_BOTTOM_LIGHT,303,41,29,12,ES_AUTOHSCROLL | NOT WS_TABSTOP - EDITTEXT IDC_EDIT_RING_LIGHT,303,55,29,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_COAXIAL_LIGHT3,303,69,29,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_COAXIAL_LIGHT4,303,83,29,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_COAXIAL_LIGHT,303,97,29,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_COAXIAL_LIGHT2,303,111,29,12,ES_AUTOHSCROLL + PUSHBUTTON "Start_Machine",IDC_BUTTON_START_SO7MACHINE,29,24,63,18 + PUSHBUTTON "Stop_Machine",IDC_BUTTON_STOP_SO7MACHINE,29,50,63,18 + PUSHBUTTON "Read XYZ Axis",IDC_BUTTON_SO7_READ_AXIS_XYZ,104,24,60,15 + PUSHBUTTON "EnProbe OFF",IDC_BUTTON_READ_PROBE,104,45,60,15 + PUSHBUTTON "Read V Axis",IDC_BUTTON_SO7_READ_AXIS_V,167,24,60,15 + PUSHBUTTON "Get Fixture Value",IDC_BUTTON_GET_FIXTURE_FLAG,104,66,60,15 + PUSHBUTTON "Get Reset Flag",IDC_BUTTON_SO7_GET_RESET_FLAG,104,87,60,15 + EDITTEXT IDC_EDIT_AXIAL_LIGHT,333,26,29,12,ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT IDC_EDIT_BOTTOM_LIGHT,333,40,29,12,ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT IDC_EDIT_RING_LIGHT,333,54,29,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_COAXIAL_LIGHT3,333,68,29,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_COAXIAL_LIGHT4,333,82,29,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_COAXIAL_LIGHT,333,96,29,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_COAXIAL_LIGHT2,333,110,29,12,ES_AUTOHSCROLL PUSHBUTTON "Motion Parameter",IDC_BUTTON_MOTION_PARAMETER,29,141,44,28,BS_MULTILINE PUSHBUTTON "V+",IDC_BUTTON_SO7_MOVE_ZOOM_IN,20,209,25,12 PUSHBUTTON "V-",IDC_BUTTON_SO7_MOVE_ZOOM_OUT,20,231,25,12 @@ -74,34 +74,34 @@ BEGIN PUSHBUTTON "Y+",IDC_BUTTON_SO7_MOVE_Y_FRONT,97,207,25,12 PUSHBUTTON "Y-",IDC_BUTTON_SO7_MOVE_Y_BACK,97,233,25,12 PUSHBUTTON "X+",IDC_BUTTON_SO7_MOVE_X_RIGHT,122,220,25,12 - PUSHBUTTON "CT_RESET",IDC_BUTTON_SO7_RESET_XYZ,191,75,62,15,BS_MULTILINE + PUSHBUTTON "CT_RESET",IDC_BUTTON_SO7_RESET_XYZ,167,66,60,15,BS_MULTILINE PUSHBUTTON "Home Manual SET_RESET_FLAG",IDC_BUTTON_MANUAL_HOME,219,195,76,22,BS_MULTILINE PUSHBUTTON "Home DCC",IDC_BUTTON_RESET_WORKTABLE,219,227,40,22 - PUSHBUTTON "CT_M_RESET _RIGHT",IDC_BUTTON_RESET_WORKTABLE_RIGHT,191,47,62,25,BS_MULTILINE - PUSHBUTTON "Test AutoZoom",IDC_BUTTON_AUTO_ZOOM,25,82,63,18,BS_MULTILINE - PUSHBUTTON "Set Reset Flag",IDC_BUTTON_SET_RESET_FLAG,114,107,62,15 - PUSHBUTTON "Home V",IDC_BUTTON_RESET_V,191,91,62,15 + PUSHBUTTON "RESET_RIGHT",IDC_BUTTON_RESET_WORKTABLE_RIGHT,167,45,60,15,BS_MULTILINE + PUSHBUTTON "Test AutoZoom",IDC_BUTTON_AUTO_ZOOM,29,82,63,18,BS_MULTILINE + PUSHBUTTON "Set Reset Flag",IDC_BUTTON_SET_RESET_FLAG,104,108,60,15 + PUSHBUTTON "Home V",IDC_BUTTON_RESET_V,167,87,60,15 EDITTEXT IDC_EDIT_X_SCALE_COEFFICIENT,64,286,39,12,ES_CENTER | ES_AUTOHSCROLL EDITTEXT IDC_EDIT_Y_SCALE_COEFFICIENT,123,286,39,12,ES_CENTER | ES_AUTOHSCROLL EDITTEXT IDC_EDIT_Z_SCALE_COEFFICIENT,182,286,39,12,ES_CENTER | ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_SET_VER_NO,223,28,29,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_SET_VER_NO,261,25,29,14,ES_AUTOHSCROLL GROUPBOX "USB Control",IDC_STATIC,17,12,81,59 GROUPBOX "Config",IDC_STATIC,17,130,116,44 - GROUPBOX "CMD",IDC_STATIC,105,12,156,115 - LTEXT "Ver NO.",IDC_STATIC,192,31,26,8 + GROUPBOX "CMD",IDC_STATIC,102,12,193,116 + LTEXT "Ver NO.",IDC_STATIC,232,27,26,8 GROUPBOX "R/W Data",IDC_STATIC,301,199,144,65 CONTROL "X",IDC_RADIO_SELECT_X,"Button",BS_AUTORADIOBUTTON | WS_GROUP,309,213,20,10 CONTROL "Y",IDC_RADIO_SELECT_Y,"Button",BS_AUTORADIOBUTTON,309,229,20,10 CONTROL "Z",IDC_RADIO_SELECT_Z,"Button",BS_AUTORADIOBUTTON,309,245,20,10 - GROUPBOX "Light Control",IDC_STATIC,267,12,102,115 - LTEXT "Top",IDC_STATIC,278,28,18,11 - LTEXT "Bottom",IDC_STATIC,276,43,22,11 - LTEXT "Ring",IDC_STATIC,277,58,15,8 - LTEXT "Coaxial",IDC_STATIC,273,99,24,8 - LTEXT "SegI",IDC_STATIC,278,72,16,8 - LTEXT "SegII",IDC_STATIC,278,86,18,8 - GROUPBOX "I/O Port Status",IDC_STATIC,375,12,69,115 - PUSHBUTTON "Exit",IDCANCEL,408,389,39,14 + GROUPBOX "Light Control",IDC_STATIC,299,12,94,115 + LTEXT "Top",IDC_STATIC,308,28,18,11 + LTEXT "Bottom",IDC_STATIC,306,43,22,11 + LTEXT "Ring",IDC_STATIC,307,57,15,8 + LTEXT "Coaxial",IDC_STATIC,303,99,24,8 + LTEXT "SegI",IDC_STATIC,308,71,16,8 + LTEXT "SegII",IDC_STATIC,308,86,18,8 + GROUPBOX "I/O Port",IDC_STATIC,396,12,48,115 + PUSHBUTTON "Exit",IDCANCEL,409,389,39,14 LTEXT "x",IDC_STATIC,25,326,8,11 LTEXT "y",IDC_STATIC,25,341,8,11 LTEXT "z",IDC_STATIC,25,354,8,11 @@ -127,27 +127,27 @@ BEGIN EDITTEXT IDC_EDIT_ZM_POSITION_59,176,366,54,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP LTEXT "Reference Mark",IDC_STATIC,179,311,52,8 LTEXT "Pos Update Frequency",IDC_STATIC,106,386,74,8 - LTEXT "Spare1",IDC_STATIC,274,112,24,8 + LTEXT "Spare1",IDC_STATIC,304,111,24,8 CTEXT "X",IDC_STATIC,80,274,8,8 CTEXT "Y",IDC_STATIC,139,275,8,8 CTEXT "Z",IDC_STATIC,198,274,8,8 CTEXT "Scale Resolution",IDC_STATIC,22,282,35,20 GROUPBOX "Set Gear",IDC_STATIC,160,183,53,81 PUSHBUTTON "so7_config ini",IDC_BUTTON_SETUP_SO7CONFIG,82,141,44,28,BS_MULTILINE - LTEXT "1",IDC_STATIC,388,29,8,8 - LTEXT "2",IDC_STATIC,388,45,8,8 - LTEXT "3",IDC_STATIC,388,61,8,8 - LTEXT "4",IDC_STATIC,388,77,8,8 - LTEXT "5",IDC_STATIC,388,93,8,8 - LTEXT "6",IDC_STATIC,388,109,8,8 - CONTROL "",IDC_MFCBUTTON_STATUS_IN_PORT1,"MfcButton",WS_TABSTOP,404,26,21,14 - CONTROL "",IDC_MFCBUTTON_STATUS_IN_PORT2,"MfcButton",WS_TABSTOP,404,42,21,14 - CONTROL "",IDC_MFCBUTTON_STATUS_IN_PORT3,"MfcButton",WS_TABSTOP,404,58,21,14 - CONTROL "",IDC_MFCBUTTON_STATUS_IN_PORT4,"MfcButton",WS_TABSTOP,404,74,21,14 - CONTROL "",IDC_MFCBUTTON_STATUS_IN_PORT5,"MfcButton",WS_TABSTOP,404,90,21,14 - CONTROL "",IDC_MFCBUTTON_STATUS_IN_PORT6,"MfcButton",WS_TABSTOP,404,106,21,14 - PUSHBUTTON "Test Z Signal",IDC_BUTTON_SO7_TEST_Z_SIGNAL,191,107,62,15 - PUSHBUTTON "CNC Program",IDC_BUTTON_SO7_CNC_PROGRAM,25,105,63,18 + LTEXT "1",IDC_STATIC,403,28,8,8 + LTEXT "2",IDC_STATIC,403,44,8,8 + LTEXT "3",IDC_STATIC,403,60,8,8 + LTEXT "4",IDC_STATIC,403,76,8,8 + LTEXT "5",IDC_STATIC,403,92,8,8 + LTEXT "6",IDC_STATIC,403,108,8,8 + CONTROL "",IDC_MFCBUTTON_STATUS_IN_PORT1,"MfcButton",WS_TABSTOP,414,26,21,14 + CONTROL "",IDC_MFCBUTTON_STATUS_IN_PORT2,"MfcButton",WS_TABSTOP,414,42,21,14 + CONTROL "",IDC_MFCBUTTON_STATUS_IN_PORT3,"MfcButton",WS_TABSTOP,414,58,21,14 + CONTROL "",IDC_MFCBUTTON_STATUS_IN_PORT4,"MfcButton",WS_TABSTOP,414,74,21,14 + CONTROL "",IDC_MFCBUTTON_STATUS_IN_PORT5,"MfcButton",WS_TABSTOP,414,90,21,14 + CONTROL "",IDC_MFCBUTTON_STATUS_IN_PORT6,"MfcButton",WS_TABSTOP,414,106,21,14 + PUSHBUTTON "Test Z Signal",IDC_BUTTON_SO7_TEST_Z_SIGNAL,167,108,60,15 + PUSHBUTTON "CNC Program",IDC_BUTTON_SO7_CNC_PROGRAM,29,105,63,18 GROUPBOX "Advanced Function",IDC_STATIC,17,73,81,54 EDITTEXT IDC_EDIT_RWDATA_DATA,355,236,44,13,ES_AUTOHSCROLL PUSHBUTTON "Write",IDC_BUTTON_SO7_SENDDATATOFPGA,408,209,34,19 @@ -161,14 +161,17 @@ BEGIN PUSHBUTTON "",IDC_BUTTON_SO7_MOVE_XL_YF,71,207,25,12 PUSHBUTTON "",IDC_BUTTON_SO7_MOVE_XL_YB,71,233,25,12 GROUPBOX "Rotary",IDC_STATIC,135,129,163,44 - CONTROL "ON",IDC_CHECK_SO7_TOP_LIGHT_ON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,336,28,26,10 - CONTROL "ON",IDC_CHECK_SO7_BOTTOM_LIGHT_ON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,336,42,26,10 - CONTROL "ON",IDC_CHECK_SO7_RING_LIGHT_ON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,336,56,26,10 - CONTROL "ON",IDC_CHECK_SO7_RING_LIGHT_SEG_ON1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,336,70,26,10 - CONTROL "ON",IDC_CHECK_SO7_RING_LIGHT_SEG_ON2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,336,84,26,10 - CONTROL "ON",IDC_CHECK_SO7_COAXIAL_LIGHT_ON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,336,98,26,10 - CONTROL "ON",IDC_CHECK_SO7_SPARE_LIGHT_ON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,336,112,26,10 + CONTROL "ON",IDC_CHECK_SO7_TOP_LIGHT_ON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,366,28,26,10 + CONTROL "ON",IDC_CHECK_SO7_BOTTOM_LIGHT_ON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,366,42,26,10 + CONTROL "ON",IDC_CHECK_SO7_RING_LIGHT_ON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,366,56,26,10 + CONTROL "ON",IDC_CHECK_SO7_RING_LIGHT_SEG_ON1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,366,70,26,10 + CONTROL "ON",IDC_CHECK_SO7_RING_LIGHT_SEG_ON2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,366,84,26,10 + CONTROL "ON",IDC_CHECK_SO7_COAXIAL_LIGHT_ON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,366,98,26,10 + CONTROL "ON",IDC_CHECK_SO7_SPARE_LIGHT_ON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,366,112,26,10 LTEXT "----------------------------------------------------",IDC_STATIC,305,170,140,8 + EDITTEXT IDC_EDIT_SET_SEQ_NO,261,46,29,14,ES_AUTOHSCROLL + PUSHBUTTON "Get SEQ NO.",IDC_BUTTON_SO7_GET_SEQ_NUMBER,230,66,60,15,BS_MULTILINE + LTEXT "SEQ NO.",IDC_STATIC,232,48,29,8 END IDD_SO7_UTIL_SEND_PARAMETER DIALOGEX 0, 0, 750, 480 @@ -911,7 +914,7 @@ BEGIN IDD_SO7_UTIL_DIALOG, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 447 + RIGHTMARGIN, 448 TOPMARGIN, 7 BOTTOMMARGIN, 403 END diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.cpp index 405cdf6..974bd20 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.cpp @@ -145,6 +145,8 @@ BEGIN_MESSAGE_MAP(CSO7_UtilDlg, CDialog) ON_BN_CLICKED(IDC_CHECK_SO7_COAXIAL_LIGHT_ON, &CSO7_UtilDlg::OnBnClickedCheckSo7CoaxialLightOn) ON_BN_CLICKED(IDC_CHECK_SO7_SPARE_LIGHT_ON, &CSO7_UtilDlg::OnBnClickedCheckSo7SpareLightOn) ON_BN_CLICKED(IDC_RADIO_READ_OUTPUT_PORT2, &CSO7_UtilDlg::OnBnClickedRadioReadOutputPort2) + ON_EN_KILLFOCUS(IDC_EDIT_SET_SEQ_NO, &CSO7_UtilDlg::OnEnKillfocusEditSetSeqNo) + ON_BN_CLICKED(IDC_BUTTON_SO7_GET_SEQ_NUMBER, &CSO7_UtilDlg::OnBnClickedButtonSo7GetSeqNumber) END_MESSAGE_MAP() @@ -189,6 +191,9 @@ BOOL CSO7_UtilDlg::OnInitDialog() ((CButton *)GetDlgItem(IDC_RADIO_READ_INPUT_PORT))->SetCheck(true); ((CButton *)GetDlgItem(IDC_RADIO_READ_OUTPUT_PORT))->SetCheck(false); + ((CButton *)GetDlgItem(IDC_RADIO_RELATIVE))->SetCheck(true); + ((CButton *)GetDlgItem(IDC_RADIO_ABSOLUTE))->SetCheck(false); + CString csTmp=_T(""); ((CComboBox *)GetDlgItem(IDC_COMBO_OUTPORT_NUMBER))->ResetContent(); int iComboxIndex(0); @@ -274,6 +279,8 @@ BOOL CSO7_UtilDlg::OnInitDialog() m_cs_ZScaleCoeff.Format(_T("%.2f"),(m_pSO7_Proto->g_machine.s_machine_config.z_axis._scale_resolution)); m_cs_Version_Number=_T("3"); + GetDlgItem(IDC_EDIT_SET_SEQ_NO)->SetWindowTextW(_T("0")); + m_Rotary_Edit_Position=_T("0.0"); if (!g_pLoggerDebug) { @@ -343,7 +350,11 @@ void CSO7_UtilDlg::UpdateCtrlsStatus(bool _bEnable) GetDlgItem(IDC_CHECK_SO7_RING_LIGHT_SEG_ON2)->EnableWindow(_bEnable); GetDlgItem(IDC_CHECK_SO7_COAXIAL_LIGHT_ON)->EnableWindow(_bEnable); GetDlgItem(IDC_CHECK_SO7_SPARE_LIGHT_ON)->EnableWindow(_bEnable); + GetDlgItem(IDC_BUTTON_HOME)->EnableWindow(_bEnable); + GetDlgItem(IDC_BUTTON_GO)->EnableWindow(_bEnable); + GetDlgItem(IDC_EDIT_SET_SEQ_NO)->EnableWindow(_bEnable); + GetDlgItem(IDC_BUTTON_SO7_GET_SEQ_NUMBER)->EnableWindow(_bEnable); } @@ -826,7 +837,26 @@ void CSO7_UtilDlg::OnEnKillfocusEditSetVerNo() m_pSO7_Proto->g_machine.cVerNumber = static_cast(atoi(cTempSendCmd)); m_pSO7_Proto->_send_cmd_SO7_CMD_SET_VER_NUMBER(); } +void CSO7_UtilDlg::OnEnKillfocusEditSetSeqNo() +{ + UpdateData(TRUE); + USES_CONVERSION; + CString str; + GetDlgItem(IDC_EDIT_SET_SEQ_NO)->GetWindowText(str); + const char* cTempValue=T2A(str); + m_pSO7_Proto->g_machine.SEQ_NUMBER= static_cast(atoi(cTempValue)); + m_pSO7_Proto->_send_cmd_SO7_CMD_SET_SEQ_NUMBER(); +} + +void CSO7_UtilDlg::OnBnClickedButtonSo7GetSeqNumber() +{ + m_pSO7_Proto->_send_cmd_SO7_CMD_GET_SEQ_NUMBER(); + CString csOutMessage; + csOutMessage.Format(_T("%d"),static_cast(m_pSO7_Proto->g_machine.SEQ_NUMBER)); + m_OutMessage = _T("[SEQ NO]: ")+csOutMessage; + OutputWithScroll(m_OutMessage,m_edMSG); +} void CSO7_UtilDlg::OnBnClickedButtonSetOutPort() { int iSelAddr=((CComboBox *)GetDlgItem(IDC_COMBO_OUTPORT_NUMBER))->GetCurSel(); @@ -1473,3 +1503,6 @@ void CSO7_UtilDlg::OnBnClickedButtonGo() }; m_pSO7_Proto->_send_cmd_SO7_CMD_MOVE_TO_POS_Z(); } + + + diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.h b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.h index ac2340a..f20c806 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.h @@ -126,4 +126,6 @@ public: afx_msg void OnBnClickedCheckSo7CoaxialLightOn(); afx_msg void OnBnClickedCheckSo7SpareLightOn(); afx_msg void OnBnClickedRadioReadOutputPort2(); + afx_msg void OnEnKillfocusEditSetSeqNo(); + afx_msg void OnBnClickedButtonSo7GetSeqNumber(); }; diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h index 61b3941..6f5cc4e 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h @@ -329,6 +329,8 @@ #define IDC_RADIO_SELECT_X 1262 #define IDC_RADIO_SELECT_Y 1263 #define IDC_RADIO_SELECT_Z 1264 +#define IDC_BUTTON_RESET_WORKTABLE_RIGHT2 1265 +#define IDC_BUTTON_SO7_GET_SEQ_NUMBER 1265 #define IDC_BUTTON_SET_OUT_PORT 1269 #define IDC_EDIT_SET_VER_NO 1271 #define IDC_EDIT_X_SCALE_COEFFICIENT 1272 @@ -346,6 +348,7 @@ #define IDC_BUTTON_SO7_READ_IN_PORT_STATUS 1275 #define IDC_EDIT_FRESHSPEED_X3 1276 #define IDC_EDIT_IMAGEDLL_2LASER_TOPZ3 1276 +#define IDC_EDIT_SET_SEQ_NO 1276 #define IDC_BUTTON_ZERO_SET 1277 #define IDC_EDIT_FRESHSPEED_X4 1277 #define IDC_EDIT_IMAGEDLL_2LASER_TOPZ4 1277 @@ -922,7 +925,6 @@ #define IDC_RADIO_SO7_MOVE_SPEED_GEAR3 1833 #define IDC_BTN_KEYENCE_LKG5000_ETHERNET_STOP_SCAN2 1834 #define IDC_RADIO_SO7_MOVE_SPEED_GEAR4 1834 -#define IDC_RADIO5 1835 #define IDC_RADIO_SO7_MOVE_SPEED_GEAR5 1835 #define IDC_BUTTON_DIY_EXIT_BUTTON 32740 #define ID_EDIT_SO7_CONFIG_MOTION 32741 diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo index c4d816f..5a857a2 100644 Binary files a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo and b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo differ