diff --git a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp index 31ddd99..a5cda81 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp @@ -537,7 +537,7 @@ CSO7_Proto::CSO7_Proto() g_machine.s_machine_config.zm_axis._speed._short_=0; g_machine.s_machine_config.motion._EnCloseLoop=FALSE; - g_machine.s_machine_config.motion._RetryTimes=5; + g_machine.s_machine_config.motion._RetryTimes=0; g_machine.s_machine_config.motion._ShiftPositionX=0.0; g_machine.s_machine_config.motion._ShiftPositionY=0.0; g_machine.s_machine_config.motion._ShiftPositionZ=0.0; @@ -4876,13 +4876,13 @@ SSI_STATUS_MOTION CSO7_Proto::_process_SO7_CMD_READ_AXIS_XYZ() if (g_machine.y._scale_pos._long_ > 8388608) g_machine.y._scale_pos._long_=g_machine.y._scale_pos._long_-16777216; -// if (g_machine.z._scale_pos._long_ > 8388608) -// g_machine.z._scale_pos._long_=g_machine.z._scale_pos._long_-16777216; + if (g_machine.z._scale_pos._long_ > 8388608) + g_machine.z._scale_pos._long_=g_machine.z._scale_pos._long_-16777216; // for rotary table - if (g_machine.z._scale_pos._long_ > 4194304) - g_machine.z._scale_pos._long_=g_machine.z._scale_pos._long_-8388608; + //if (g_machine.z._scale_pos._long_ > 4194304) + // g_machine.z._scale_pos._long_=g_machine.z._scale_pos._long_-8388608; return SSI_STATUS_MOTION_NORMAL; }; diff --git a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h index 5d8798d..3031802 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h @@ -71,6 +71,13 @@ enum EFirmwareVer FirmwareVer_6_X, FirmwareVer_Total }; +enum ESO7_CONTROLLER_IO_ADDR +{ + ESO7_CONTROLLER_INPUT_PORT_ADDR=5, + ESO7_CONTROLLER_WOUTPUT_PORT_ADDR=6, + ESO7_CONTROLLER_OUTPUT_PORT_ADDR=7, + ESO7_CONTROLLER_LIMIT_SWITCH_ADDR=8 +}; #pragma pack(push) #pragma pack(1) //**************************************************************************************************** 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 1251618..97b8013 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log @@ -4160,3 +4160,72 @@ 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 +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 +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 +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 +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 +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 +Destruct Cso7_Proto. 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 bd4d041..20676cc 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 @@ -32,27 +32,30 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM CAPTION "SevenOcean Utility" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CONTROL "Inport (J2)",IDC_RADIO_READ_INPUT_PORT,"Button",BS_AUTORADIOBUTTON | WS_GROUP,315,138,55,10 - CONTROL "Outport (J1)",IDC_RADIO_READ_OUTPUT_PORT,"Button",BS_AUTORADIOBUTTON,315,149,56,10 - CONTROL "Outport (J3)",IDC_RADIO_READ_OUTPUT_PORT2,"Button",BS_AUTORADIOBUTTON,315,160,56,10 + CONTROL "限位(J4)",IDC_RADIO_READ_LIMIT_SWITCH,"Button",BS_AUTORADIOBUTTON | WS_GROUP,315,138,45,10 + CONTROL "输入口 (J2)",IDC_RADIO_READ_INPUT_PORT,"Button",BS_AUTORADIOBUTTON,315,148,55,10 + CONTROL "输出口 (J1)",IDC_RADIO_READ_OUTPUT_PORT,"Button",BS_AUTORADIOBUTTON,315,159,55,10 + CONTROL "输出口 (J3)",IDC_RADIO_READ_OUTPUT_PORT2,"Button",BS_AUTORADIOBUTTON,315,169,55,10 + EDITTEXT IDC_EDIT_STATUS,247,270,199,117,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL + GROUPBOX "CMD",IDC_STATIC,102,12,193,116 CONTROL "Rel",IDC_RADIO_RELATIVE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,139,144,27,8 CONTROL "Abs",IDC_RADIO_ABSOLUTE,"Button",BS_AUTORADIOBUTTON,140,158,28,8 EDITTEXT IDC_EDIT_POSITION,167,149,36,14,ES_AUTOHSCROLL PUSHBUTTON "Go",IDC_BUTTON_GO,209,149,34,15 PUSHBUTTON "Home",IDC_BUTTON_HOME,261,149,34,15 - CONTROL "Continuous",IDC_CHECK_CONTINUOUS_READ_IO_STATUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,380,139,47,10 - PUSHBUTTON "Read IO Status",IDC_BUTTON_SO7_READ_IN_PORT_STATUS,378,151,61,14 - COMBOBOX IDC_COMBO_OUTPORT_NUMBER,314,181,29,34,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - CONTROL "ON",IDC_CHECK_SO7_OUT_PORT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,348,183,26,10 - PUSHBUTTON "Set outport",IDC_BUTTON_SET_OUT_PORT,378,180,61,14 + CONTROL "连续读取",IDC_CHECK_CONTINUOUS_READ_IO_STATUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,380,144,47,10 + PUSHBUTTON "读取IO状态",IDC_BUTTON_SO7_READ_IN_PORT_STATUS,378,156,61,14 + COMBOBOX IDC_COMBO_OUTPORT_NUMBER,314,189,29,34,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + CONTROL "开启",IDC_CHECK_SO7_OUT_PORT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,348,191,27,10 + PUSHBUTTON "设置输出状态",IDC_BUTTON_SET_OUT_PORT,378,188,61,14 CONTROL "First",IDC_RADIO_SPEED_GEAR1,"Button",BS_AUTORADIOBUTTON | WS_GROUP,170,195,30,10 CONTROL "Second",IDC_RADIO_SPEED_GEAR2,"Button",BS_AUTORADIOBUTTON,170,209,39,10 CONTROL "Third",IDC_RADIO_SPEED_GEAR3,"Button",BS_AUTORADIOBUTTON,170,223,32,10 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,29,24,63,18 - PUSHBUTTON "Stop_Machine",IDC_BUTTON_STOP_SO7MACHINE,29,50,63,18 + GROUPBOX "读写IO口",IDC_STATIC,301,129,144,78 + PUSHBUTTON "连接控制器",IDC_BUTTON_START_SO7MACHINE,29,24,63,18 + PUSHBUTTON "断开控制器",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 @@ -65,7 +68,7 @@ BEGIN 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 " 设置 运动参数",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 PUSHBUTTON "Z+",IDC_BUTTON_SO7_MOVE_Z_UP,44,192,25,12 @@ -75,8 +78,8 @@ BEGIN 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,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 "手动复位",IDC_BUTTON_MANUAL_HOME,219,195,76,22,BS_MULTILINE + PUSHBUTTON "自动复位",IDC_BUTTON_RESET_WORKTABLE,219,227,40,22 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 @@ -87,12 +90,11 @@ BEGIN 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,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 "R/W Data",IDC_STATIC,301,211,144,54 + CONTROL "X",IDC_RADIO_SELECT_X,"Button",BS_AUTORADIOBUTTON | WS_GROUP,307,224,20,10 + CONTROL "Y",IDC_RADIO_SELECT_Y,"Button",BS_AUTORADIOBUTTON,307,236,20,10 + CONTROL "Z",IDC_RADIO_SELECT_Z,"Button",BS_AUTORADIOBUTTON,307,248,20,10 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 @@ -100,7 +102,7 @@ BEGIN 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 + GROUPBOX "IO 口状态",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 @@ -116,10 +118,9 @@ BEGIN EDITTEXT IDC_EDIT_ZM_POSITION_58,105,367,54,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP LTEXT "Pulse",IDC_STATIC,55,311,18,8 LTEXT "mm",IDC_STATIC,125,311,12,8 - EDITTEXT IDC_EDIT_STATUS,247,270,199,117,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL LTEXT "ms",IDC_STATIC_SEC,214,386,16,9 EDITTEXT IDC_EDIT_UPDATE_FREQ,185,384,25,13,ES_AUTOHSCROLL | ES_READONLY - GROUPBOX "ReadOut",IDC_STATIC,17,266,224,136 + GROUPBOX "光栅尺坐标",IDC_STATIC,17,266,224,136 GROUPBOX "MOVE XYZV",IDC_STATIC,17,178,282,86 EDITTEXT IDC_EDIT_X_POSITION_59,176,325,54,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP EDITTEXT IDC_EDIT_Y_POSITION_59,176,338,54,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP @@ -131,30 +132,30 @@ BEGIN 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,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 + CTEXT "光栅尺分辨率",IDC_STATIC,26,282,27,20 + GROUPBOX "速度档位",IDC_STATIC,160,183,53,81 + PUSHBUTTON "配置so7_config",IDC_BUTTON_SETUP_SO7CONFIG,82,141,44,28,BS_MULTILINE + LTEXT "1",IDC_STATIC_IO_ADDR1,403,28,8,8 + LTEXT "2",IDC_STATIC_IO_ADDR2,403,44,8,8 + LTEXT "3",IDC_STATIC_IO_ADDR3,403,60,8,8 + LTEXT "4",IDC_STATIC_IO_ADDR4,403,76,8,8 + LTEXT "5",IDC_STATIC_IO_ADDR5,403,92,8,8 + LTEXT "6",IDC_STATIC_IO_ADDR6,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 "测试零位信号",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 - PUSHBUTTON "Read",IDC_BUTTON_SO7_READDATAFROMFPGA,408,234,34,19 - LTEXT "Addr",IDC_STATIC,335,216,16,8 - LTEXT "Data",IDC_STATIC,335,238,16,8 - COMBOBOX IDC_COMBO_RWDATA_ADDR,355,212,45,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_EDIT_RWDATA_DATA,353,244,44,13,ES_AUTOHSCROLL + PUSHBUTTON "Write",IDC_BUTTON_SO7_SENDDATATOFPGA,406,218,34,19 + PUSHBUTTON "Read",IDC_BUTTON_SO7_READDATAFROMFPGA,406,241,34,19 + LTEXT "Addr",IDC_STATIC,333,225,16,8 + LTEXT "Data",IDC_STATIC,333,246,16,8 + COMBOBOX IDC_COMBO_RWDATA_ADDR,353,221,45,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_COMBO_SO7_HOMEMODE,267,231,27,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "◥",IDC_BUTTON_SO7_MOVE_XR_YF,122,207,25,12 PUSHBUTTON "◢",IDC_BUTTON_SO7_MOVE_XR_YB,122,233,25,12 @@ -168,7 +169,7 @@ BEGIN 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 + LTEXT "----------------------------------------------------",IDC_STATIC,305,178,140,8 EDITTEXT IDC_EDIT_SET_SEQ_NO,261,67,29,14,ES_AUTOHSCROLL PUSHBUTTON "Get SEQ NO.",IDC_BUTTON_SO7_GET_SEQ_NUMBER,230,87,60,15,BS_MULTILINE LTEXT "SEQ NO.",IDC_STATIC,232,69,29,8 @@ -178,7 +179,7 @@ END IDD_SO7_UTIL_SEND_PARAMETER DIALOGEX 0, 0, 750, 480 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Set Parameter" +CAPTION "设置运动参数" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN GROUPBOX "坐标轴",IDC_STATIC,379,399,50,56 @@ -277,15 +278,15 @@ BEGIN EDITTEXT IDC_EDIT_POS_WORKLIMIT_X,118,386,40,12,ES_AUTOHSCROLL EDITTEXT IDC_EDIT_POS_WORKLIMIT_Y,180,386,40,12,ES_AUTOHSCROLL EDITTEXT IDC_EDIT_POS_WORKLIMIT_Z,243,386,40,12,ES_AUTOHSCROLL - PUSHBUTTON "Save To Controller",IDC_BUTTON_SAVE_PARAMETER,46,413,50,24,BS_MULTILINE - PUSHBUTTON "Read From Controller",IDC_BUTTON_READ_PARAMETER_FROM_CONTROLLER,120,413,50,24,BS_MULTILINE - PUSHBUTTON "Save...",IDC_BUTTON_SAVE,194,413,50,24 + PUSHBUTTON "发送到\r控制器",IDC_BUTTON_SAVE_PARAMETER,46,413,50,24,BS_MULTILINE + PUSHBUTTON "读取控制器\r参数",IDC_BUTTON_READ_PARAMETER_FROM_CONTROLLER,120,413,50,24,BS_MULTILINE + PUSHBUTTON "另存为...",IDC_BUTTON_SAVE,194,413,50,24 PUSHBUTTON "Exit",IDCANCEL,699,449,50,14,NOT WS_VISIBLE LTEXT "Z=",IDC_STATIC,229,387,10,8 LTEXT "Y=",IDC_STATIC,90,302,10,8 EDITTEXT IDC_EDIT_INPUT_FILE,58,12,181,14,ES_AUTOHSCROLL - LTEXT "Input File",IDC_STATIC,11,15,42,8 - PUSHBUTTON "Browse...",IDC_BUTTON_BROWSE,246,12,44,14,0,WS_EX_ACCEPTFILES + LTEXT "参数文件",IDC_STATIC,14,14,39,8 + PUSHBUTTON "打开...",IDC_BUTTON_BROWSE,246,12,44,14,0,WS_EX_ACCEPTFILES GROUPBOX "速度参数",IDC_STATIC,17,29,273,254 LTEXT "X-1",IDC_STATIC,27,63,12,8 LTEXT "X-2",IDC_STATIC,27,78,12,8 @@ -323,16 +324,18 @@ BEGIN LTEXT "POS WORKING LIMIT",IDC_STATIC,20,388,69,8 LTEXT "X=",IDC_STATIC,104,387,10,8 LTEXT "Y=",IDC_STATIC,166,387,10,8 - EDITTEXT IDC_EDIT_SAMPLE_SCURVE_DIS,473,405,28,14,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_SAMPLE_TIME_SCURVE,564,405,28,14,ES_AUTOHSCROLL - PUSHBUTTON "Start",IDC_BUTTON_START_SAMPLE_SCURVE,628,407,50,14 - LTEXT "相对距离",IDC_STATIC,436,407,33,8 - LTEXT "采样时间",IDC_STATIC,529,407,33,8 - PUSHBUTTON "Stop",IDC_BUTTON_STOP_SAMPLE_SCURVE,627,425,50,14 + EDITTEXT IDC_EDIT_SAMPLE_SCURVE_DIS,554,406,28,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_SAMPLE_TIME_SCURVE,473,406,28,14,ES_AUTOHSCROLL + PUSHBUTTON "开始",IDC_BUTTON_START_SAMPLE_SCURVE,644,405,50,14 + LTEXT "相对距离",IDC_STATIC,517,408,33,8 + LTEXT "采样时间",IDC_STATIC,438,408,33,8 + PUSHBUTTON "停止",IDC_BUTTON_STOP_SAMPLE_SCURVE,644,425,50,14 CONTROL "运动曲线图",IDC_CUSTOM_CANVAS,"CDrawGraph",WS_TABSTOP,308,29,431,349 - EDITTEXT IDC_EDIT_SET_PARAMETER_MSGOUTPUT,440,428,165,25,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL - LTEXT "mm",IDC_STATIC,506,406,12,8 - LTEXT "s",IDC_STATIC,597,406,8,8 + EDITTEXT IDC_EDIT_SET_PARAMETER_MSGOUTPUT,440,428,189,25,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL + LTEXT "mm",IDC_STATIC,587,408,12,8 + LTEXT "s",IDC_STATIC,506,408,8,8 + CONTROL "反向",IDC_CHECK_SO7_MOTION_PARA_MOVETO_REVERSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,602,408,32,10 + GROUPBOX "Static",IDC_STATIC,303,387,435,76 END IDD_SO7_UTIL_AUTO_ZOOM DIALOGEX 0, 0, 426, 460 @@ -505,29 +508,29 @@ END IDD_SO7_UTIL_MOVE_LOCATION DIALOGEX 0, 0, 750, 480 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Move To Location" +CAPTION "运动定位" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CONTROL "Default",IDC_RADIO_SPEED_SYSTEM,"Button",BS_AUTORADIOBUTTON | WS_GROUP,36,80,39,10 - CONTROL "Gear1",IDC_RADIO_SO7_MOVE_SPEED_GEAR1,"Button",BS_AUTORADIOBUTTON,85,80,35,10 - CONTROL "Gear2",IDC_RADIO_SO7_MOVE_SPEED_GEAR2,"Button",BS_AUTORADIOBUTTON,134,80,35,10 - CONTROL "Gear3",IDC_RADIO_SO7_MOVE_SPEED_GEAR3,"Button",BS_AUTORADIOBUTTON,36,94,35,10 - CONTROL "Gear4",IDC_RADIO_SO7_MOVE_SPEED_GEAR4,"Button",BS_AUTORADIOBUTTON,85,94,35,10 - CONTROL "Gear5",IDC_RADIO_SO7_MOVE_SPEED_GEAR5,"Button",BS_AUTORADIOBUTTON,134,94,35,10 + CONTROL "默认",IDC_RADIO_SPEED_SYSTEM,"Button",BS_AUTORADIOBUTTON | WS_GROUP,36,80,32,10 + CONTROL "1档",IDC_RADIO_SO7_MOVE_SPEED_GEAR1,"Button",BS_AUTORADIOBUTTON,85,80,28,10 + CONTROL "2档",IDC_RADIO_SO7_MOVE_SPEED_GEAR2,"Button",BS_AUTORADIOBUTTON,134,80,28,10 + CONTROL "3档",IDC_RADIO_SO7_MOVE_SPEED_GEAR3,"Button",BS_AUTORADIOBUTTON,36,94,28,10 + CONTROL "4档",IDC_RADIO_SO7_MOVE_SPEED_GEAR4,"Button",BS_AUTORADIOBUTTON,85,94,28,10 + CONTROL "5档",IDC_RADIO_SO7_MOVE_SPEED_GEAR5,"Button",BS_AUTORADIOBUTTON,134,94,28,10 CONTROL "Fast",IDC_RADIO_SPEED_FAST,"Button",BS_AUTORADIOBUTTON,198,80,30,10 CONTROL "Slow",IDC_RADIO_SPEED_SLOW,"Button",BS_AUTORADIOBUTTON,198,94,31,10 CONTROL "inch",IDC_RADIO_INCH,"Button",BS_AUTORADIOBUTTON | WS_GROUP,30,31,29,10 CONTROL "mm",IDC_RADIO_MM,"Button",BS_AUTORADIOBUTTON,83,31,27,10 CONTROL "pulse",IDC_RADIO_SCALE,"Button",BS_AUTORADIOBUTTON,134,31,33,10 - CONTROL "Relative",IDC_RADIO_MOVE_RELATIVE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,205,31,42,10 - CONTROL "Absolute",IDC_RADIO_MOVE_ABSOLUTE,"Button",BS_AUTORADIOBUTTON,265,31,44,10 + CONTROL "相对定位",IDC_RADIO_MOVE_RELATIVE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,205,31,48,10 + CONTROL "绝对定位",IDC_RADIO_MOVE_ABSOLUTE,"Button",BS_AUTORADIOBUTTON,265,31,48,10 EDITTEXT IDC_EDIT_MOVE_TO_X,40,134,53,12,ES_AUTOHSCROLL EDITTEXT IDC_EDIT_MOVE_TO_Y,40,157,53,12,ES_AUTOHSCROLL EDITTEXT IDC_EDIT_MOVE_TO_Z,40,180,53,12,ES_AUTOHSCROLL EDITTEXT IDC_EDIT_MOVE_TO_ZM,40,203,53,12,ES_AUTOHSCROLL - CONTROL "Reverse",IDC_CHECK_REVERSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,104,147,43,10 - PUSHBUTTON "Move To XYZ",IDC_BUTTON_MOVE_TO_XYZ,102,163,71,24,BS_MULTILINE - PUSHBUTTON "Move To Zoom",IDC_BUTTON_MOVE_TO_ZOOM,102,192,71,24 + CONTROL "反向",IDC_CHECK_REVERSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,104,147,32,10 + PUSHBUTTON "XYZ定位",IDC_BUTTON_MOVE_TO_XYZ,102,163,71,24,BS_MULTILINE + PUSHBUTTON "变倍定位",IDC_BUTTON_MOVE_TO_ZOOM,102,192,71,24 PUSHBUTTON "Move To XYZ(JM)",IDC_BUTTON_MOVE_TO_XYZ_JM,179,134,71,24,BS_MULTILINE PUSHBUTTON "Move To XYZ (Laser)",IDC_BUTTON_MOVE_TO_XYZ_LASER,179,163,70,24,BS_MULTILINE PUSHBUTTON "Move To XYZV",IDC_BUTTON_MOVE_TO_XYZV,179,192,71,24 @@ -535,11 +538,11 @@ BEGIN EDITTEXT IDC_EDIT_REPETEST_TIMES,365,158,57,12,ES_AUTOHSCROLL EDITTEXT IDC_EDIT_REPETEST_INTERVAL,365,182,45,12,ES_RIGHT | ES_AUTOHSCROLL EDITTEXT IDC_EDIT_REPETEST_ERRORRANGE,365,206,45,12,ES_RIGHT | ES_AUTOHSCROLL - PUSHBUTTON "Begin",IDC_BUTTON_BEGIN_REPE_TEST,435,159,56,13 - PUSHBUTTON "Save...",IDC_BUTTON_SAVE_REPETEST,435,186,56,13 - GROUPBOX "Unit",IDC_STATIC,18,15,160,38 - GROUPBOX "Motion Type",IDC_STATIC,188,15,129,38 - GROUPBOX "Constant Speed",IDC_STATIC,187,68,305,41 + PUSHBUTTON "开始",IDC_BUTTON_BEGIN_REPE_TEST,435,159,56,13 + PUSHBUTTON "保存记录...",IDC_BUTTON_SAVE_REPETEST,435,186,56,13 + GROUPBOX "单位",IDC_STATIC,18,15,160,38 + GROUPBOX "运动类型",IDC_STATIC,188,15,129,38 + GROUPBOX "匀速速度",IDC_STATIC,187,68,305,41 PUSHBUTTON "EXIT",IDCANCEL,697,449,50,14,NOT WS_VISIBLE LTEXT "x",IDC_STATIC,28,134,8,8 LTEXT "y",IDC_STATIC,28,157,8,8 @@ -553,24 +556,24 @@ BEGIN EDITTEXT IDC_EDIT_Y_AXIS,142,243,54,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP EDITTEXT IDC_EDIT_Z_AXIS,233,243,54,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP EDITTEXT IDC_EDIT_ZM_AXIS,324,243,54,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP - GROUPBOX "Move To Position",IDC_STATIC,19,119,236,105 - GROUPBOX "Position",IDC_STATIC,19,227,480,36 - PUSHBUTTON "Set Zero",IDC_BUTTON_ZERO_SET,396,241,56,13 - GROUPBOX "Repeatability Test",IDC_STATIC,260,119,238,106 - LTEXT "To",IDC_STATIC,343,135,8,8 - LTEXT "Times",IDC_STATIC,338,161,19,8 + GROUPBOX "Move To Position",IDC_STATIC,18,119,236,105 + GROUPBOX "Position",IDC_STATIC,18,227,480,36 + PUSHBUTTON "清零",IDC_BUTTON_ZERO_SET,396,241,56,13 + GROUPBOX "往返性能测试",IDC_STATIC,260,119,238,106 + LTEXT "测试距离",IDC_STATIC,324,135,33,8 + LTEXT "测试次数",IDC_STATIC,327,161,33,8 EDITTEXT IDC_EDIT_REPRETEST,21,280,429,166,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL CONTROL "x",IDC_CHECK_REPETESTX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,278,135,20,10 CONTROL "y",IDC_CHECK_REPETESTY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,278,148,20,10 CONTROL "z",IDC_CHECK_REPETESTZ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,278,162,20,10 - LTEXT "Pause",IDC_STATIC,336,183,20,8 + LTEXT "间隔时间",IDC_STATIC,327,183,33,8 LTEXT "ms",IDC_STATIC,413,183,10,8 - CONTROL "Absolute",IDC_CHECK_REPETEST_ABSOLUTE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,278,207,44,10 - LTEXT "Deadband",IDC_STATIC,327,207,34,8 + CONTROL "闭环判断",IDC_CHECK_REPETEST_ABSOLUTE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,278,207,48,10 + LTEXT "允许误差",IDC_STATIC,327,207,33,8 LTEXT "um",IDC_STATIC_DEADBAND_UNITS,413,207,19,8 - CONTROL "VolComp",IDC_CHECK_REPETEST_VOLCOMP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,278,193,43,10 + CONTROL "补偿",IDC_CHECK_REPETEST_VOLCOMP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,278,193,32,10 CONTROL "V",IDC_CHECK_REPETESTV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,278,177,20,10 - CONTROL "Output Time",IDC_CHECK_SO7_MOTION_OUTPUT_TIME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,439,135,55,10 + CONTROL "输出时间",IDC_CHECK_SO7_MOTION_OUTPUT_TIME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,439,135,48,10 EDITTEXT IDC_EDIT_MOTION_SPEEDX,250,86,40,14,ES_AUTOHSCROLL EDITTEXT IDC_EDIT_MOTION_SPEEDY,339,86,40,14,ES_AUTOHSCROLL EDITTEXT IDC_EDIT_MOTION_SPEEDZ,428,86,40,14,ES_AUTOHSCROLL @@ -580,12 +583,11 @@ BEGIN LTEXT "mm/s",IDC_STATIC,293,88,18,8 LTEXT "mm/s",IDC_STATIC,385,88,18,8 LTEXT "mm/s",IDC_STATIC,472,87,18,8 - PUSHBUTTON "Clear All",IDC_BUTTON_SO7_MOVETO_CLEAR_ALL_LOG,451,350,50,21 + PUSHBUTTON "清空",IDC_BUTTON_SO7_MOVETO_CLEAR_ALL_LOG,451,350,50,21 CONTROL "ErrPos",IDC_CHECK_SO7_MOVETO_FPGADATA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,458,243,34,10 - CONTROL "Auto Set Zero ",IDC_CHECK_SO7_MOTION_AUTO_SET_ZERO, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,104,131,63,10 - GROUPBOX "Set Gear",IDC_STATIC,27,68,149,41 - GROUPBOX "MoveTo Speed",IDC_STATIC,17,59,477,60 + CONTROL "自动清零",IDC_CHECK_SO7_MOTION_AUTO_SET_ZERO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,104,131,63,10 + GROUPBOX "档位",IDC_STATIC,27,68,149,41 + GROUPBOX "定位速度",IDC_STATIC,18,59,479,60 GROUPBOX "Log",IDC_STATIC,16,268,487,183 END @@ -2374,8 +2376,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 7,3,0,0 - PRODUCTVERSION 7,3,0,0 + FILEVERSION 7,5,0,0 + PRODUCTVERSION 7,5,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -2392,12 +2394,12 @@ BEGIN BEGIN VALUE "CompanyName", "Hexagon Metrology" VALUE "FileDescription", "Utility for Hexagon Metrology" - VALUE "FileVersion", "7.3.0.0" + VALUE "FileVersion", "7.5.0.0" VALUE "InternalName", "Usb_Util.exe" VALUE "LegalCopyright", "Copyright 2014 Hexagon Metrology." VALUE "OriginalFilename", "Usb_Util.exe" VALUE "ProductName", "Utility" - VALUE "ProductVersion", "7.3.0.0" + VALUE "ProductVersion", "7.5.0.0" END END BLOCK "VarFileInfo" diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Move_Location.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Move_Location.cpp index d005b63..9667f71 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Move_Location.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Move_Location.cpp @@ -164,7 +164,7 @@ BOOL CSO7_Move_Location::OnSetActive() m_OutMessageY=_T(""); m_OutMessageZ=_T(""); m_OutMessageV=_T(""); - ((CButton*)GetDlgItem(IDC_BUTTON_BEGIN_REPE_TEST))->SetWindowTextW(_T("Begin")); + ((CButton*)GetDlgItem(IDC_BUTTON_BEGIN_REPE_TEST))->SetWindowTextW(_T("开始")); SetTimer(1,150,0); return CPropertyPage::OnSetActive(); } @@ -939,7 +939,7 @@ void CSO7_Move_Location::OnBnClickedButtonBeginRepeTest() } } - ((CButton*)GetDlgItem(IDC_BUTTON_BEGIN_REPE_TEST))->SetWindowTextW(_T("Stop")); + ((CButton*)GetDlgItem(IDC_BUTTON_BEGIN_REPE_TEST))->SetWindowTextW(_T("停止")); SetTimer(2,200,0); } @@ -1118,7 +1118,7 @@ BOOL CSO7_Move_Location::RepeTestVolComp() else { bFlag=false; - ((CButton*)GetDlgItem(IDC_BUTTON_BEGIN_REPE_TEST))->SetWindowTextW(_T("Begin")); + ((CButton*)GetDlgItem(IDC_BUTTON_BEGIN_REPE_TEST))->SetWindowTextW(_T("开始")); } return TRUE; } @@ -1165,7 +1165,7 @@ BOOL CSO7_Move_Location::RepeTestmmRel() { iRetryCnt=0; //bFlag=false; - //((CButton*)GetDlgItem(IDC_BUTTON_BEGIN_REPE_TEST))->SetWindowTextW(_T("Begin")); + //((CButton*)GetDlgItem(IDC_BUTTON_BEGIN_REPE_TEST))->SetWindowTextW(_T("开始")); //m_OutMessage+=_T("Sorry,The machine cann't reach the precision requirement. "); //OutputWithScroll(m_OutMessage,m_edit_RepeTest); //return false; @@ -1364,7 +1364,7 @@ BOOL CSO7_Move_Location::RepeTestmmRel() { iRetryCnt=0; /*bFlag=false; - ((CButton*)GetDlgItem(IDC_BUTTON_BEGIN_REPE_TEST))->SetWindowTextW(_T("Begin")); + ((CButton*)GetDlgItem(IDC_BUTTON_BEGIN_REPE_TEST))->SetWindowTextW(_T("开始")); m_OutMessage+=_T("Sorry,The machine cann't reach the precision requirement. "); OutputWithScroll(m_OutMessage,m_edit_RepeTest); return false;*/ @@ -1551,7 +1551,7 @@ BOOL CSO7_Move_Location::RepeTestmmRel() OutputWithScroll(m_OutMessage,m_edit_RepeTest); bFlag=false; - ((CButton*)GetDlgItem(IDC_BUTTON_BEGIN_REPE_TEST))->SetWindowTextW(_T("Begin")); + ((CButton*)GetDlgItem(IDC_BUTTON_BEGIN_REPE_TEST))->SetWindowTextW(_T("开始")); } return TRUE; } @@ -1603,7 +1603,7 @@ BOOL CSO7_Move_Location::RepeTestmmAbs() { iRetryCnt=0; //bFlag=false; - //((CButton*)GetDlgItem(IDC_BUTTON_BEGIN_REPE_TEST))->SetWindowTextW(_T("Begin")); + //((CButton*)GetDlgItem(IDC_BUTTON_BEGIN_REPE_TEST))->SetWindowTextW(_T("开始")); //m_OutMessage+=_T("Sorry,The machine cann't reach the precision requirement. "); //OutputWithScroll(m_OutMessage,m_edit_RepeTest); //return false; @@ -1817,7 +1817,7 @@ BOOL CSO7_Move_Location::RepeTestmmAbs() { iRetryCnt=0; /*bFlag=false; - ((CButton*)GetDlgItem(IDC_BUTTON_BEGIN_REPE_TEST))->SetWindowTextW(_T("Begin")); + ((CButton*)GetDlgItem(IDC_BUTTON_BEGIN_REPE_TEST))->SetWindowTextW(_T("开始")); m_OutMessage+=_T("Sorry,The machine cann't reach the precision requirement. "); OutputWithScroll(m_OutMessage,m_edit_RepeTest); return false;*/ @@ -2018,7 +2018,7 @@ BOOL CSO7_Move_Location::RepeTestmmAbs() OutputWithScroll(m_OutMessage,m_edit_RepeTest); bFlag=false; - ((CButton*)GetDlgItem(IDC_BUTTON_BEGIN_REPE_TEST))->SetWindowTextW(_T("Begin")); + ((CButton*)GetDlgItem(IDC_BUTTON_BEGIN_REPE_TEST))->SetWindowTextW(_T("开始")); } return TRUE; } @@ -2211,7 +2211,7 @@ BOOL CSO7_Move_Location::RepeTestpulse() else { bFlag=false; - ((CButton*)GetDlgItem(IDC_BUTTON_BEGIN_REPE_TEST))->SetWindowTextW(_T("Begin")); + ((CButton*)GetDlgItem(IDC_BUTTON_BEGIN_REPE_TEST))->SetWindowTextW(_T("开始")); } return TRUE; } @@ -2349,7 +2349,7 @@ BOOL CSO7_Move_Location::RepeTestZoom() OutputWithScroll(m_OutMessage,m_edit_RepeTest); bFlag=false; - ((CButton*)GetDlgItem(IDC_BUTTON_BEGIN_REPE_TEST))->SetWindowTextW(_T("Begin")); + ((CButton*)GetDlgItem(IDC_BUTTON_BEGIN_REPE_TEST))->SetWindowTextW(_T("开始")); } return TRUE; } @@ -2520,7 +2520,7 @@ void CSO7_Move_Location::OnTimer(UINT_PTR nIDEvent) m_OutMessageY=_T(""); m_OutMessageZ=_T(""); m_OutMessageV=_T(""); - ((CButton*)GetDlgItem(IDC_BUTTON_BEGIN_REPE_TEST))->SetWindowTextW(_T("Begin")); + ((CButton*)GetDlgItem(IDC_BUTTON_BEGIN_REPE_TEST))->SetWindowTextW(_T("开始")); KillTimer(2); } } @@ -2580,7 +2580,7 @@ void CSO7_Move_Location::OnTimer(UINT_PTR nIDEvent) m_OutMessageZ=_T(""); m_OutMessageV=_T(""); - ((CButton*)GetDlgItem(IDC_BUTTON_BEGIN_REPE_TEST))->SetWindowTextW(_T("Begin")); + ((CButton*)GetDlgItem(IDC_BUTTON_BEGIN_REPE_TEST))->SetWindowTextW(_T("开始")); } KillTimer(3); break; diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Send_Parameter.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Send_Parameter.cpp index ef900d1..28128d2 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Send_Parameter.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Send_Parameter.cpp @@ -169,6 +169,7 @@ BEGIN_MESSAGE_MAP(CSO7_Send_Parameter, CMFCPropertyPage) ON_BN_CLICKED(IDC_BUTTON_START_SAMPLE_SCURVE, &CSO7_Send_Parameter::OnBnClickedButtonStartSampleScurve) ON_BN_CLICKED(IDC_BUTTON_STOP_SAMPLE_SCURVE, &CSO7_Send_Parameter::OnBnClickedButtonStopSampleScurve) ON_BN_CLICKED(IDCANCEL, &CSO7_Send_Parameter::OnBnClickedCancel) + ON_BN_CLICKED(IDC_CHECK_SO7_MOTION_PARA_MOVETO_REVERSE, &CSO7_Send_Parameter::OnBnClickedCheckSo7MotionParaMovetoReverse) END_MESSAGE_MAP() @@ -630,7 +631,21 @@ void CSO7_Send_Parameter::ShowParameterOnEdit() #pragma endregion //#pragma region Sample_Motion_Curve +//================================================================================================ +void CSO7_Send_Parameter::OnBnClickedCheckSo7MotionParaMovetoReverse() +{ + CString str; + UpdateData(TRUE); + USES_CONVERSION; + GetDlgItem(IDC_EDIT_SAMPLE_SCURVE_DIS)->GetWindowText(str); + const char* cTempValue=T2A(str); + + double dTmp = -atof(cTempValue); + str.Format(_T("%.1f"),dTmp); + GetDlgItem(IDC_EDIT_SAMPLE_SCURVE_DIS)->SetWindowText(str); + OnEnKillfocusEditSampleScurveDis(); +} //================================================================================================ void CSO7_Send_Parameter::OnEnKillfocusEditSampleScurveDis() { @@ -1019,3 +1034,4 @@ void CSO7_Send_Parameter::OnBnClickedCancel() m_pSO7_Proto->Save_SevenOcean_Inifile(csPath+_T("\\Utility_Config.ini")); CMFCPropertyPage::OnCancel(); } + diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Send_Parameter.h b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Send_Parameter.h index 192d064..d775118 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Send_Parameter.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Send_Parameter.h @@ -109,4 +109,5 @@ public: //============================================= void OutputWithScroll(const CString &strNewText,CEdit &edtOutput); afx_msg void OnBnClickedCancel(); + afx_msg void OnBnClickedCheckSo7MotionParaMovetoReverse(); }; 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 0ce80ea..414d698 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 @@ -47,7 +47,6 @@ IMPLEMENT_DYNAMIC(CSO7_UtilDlg, CDialog) { m_TestZSignalNow=FALSE; m_BeginReadIO=FALSE; - m_ReadIOStatusAddr=4; m_SetIOStatusAddr=0; m_ZsignalPosX=0; m_ZsignalPosY=0; @@ -149,6 +148,7 @@ BEGIN_MESSAGE_MAP(CSO7_UtilDlg, CDialog) ON_BN_CLICKED(IDC_BUTTON_SO7_GET_SEQ_NUMBER, &CSO7_UtilDlg::OnBnClickedButtonSo7GetSeqNumber) ON_BN_CLICKED(IDC_BUTTON_SO7_SET_SEQ_NUMBER, &CSO7_UtilDlg::OnBnClickedButtonSo7SetSeqNumber) ON_BN_CLICKED(IDC_BUTTON_SO7_SET_VER_NUMBER, &CSO7_UtilDlg::OnBnClickedButtonSo7SetVerNumber) + ON_BN_CLICKED(IDC_RADIO_READ_LIMIT_SWITCH, &CSO7_UtilDlg::OnBnClickedRadioReadLimitSwitch) END_MESSAGE_MAP() @@ -190,8 +190,12 @@ BOOL CSO7_UtilDlg::OnInitDialog() ((CButton *)GetDlgItem(IDC_RADIO_SELECT_Y))->SetCheck(false); ((CButton *)GetDlgItem(IDC_RADIO_SELECT_Z))->SetCheck(false); - ((CButton *)GetDlgItem(IDC_RADIO_READ_INPUT_PORT))->SetCheck(true); + ((CButton *)GetDlgItem(IDC_RADIO_READ_LIMIT_SWITCH))->SetCheck(true); + ((CButton *)GetDlgItem(IDC_RADIO_READ_INPUT_PORT))->SetCheck(false); ((CButton *)GetDlgItem(IDC_RADIO_READ_OUTPUT_PORT))->SetCheck(false); + ((CButton *)GetDlgItem(IDC_RADIO_READ_OUTPUT_PORT2))->SetCheck(false); + m_ReadIOStatusAddr=ESO7_CONTROLLER_LIMIT_SWITCH_ADDR; + UpdateIOAddrCaption(); ((CButton *)GetDlgItem(IDC_RADIO_RELATIVE))->SetCheck(true); ((CButton *)GetDlgItem(IDC_RADIO_ABSOLUTE))->SetCheck(false); @@ -965,7 +969,7 @@ void CSO7_UtilDlg::OnBnClickedButtonMotionParameter() if(!g_pVolComp) g_pVolComp=new CSO7_VolComp(); - CSo7_Motion_Pages *pSo7_Motion_Pages = new CSo7_Motion_Pages(_T("Motion"), this); + CSo7_Motion_Pages *pSo7_Motion_Pages = new CSo7_Motion_Pages(_T("设置运动参数"), this); pSo7_Motion_Pages->DoModal(); delete pSo7_Motion_Pages; pSo7_Motion_Pages=nullptr; @@ -986,7 +990,7 @@ void CSO7_UtilDlg::OnBnClickedButtonSetupSo7config() if (!m_pSO7_AutoZoom) m_pSO7_AutoZoom = new CAutoZoom(); - CSo7_Config_Pages* pSo7_Config_Pages=new CSo7_Config_Pages(_T("so7_config.ini"), this); + CSo7_Config_Pages* pSo7_Config_Pages=new CSo7_Config_Pages(_T("配置so7_config.ini"), this); pSo7_Config_Pages->DoModal(); delete pSo7_Config_Pages; pSo7_Config_Pages=nullptr; @@ -1005,7 +1009,7 @@ void CSO7_UtilDlg::OnBnClickedButtonSo7TestZSignal() if (m_TestZSignalNow) { m_TestZSignalNow=FALSE; - ((CButton*)GetDlgItem(IDC_BUTTON_SO7_TEST_Z_SIGNAL))->SetWindowTextW(_T("Test Z Signal")); + ((CButton*)GetDlgItem(IDC_BUTTON_SO7_TEST_Z_SIGNAL))->SetWindowTextW(_T("测试零位信号")); m_ZsignalPosX=0; m_ZsignalPosY=0; m_ZsignalPosZ=0; @@ -1019,7 +1023,7 @@ void CSO7_UtilDlg::OnBnClickedButtonSo7TestZSignal() m_ZsignalPosY=m_pSO7_Proto->g_machine.y._ZSignal_pos._long_; m_ZsignalPosZ=m_pSO7_Proto->g_machine.z._ZSignal_pos._long_; m_TestZSignalNow=TRUE; - ((CButton*)GetDlgItem(IDC_BUTTON_SO7_TEST_Z_SIGNAL))->SetWindowTextW(_T("STOP")); + ((CButton*)GetDlgItem(IDC_BUTTON_SO7_TEST_Z_SIGNAL))->SetWindowTextW(_T("停止")); } } void CSO7_UtilDlg::TestZSignal() @@ -1100,7 +1104,7 @@ void CSO7_UtilDlg::TestZSignal() dScaleResult-=(m_pSO7_Proto->ScaleToMM(8388608,m_pSO7_Proto->g_machine.s_machine_config.x_axis._scale_resolution)); } } - m_OutMessage.Format(_T("[ZSignal-X] From: %-3.4f To: %-3.4f Dis: %-3.4f"),dTmp1,dTmp2,dScaleResult); + m_OutMessage.Format(_T("[RefMark-X] From: %-3.4f To: %-3.4f Dis: %-3.4f"),dTmp1,dTmp2,dScaleResult); OutputWithScroll(m_OutMessage,m_edMSG); } if (labs(m_pSO7_Proto->g_machine.y._ZSignal_pos._long_-m_ZsignalPosY)>5) @@ -1119,7 +1123,7 @@ void CSO7_UtilDlg::TestZSignal() dScaleResult-=(m_pSO7_Proto->ScaleToMM(8388608,m_pSO7_Proto->g_machine.s_machine_config.x_axis._scale_resolution)); } } - m_OutMessage.Format(_T("[ZSignal-Y] From: %-3.4f To: %-3.4f Dis: %-3.4f"),dTmp1,dTmp2,dScaleResult); + m_OutMessage.Format(_T("[RefMark-Y] From: %-3.4f To: %-3.4f Dis: %-3.4f"),dTmp1,dTmp2,dScaleResult); OutputWithScroll(m_OutMessage,m_edMSG); } if (labs(m_pSO7_Proto->g_machine.z._ZSignal_pos._long_-m_ZsignalPosZ)>5) @@ -1138,7 +1142,7 @@ void CSO7_UtilDlg::TestZSignal() dScaleResult-=(m_pSO7_Proto->ScaleToMM(8388608,m_pSO7_Proto->g_machine.s_machine_config.x_axis._scale_resolution)); } } - m_OutMessage.Format(_T("[ZSignal-Z] From: %-3.4f To: %-3.4f Dis: %-3.4f"),dTmp1,dTmp2,dScaleResult); + m_OutMessage.Format(_T("[RefMark-Z] From: %-3.4f To: %-3.4f Dis: %-3.4f"),dTmp1,dTmp2,dScaleResult); OutputWithScroll(m_OutMessage,m_edMSG); } m_ZsignalPosX=m_pSO7_Proto->g_machine.x._ZSignal_pos._long_; @@ -1221,19 +1225,28 @@ void CSO7_UtilDlg::OnBnClickedButtonSo7Readdatafromfpga() OutputWithScroll(m_OutMessage,m_edMSG); } //================================================================================================ +void CSO7_UtilDlg::OnBnClickedRadioReadLimitSwitch() +{ + m_ReadIOStatusAddr=ESO7_CONTROLLER_LIMIT_SWITCH_ADDR; + UpdateIOAddrCaption(0); +} +//================================================================================================ void CSO7_UtilDlg::OnBnClickedRadioReadInputPort() { - m_ReadIOStatusAddr=5; + m_ReadIOStatusAddr=ESO7_CONTROLLER_INPUT_PORT_ADDR; + UpdateIOAddrCaption(1); } //================================================================================================ void CSO7_UtilDlg::OnBnClickedRadioReadOutputPort() { - m_ReadIOStatusAddr=6; + m_ReadIOStatusAddr=ESO7_CONTROLLER_WOUTPUT_PORT_ADDR; + UpdateIOAddrCaption(1); } //================================================================================================ void CSO7_UtilDlg::OnBnClickedRadioReadOutputPort2() { - m_ReadIOStatusAddr=7; + m_ReadIOStatusAddr=ESO7_CONTROLLER_OUTPUT_PORT_ADDR; + UpdateIOAddrCaption(1); } //================================================================================================ @@ -1244,18 +1257,18 @@ void CSO7_UtilDlg::OnBnClickedButtonSo7ReadInPortStatus() if (m_BeginReadIO) { m_BeginReadIO=FALSE; - ((CButton*)GetDlgItem(IDC_BUTTON_SO7_READ_IN_PORT_STATUS))->SetWindowTextW(_T("Read IO Status")); + ((CButton*)GetDlgItem(IDC_BUTTON_SO7_READ_IN_PORT_STATUS))->SetWindowTextW(_T("停止")); } else { m_BeginReadIO=TRUE; - ((CButton*)GetDlgItem(IDC_BUTTON_SO7_READ_IN_PORT_STATUS))->SetWindowTextW(_T("STOP")); + ((CButton*)GetDlgItem(IDC_BUTTON_SO7_READ_IN_PORT_STATUS))->SetWindowTextW(_T("停止")); } } else { m_BeginReadIO=FALSE; - ((CButton*)GetDlgItem(IDC_BUTTON_SO7_READ_IN_PORT_STATUS))->SetWindowTextW(_T("Read IO Status")); + ((CButton*)GetDlgItem(IDC_BUTTON_SO7_READ_IN_PORT_STATUS))->SetWindowTextW(_T("停止")); UpdateIOStatus(); m_OutMessage.Format(_T("[Addr %d]:Data=%d"),m_ReadIOStatusAddr,(BYTE)m_pSO7_Proto->g_machine.InPortStatus); OutputWithScroll(m_OutMessage,m_edMSG); @@ -1263,6 +1276,34 @@ void CSO7_UtilDlg::OnBnClickedButtonSo7ReadInPortStatus() } } +//================================================================================================ +void CSO7_UtilDlg::UpdateIOAddrCaption(int _type) +{ + switch(_type) + { + case 0: + { + ((CStatic*)GetDlgItem(IDC_STATIC_IO_ADDR1))->SetWindowTextW(_T("XR")); + ((CStatic*)GetDlgItem(IDC_STATIC_IO_ADDR2))->SetWindowTextW(_T("XL")); + ((CStatic*)GetDlgItem(IDC_STATIC_IO_ADDR3))->SetWindowTextW(_T("YF")); + ((CStatic*)GetDlgItem(IDC_STATIC_IO_ADDR4))->SetWindowTextW(_T("YB")); + ((CStatic*)GetDlgItem(IDC_STATIC_IO_ADDR5))->SetWindowTextW(_T("ZU")); + ((CStatic*)GetDlgItem(IDC_STATIC_IO_ADDR6))->SetWindowTextW(_T("ZD")); + break; + } + case 1: + { + ((CStatic*)GetDlgItem(IDC_STATIC_IO_ADDR1))->SetWindowTextW(_T("1")); + ((CStatic*)GetDlgItem(IDC_STATIC_IO_ADDR2))->SetWindowTextW(_T("2")); + ((CStatic*)GetDlgItem(IDC_STATIC_IO_ADDR3))->SetWindowTextW(_T("3")); + ((CStatic*)GetDlgItem(IDC_STATIC_IO_ADDR4))->SetWindowTextW(_T("4")); + ((CStatic*)GetDlgItem(IDC_STATIC_IO_ADDR5))->SetWindowTextW(_T("5")); + ((CStatic*)GetDlgItem(IDC_STATIC_IO_ADDR6))->SetWindowTextW(_T("6")); + break; + } + } +} + //================================================================================================ void CSO7_UtilDlg::UpdateIOStatus() { @@ -1408,7 +1449,6 @@ void CSO7_UtilDlg::OnTimer(UINT_PTR nIDEvent) BOOL CSO7_UtilDlg::PreTranslateMessage(MSG* pMsg) { - if(pMsg->message==WM_KEYDOWN) { if(pMsg->wParam==VK_RETURN || pMsg->wParam==VK_ESCAPE) @@ -1477,7 +1517,7 @@ void CSO7_UtilDlg::OnBnClickedButtonSo7CncProgram() } //================================================= // Move one revolution 2**23 -// When the rotary stop, take the curr pos - ref pos. +// When the rotary 停止, take the curr pos - ref pos. // g_machine.z._pos_fixed._char_[3] // void CSO7_UtilDlg::OnBnClickedButtonHome() @@ -1519,3 +1559,5 @@ 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 2cefc59..284502e 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 @@ -67,6 +67,7 @@ public: bool m_bEnProbe; INT m_ReadAxisIntervalTime; void UpdateIOStatus(); + void UpdateIOAddrCaption(int _type=0); void TestZSignal(); void OutputWithScroll(const CString &strNewText,CEdit &edtOutput); afx_msg void OnBnClickedButtonInitSo7usb(); @@ -128,4 +129,5 @@ public: afx_msg void OnBnClickedButtonSo7GetSeqNumber(); afx_msg void OnBnClickedButtonSo7SetSeqNumber(); afx_msg void OnBnClickedButtonSo7SetVerNumber(); + afx_msg void OnBnClickedRadioReadLimitSwitch(); }; diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SetSo7MotionConfig.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SetSo7MotionConfig.cpp index a6c7369..003206a 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SetSo7MotionConfig.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SetSo7MotionConfig.cpp @@ -47,10 +47,10 @@ BOOL CSetSo7MotionConfig::OnInitDialog() m_ConfigList.GetClientRect(&m_rect); //获取list的客户区 m_ConfigList.SetExtendedStyle(LVS_EX_GRIDLINES|LVS_EX_FULLROWSELECT); //设置list风格 - m_ConfigList.InsertColumn(0,_T("编号"),LVCFMT_LEFT, m_rect.right/10); - m_ConfigList.InsertColumn(1,_T("参数名"),LVCFMT_LEFT, m_rect.right*3/10); - m_ConfigList.InsertColumn(2,_T("值"),LVCFMT_LEFT, m_rect.right*2/10); - m_ConfigList.InsertColumn(3,_T("描述"),LVCFMT_LEFT, m_rect.right*4/10); + m_ConfigList.InsertColumn(0,_T("编号"),LVCFMT_LEFT, m_rect.right/20); + m_ConfigList.InsertColumn(1,_T("参数名"),LVCFMT_LEFT, m_rect.right*6/20); + m_ConfigList.InsertColumn(2,_T("值"),LVCFMT_LEFT, m_rect.right*2/20); + m_ConfigList.InsertColumn(3,_T("描述"),LVCFMT_LEFT, m_rect.right*11/20); for (int i = 1; i < 100; i++) { @@ -71,127 +71,127 @@ void CSetSo7MotionConfig::UpdateLabelName() CString cStr(""); cStr="CLOSE_LOOP_ENABLED"; m_ConfigList.SetItemText(iRow,iCol,cStr); - cStr="default:0"; + cStr="软件闭环判断功能；0：禁用，1：使能；默认值：0"; m_ConfigList.SetItemText(iRow,iCol+2,cStr); iRow++; cStr="MOTION_RETRY_TIMES"; m_ConfigList.SetItemText(iRow,iCol,cStr); - cStr="default:5"; + cStr="软件闭环判断重试次数；有效范围:0-255；默认值：0"; m_ConfigList.SetItemText(iRow,iCol+2,cStr); iRow++; cStr="SHIFT_POSITION_X"; m_ConfigList.SetItemText(iRow,iCol,cStr); - cStr="default:0"; + cStr="软件闭环判断X偏移距离(mm)；有效范围:0-65535；默认值：0"; m_ConfigList.SetItemText(iRow,iCol+2,cStr); iRow++; cStr="SHIFT_POSITION_Y"; m_ConfigList.SetItemText(iRow,iCol,cStr); - cStr="default:0"; + cStr="软件闭环判断Y偏移距离(mm)；有效范围:0-65535；默认值：0"; m_ConfigList.SetItemText(iRow,iCol+2,cStr); iRow++; cStr="SHIFT_POSITION_Z"; m_ConfigList.SetItemText(iRow,iCol,cStr); - cStr="default:0"; + cStr="软件闭环判断Z偏移距离(mm)；有效范围:0-65535；默认值：0"; m_ConfigList.SetItemText(iRow,iCol+2,cStr); iRow++; cStr="GET_USB_MESSAGE_METHOD"; m_ConfigList.SetItemText(iRow,iCol,cStr); - cStr="default:1"; + cStr="USB读取消息方式；0：中断方式，1：查询方式；默认值：1"; m_ConfigList.SetItemText(iRow,iCol+2,cStr); iRow++; cStr="WRITE_DATA_SLEEP_TIME"; m_ConfigList.SetItemText(iRow,iCol,cStr); - cStr="default:0"; + cStr="USB通信休息时间（ms）；有效范围:0-255；默认值：0"; m_ConfigList.SetItemText(iRow,iCol+2,cStr); iRow++; cStr="ACCURA_ERROR_PULSE_X"; m_ConfigList.SetItemText(iRow,iCol,cStr); - cStr="default:1"; + cStr="允许定位误差脉冲数；有效范围:1-255；默认值：1"; m_ConfigList.SetItemText(iRow,iCol+2,cStr); iRow++; cStr="ACCURA_ERROR_PULSE_Y"; m_ConfigList.SetItemText(iRow,iCol,cStr); - cStr="default:1"; + cStr="允许定位误差脉冲数；有效范围:1-255；默认值：1"; m_ConfigList.SetItemText(iRow,iCol+2,cStr); iRow++; cStr="ACCURA_ERROR_PULSE_Z"; m_ConfigList.SetItemText(iRow,iCol,cStr); - cStr="default:1"; + cStr="允许定位误差脉冲数；有效范围:1-255；默认值：1"; m_ConfigList.SetItemText(iRow,iCol+2,cStr); iRow++; cStr="EQUIDISTANCE_PULSE_X"; m_ConfigList.SetItemText(iRow,iCol,cStr); - cStr="default:0"; + cStr="输出等间距脉冲；有效范围:0-255；默认值：0"; m_ConfigList.SetItemText(iRow,iCol+2,cStr); iRow++; cStr="EQUIDISTANCE_PULSE_Y"; m_ConfigList.SetItemText(iRow,iCol,cStr); - cStr="default:0"; + cStr="输出等间距脉冲；有效范围:0-255；默认值：0"; m_ConfigList.SetItemText(iRow,iCol+2,cStr); iRow++; cStr="EQUIDISTANCE_PULSE_Z"; m_ConfigList.SetItemText(iRow,iCol,cStr); - cStr="default:0"; + cStr="输出等间距脉冲；有效范围:0-255；默认值：0"; m_ConfigList.SetItemText(iRow,iCol+2,cStr); iRow++; cStr="TOUCH_PROBE_ENABLE"; m_ConfigList.SetItemText(iRow,iCol,cStr); - cStr="0:Disable,1:Enable"; + cStr="接触探针功能；0：禁用，1：使能；默认值：0"; m_ConfigList.SetItemText(iRow,iCol+2,cStr); iRow++; cStr="JOYSTICK_ENABLE"; m_ConfigList.SetItemText(iRow,iCol,cStr); - cStr="0:Disable,1:Enable"; + cStr="摇杆功能；0：禁用，1：使能；默认值：0"; m_ConfigList.SetItemText(iRow,iCol+2,cStr); iRow++; cStr="DEBUG_LOG_ENABLE"; m_ConfigList.SetItemText(iRow,iCol,cStr); - cStr="0:Disable,1:Enable"; + cStr="软件运行记录功能；0：禁用，1：使能；默认值：0"; m_ConfigList.SetItemText(iRow,iCol+2,cStr); iRow++; //=================VIDEOCARD================== cStr="SDK3000_SLEEP_COUNT"; m_ConfigList.SetItemText(iRow,iCol,cStr); - cStr="default:550000"; + cStr="SDK3000去条纹参数；有效范围:500000-700000；默认值：550000"; m_ConfigList.SetItemText(iRow,iCol+2,cStr); iRow++; cStr="SV4000E_DENOISE_PARA_CHANNEL1"; m_ConfigList.SetItemText(iRow,iCol,cStr); - cStr="effective range:5-100;default:70"; + cStr="SV4000E降噪参数；有效范围:5-100；默认值：70"; m_ConfigList.SetItemText(iRow,iCol+2,cStr); iRow++; cStr="SV4000E_DENOISE_PARA_CHANNEL2"; m_ConfigList.SetItemText(iRow,iCol,cStr); - cStr="effective range:5-100;default:70"; + cStr="SV4000E降噪参数；有效范围:5-100；默认值：70"; m_ConfigList.SetItemText(iRow,iCol+2,cStr); iRow++; cStr="SV4000E_DENOISE_PARA_CHANNEL3"; - m_ConfigList.SetItemText(iRow,iCol,cStr); - cStr="effective range:5-100;default:70"; + m_ConfigList.SetItemText(iRow,iCol,cStr); + cStr="SV4000E降噪参数；有效范围:5-100；默认值：70"; m_ConfigList.SetItemText(iRow,iCol+2,cStr); iRow++; cStr="SV4000E_DENOISE_PARA_CHANNEL4"; m_ConfigList.SetItemText(iRow,iCol,cStr); - cStr="effective range:5-100;default:70"; + cStr="SV4000E降噪参数；有效范围:5-100；默认值：70"; m_ConfigList.SetItemText(iRow,iCol+2,cStr); iRow++; } @@ -374,4 +374,15 @@ void CSetSo7MotionConfig::OutputWithScroll(const CString &strNewText,CEdit &edtO edtOutput.LineScroll(iLine, 0); edtOutput.SetSel(iCount, iCount); edtOutput.SetRedraw(TRUE); +} +BOOL CSetSo7MotionConfig::PreTranslateMessage(MSG* pMsg) +{ + if(pMsg->message==WM_KEYDOWN) + { + if(pMsg->wParam==VK_RETURN || pMsg->wParam==VK_ESCAPE) + { + return TRUE; + } + } + return CDialog::PreTranslateMessage(pMsg); } \ No newline at end of file diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SetSo7MotionConfig.h b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SetSo7MotionConfig.h index 06b96d0..9e56f20 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SetSo7MotionConfig.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SetSo7MotionConfig.h @@ -23,6 +23,7 @@ protected: void SaveDataValue(); void OutputWithScroll(const CString &strNewText,CEdit &edtOutput); public: + afx_msg BOOL PreTranslateMessage(MSG* pMsg); CEditableListCtrl m_ConfigList; CEdit m_edit_MsgOut; afx_msg void OnBnClickedButtonSo7MotionConfigOk(); diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Setup_so7config.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Setup_so7config.cpp index 442a247..c1440ee 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Setup_so7config.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Setup_so7config.cpp @@ -471,3 +471,15 @@ BOOL CSetup_so7config::CalibrateEncoder() { return m_pSO7_AutoZoom->CalibrateEncoder(); } +//=============================================== +BOOL CSetup_so7config::PreTranslateMessage(MSG* pMsg) +{ + if(pMsg->message==WM_KEYDOWN) + { + if(pMsg->wParam==VK_RETURN || pMsg->wParam==VK_ESCAPE) + { + return TRUE; + } + } + return CDialog::PreTranslateMessage(pMsg); +} \ No newline at end of file diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Setup_so7config.h b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Setup_so7config.h index d86233a..e32a745 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Setup_so7config.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Setup_so7config.h @@ -28,6 +28,7 @@ protected: void ChangGUIWithStep(int _step); bool _bReading; public: + afx_msg BOOL PreTranslateMessage(MSG* pMsg); afx_msg void OnTimer(UINT_PTR nIDEvent); afx_msg void OnBnClickedBtnConfigureCalibratev(); afx_msg void OnBnClickedButtonSo7configStep1(); diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Config_Pages.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Config_Pages.cpp index 8db68d5..798033a 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Config_Pages.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Config_Pages.cpp @@ -79,4 +79,16 @@ void CSo7_Config_Pages::OnCancel() void CSo7_Config_Pages::OnSave() { Default(); +} +//================================================================ +BOOL CSo7_Config_Pages::PreTranslateMessage(MSG* pMsg) +{ + if(pMsg->message==WM_KEYDOWN) + { + if(pMsg->wParam==VK_RETURN || pMsg->wParam==VK_ESCAPE) + { + return TRUE; + } + } + return CMFCPropertySheet::PreTranslateMessage(pMsg); } \ No newline at end of file diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Config_Pages.h b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Config_Pages.h index 16b854c..635c6a3 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Config_Pages.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Config_Pages.h @@ -15,6 +15,7 @@ public: CSetSo7MotionConfig m_PageMotionConfig; HICON m_hIcon; CButton m_ExitButton; + afx_msg BOOL PreTranslateMessage(MSG* pMsg); afx_msg void OnCancel(); afx_msg void OnSave(); // Implementation diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Motion_Pages.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Motion_Pages.cpp index 6d58eb1..9bf14c9 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Motion_Pages.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Motion_Pages.cpp @@ -73,4 +73,16 @@ void CSo7_Motion_Pages::OnCancel() { CMFCPropertySheet::OnClose(); //Default(); +} +//================================================================ +BOOL CSo7_Motion_Pages::PreTranslateMessage(MSG* pMsg) +{ + if(pMsg->message==WM_KEYDOWN) + { + if(pMsg->wParam==VK_RETURN || pMsg->wParam==VK_ESCAPE) + { + return TRUE; + } + } + return CMFCPropertySheet::PreTranslateMessage(pMsg); } \ No newline at end of file diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Motion_Pages.h b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Motion_Pages.h index e1e883f..ab184a4 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Motion_Pages.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Motion_Pages.h @@ -16,10 +16,11 @@ public: CSO7_Move_Location m_PageMoveLocation; HICON m_hIcon; CButton m_ExitButton; + afx_msg BOOL PreTranslateMessage(MSG* pMsg); afx_msg void OnCancel(); // Implementation public: - virtual ~CSo7_Motion_Pages(); + virtual ~CSo7_Motion_Pages(); protected: DECLARE_MESSAGE_MAP() virtual BOOL OnInitDialog(); 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 a4ef2b9..33c9702 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h @@ -251,6 +251,7 @@ #define IDC_CHECK_CONTINUOUS_READ_IO_STATUS 1204 #define IDC_CHECK_SO7_RUNING_PROGRAM_RUNING_INFINITE 1204 #define IDC_CHECK_LKG5000_CONTINUE_READ1 1204 +#define IDC_CHECK_SO7_MOTION_PARA_MOVETO_REVERSE 1204 #define IDC_RADIO_MACHINE_SevenOcean 1205 #define IDC_CHECK_CONTINUE_READ_LASER_LK_H_VALUE 1205 #define IDC_BUTTON_INIT_SO7USB 1206 @@ -331,7 +332,6 @@ #define IDC_RADIO_SELECT_Z 1264 #define IDC_BUTTON_SO7_GET_SEQ_NUMBER 1265 #define IDC_BUTTON_SO7_SET_SEQ_NUMBER 1266 -#define IDC_BUTTON_SO7_SET_SEQ_NUMBER2 1267 #define IDC_BUTTON_SO7_SET_VER_NUMBER 1267 #define IDC_BUTTON_SET_OUT_PORT 1269 #define IDC_EDIT_SET_VER_NO 1271 @@ -888,6 +888,7 @@ #define IDC_RADIO_MACHINE_TESASTARE 1806 #define IDC_RADIO_READ_OUTPUT_PORT2 1806 #define IDC_EDIT_MOVETO_DEG 1807 +#define IDC_RADIO_READ_LIMIT_SWITCH 1807 #define IDC_BUTTON_TESA_STAR_SENDMSG 1808 #define IDC_EDIT_TESA_STAR_E_LOG 1809 #define IDC_BUTTON_TESA_STAR_CLEAR_LOG 1810 @@ -929,6 +930,12 @@ #define IDC_RADIO_SO7_MOVE_SPEED_GEAR4 1834 #define IDC_RADIO_SO7_MOVE_SPEED_GEAR5 1835 #define IDC_EDIT_SV4000E_DENOISE 1836 +#define IDC_STATIC_IO_ADDR1 1837 +#define IDC_STATIC_IO_ADDR2 1838 +#define IDC_STATIC_IO_ADDR3 1839 +#define IDC_STATIC_IO_ADDR4 1840 +#define IDC_STATIC_IO_ADDR5 1841 +#define IDC_STATIC_IO_ADDR6 1842 #define IDC_BUTTON_DIY_EXIT_BUTTON 32740 #define ID_EDIT_SO7_CONFIG_MOTION 32741 @@ -938,7 +945,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 191 #define _APS_NEXT_COMMAND_VALUE 32771 -#define _APS_NEXT_CONTROL_VALUE 1837 +#define _APS_NEXT_CONTROL_VALUE 1843 #define _APS_NEXT_SYMED_VALUE 104 #endif #endif 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 8bbd175..4dcddd0 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