From 4bb02c60026bbfde229eb5d39308eee9829eff18 Mon Sep 17 00:00:00 2001 From: TAO Cheng Date: Fri, 25 Jul 2014 16:47:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8F=AF=E8=AF=BB=E5=86=99?= =?UTF-8?q?=E4=B8=8D=E5=90=8C=E6=A1=A3=E4=BD=8D=E9=99=90=E5=AE=9A=E7=9A=84?= =?UTF-8?q?=E4=BD=8D=E7=A7=BB=E5=80=BC=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Base/Interfac/Msi/Hsi/SevenOcean/CMD_H.h | 3 +- .../Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp | 108 +++++++++++- .../Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h | 10 +- .../Tools/UsbUtility/Debug/UtilityDebug.Log | 8 + .../Tools/UsbUtility/Debug/Utility_Config.ini | 58 +++---- .../Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc | 30 ++-- .../UsbUtility/UsbUtil/SO7_Automatic_Zoom.cpp | 1 + .../UsbUtility/UsbUtil/SO7_Move_Location.cpp | 155 ++++++++++++++++++ .../UsbUtility/UsbUtil/SO7_Move_Location.h | 7 + .../UsbUtility/UsbUtil/SO7_Send_Parameter.cpp | 79 ++++++++- .../UsbUtility/UsbUtil/SO7_Send_Parameter.h | 1 + .../Tools/UsbUtility/UsbUtil/SO7_UtilDlg.cpp | 2 +- .../UsbUtility/UsbUtil/So7_Motion_Pages.cpp | 1 + .../UsbUtil/So7_Util_External_Trig.cpp | 7 + .../UsbUtil/So7_Util_External_Trig.h | 7 - .../Hsi/Tools/UsbUtility/UsbUtil/resource.h | 10 +- .../Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo | Bin 150016 -> 150016 bytes 17 files changed, 431 insertions(+), 56 deletions(-) diff --git a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/CMD_H.h b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/CMD_H.h index c66ee15..426f4fb 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/CMD_H.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/CMD_H.h @@ -126,7 +126,8 @@ enum MOTOR_CMD CT_SET_MOTION_FINISHED_CNTS, CT_GET_MOTION_FINISHED_CNTS, - + CT_SET_MOTION_SEGMENT_DIS, + CT_GET_MOTION_SEGMENT_DIS, CT_END }; diff --git a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp index 12d465b..eaf7cae 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp @@ -207,7 +207,12 @@ void CSO7_Proto::_process_rcv_transfer_data(int iEP) break; case CT_GET_MOTION_FINISHED_CNTS: _process_SO7_CMD_GET_MOTION_CNTS(); + break; + case CT_GET_MOTION_SEGMENT_DIS: + _process_SO7_CMD_GET_MOTION_SEGMENT_DIS(ep_buff[EP_02_CMD_IDX]._save_send_cmd1+1,ep_buff[EP_02_CMD_IDX]._save_send_cmd2); 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]); @@ -551,6 +556,16 @@ CSO7_Proto::CSO7_Proto() g_machine.s_machine_config.zm_axis._SpeedFast=2000; g_machine.s_machine_config.zm_axis._SpeedSlow=800; g_machine.s_machine_config.zm_axis._speed._short_=0; + + g_machine.s_machine_config.x_axis._MotionSegmentDis[0]=100; + g_machine.s_machine_config.x_axis._MotionSegmentDis[1]=1000; + g_machine.s_machine_config.x_axis._MotionSegmentDis[2]=5000; + g_machine.s_machine_config.y_axis._MotionSegmentDis[0]=100; + g_machine.s_machine_config.y_axis._MotionSegmentDis[1]=1000; + g_machine.s_machine_config.y_axis._MotionSegmentDis[2]=5000; + g_machine.s_machine_config.z_axis._MotionSegmentDis[0]=100; + g_machine.s_machine_config.z_axis._MotionSegmentDis[1]=1000; + g_machine.s_machine_config.z_axis._MotionSegmentDis[2]=5000; g_machine.MotionType=-1; g_machine.s_status._bIsZMMotionFinished=0; @@ -3298,6 +3313,7 @@ SSI_STATUS_MOTION CSO7_Proto::_send_usb_cmd(int iEP_Base) ep_buff[iEP_Base]._save_send_cmd = ep_buff[iEP_Base]._buffer[0]; ep_buff[iEP_Base]._save_send_cmd0 = ep_buff[iEP_Base]._buffer[1]; ep_buff[iEP_Base]._save_send_cmd1 = ep_buff[iEP_Base]._buffer[2]; + ep_buff[iEP_Base]._save_send_cmd2= ep_buff[iEP_Base]._buffer[3]; //TRACE3("_send_usb_cmd() iEP : %X - ep_buff[iEP]._save_send_cmd : %X ._buffer[0] : %X\r\n", iEP_Base, ep_buff[iEP_Base]._save_send_cmd, ep_buff[iEP_Base]._buffer[0]); @@ -3330,6 +3346,7 @@ SSI_STATUS_MOTION CSO7_Proto::_write_usb_data_only(int iEP_Base) ep_buff[iEP_Base]._save_send_cmd = ep_buff[iEP_Base]._buffer[0]; ep_buff[iEP_Base]._save_send_cmd0 = ep_buff[iEP_Base]._buffer[1]; ep_buff[iEP_Base]._save_send_cmd1 = ep_buff[iEP_Base]._buffer[2]; + ep_buff[iEP_Base]._save_send_cmd2 = ep_buff[iEP_Base]._buffer[3]; //TRACE3("_send_usb_cmd() iEP : %X - ep_buff[iEP]._save_send_cmd : %X ._buffer[0] : %X\r\n", iEP_Base, ep_buff[iEP_Base]._save_send_cmd, ep_buff[iEP_Base]._buffer[0]); @@ -6415,6 +6432,62 @@ SSI_STATUS_MOTION CSO7_Proto::_send_cmd_SO7_CMD_GET_CONTROL_MODE(char axis_type) ReleaseMutex(g_hEP02_Serial_Mutex); return SSI_STATUS_MOTION_NORMAL; } + + +//============================================================== +SSI_STATUS_MOTION CSO7_Proto::_send_cmd_SO7_CMD_SET_MOTION_SEGMENT_DIS(char axis_type,char _SegmentIndex,long _lDis) +{ + WaitForSingleObject(g_hEP02_Serial_Mutex, INFINITE); + memset(ep_buff[EP_02_CMD_IDX]._buffer, 0x00, MAX_BUFF_SIZE); + char cBuff(0); + int index(0); + *(ep_buff[EP_02_CMD_IDX]._buffer+index) = CT_MOTOR; + index++; + *(ep_buff[EP_02_CMD_IDX]._buffer+index) = CT_SET_MOTION_SEGMENT_DIS; + index++; + *(ep_buff[EP_02_CMD_IDX]._buffer+index) = axis_type-1; + index++; + *(ep_buff[EP_02_CMD_IDX]._buffer+index) = _SegmentIndex; + index++; + + cBuff = (_lDis>>16) & 0x0ff; + *(ep_buff[EP_02_CMD_IDX]._buffer+index) = cBuff; + index++; + cBuff = (_lDis>>8) & 0x0ff; + *(ep_buff[EP_02_CMD_IDX]._buffer+index) = cBuff; + index++; + cBuff = _lDis & 0x0ff; + *(ep_buff[EP_02_CMD_IDX]._buffer+index) = cBuff; + index++; + + ep_buff[EP_02_CMD_IDX]._size = index; + ep_buff[EP_81_DATA_IDX]._size = 0x00; + + 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_MOTION_SEGMENT_DIS(char axis_type,char _SegmentIndex) +{ + 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_MOTOR; + *(ep_buff[EP_02_CMD_IDX]._buffer+1) = CT_GET_MOTION_SEGMENT_DIS; + *(ep_buff[EP_02_CMD_IDX]._buffer+2) = axis_type-1; + *(ep_buff[EP_02_CMD_IDX]._buffer+3) = _SegmentIndex; + + ep_buff[EP_02_CMD_IDX]._size = 0x04; + ep_buff[EP_82_DATA_IDX]._size = 0x03; + + 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() { @@ -6752,7 +6825,18 @@ SSI_STATUS_MOTION CSO7_Proto::_process_SO7_CMD_READ_FIRMWARE_VERSION_INFO() } else if (g_machine.FirmwareInfo[3]=='7') { - g_machine.FirmwareVer=FirmwareVer_7_X; + if (g_machine.FirmwareInfo[5]=='1') + { + g_machine.FirmwareVer=FirmwareVer_7_A; + } + else if (g_machine.FirmwareInfo[5]=='0' && g_machine.FirmwareInfo[6]=='9' ) + { + g_machine.FirmwareVer=FirmwareVer_7_9; + } + else + { + g_machine.FirmwareVer=FirmwareVer_7_X; + } } else { @@ -6836,4 +6920,26 @@ SSI_STATUS_MOTION CSO7_Proto::_process_SO7_CMD_GET_CONTROL_MODE() { g_machine.FPGAData = *(ep_buff[EP_82_DATA_IDX]._buffer); return SSI_STATUS_MOTION_NORMAL; +} + +//============================================================== +SSI_STATUS_MOTION CSO7_Proto::_process_SO7_CMD_GET_MOTION_SEGMENT_DIS(BYTE axis_type,BYTE _SegmentIndex) +{ + BYTE rBuffer[3] = {0}; + rBuffer[0]=*(ep_buff[EP_82_DATA_IDX]._buffer); + rBuffer[1]=*(ep_buff[EP_82_DATA_IDX]._buffer+1); + rBuffer[2]=*(ep_buff[EP_82_DATA_IDX]._buffer+2); + if (axis_type==E_ACTIVE_AXIS_X) + { + g_machine.s_machine_config.x_axis._MotionSegmentDis[_SegmentIndex]=rBuffer[0]*65536+rBuffer[1]*256+rBuffer[2]; + } + else if (axis_type==E_ACTIVE_AXIS_Y) + { + g_machine.s_machine_config.y_axis._MotionSegmentDis[_SegmentIndex]=rBuffer[0]*65536+rBuffer[1]*256+rBuffer[2]; + } + else + { + g_machine.s_machine_config.z_axis._MotionSegmentDis[_SegmentIndex]=rBuffer[0]*65536+rBuffer[1]*256+rBuffer[2]; + } + 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 e981b7b..287d040 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h @@ -80,6 +80,8 @@ enum EFirmwareVer FirmwareVer_3_X=0, FirmwareVer_6_X, FirmwareVer_7_X, + FirmwareVer_7_9,//add control mode + FirmwareVer_7_A,//add segment dis FirmwareVer_Total }; enum ESO7_AXIS_TYPE @@ -164,6 +166,7 @@ struct s_so7_axis_config // axis configuration double _MoveToSpeed[2]; double _MotionSpeedScale; + long _MotionSegmentDis[3]; long _scale_range; double _neg_working_limit; double _pos_working_limit; @@ -382,7 +385,8 @@ struct struct_so7_ep_buff int _ep; BYTE _save_send_cmd; BYTE _save_send_cmd0; - BYTE _save_send_cmd1; + BYTE _save_send_cmd1; + BYTE _save_send_cmd2; char *_buffer; // MAX_BUFF_SIZE int _size; void *_async_context; @@ -576,6 +580,8 @@ public: SSI_STATUS_MOTION _send_cmd_SO7_CMD_GET_MOTION_CNTS(char _Speedgear=0); SSI_STATUS_MOTION _send_cmd_SO7_CMD_SET_CONTROL_MODE(char axis_type,char ControlMode); SSI_STATUS_MOTION _send_cmd_SO7_CMD_GET_CONTROL_MODE(char axis_type); + SSI_STATUS_MOTION _send_cmd_SO7_CMD_SET_MOTION_SEGMENT_DIS(char axis_type,char _SegmentIndex,long _lDis); + SSI_STATUS_MOTION _send_cmd_SO7_CMD_GET_MOTION_SEGMENT_DIS(char axis_type,char _SegmentIndex); static SSI_STATUS_MOTION _process_SO7_CMD_MOVE_X(); static SSI_STATUS_MOTION _process_SO7_CMD_MOVE_Y(); @@ -618,6 +624,8 @@ public: static SSI_STATUS_MOTION _process_SO7_CMD_WRITE_TRIG_PULSE_PARA(); static SSI_STATUS_MOTION _process_SO7_CMD_GET_MOTION_CNTS(); static SSI_STATUS_MOTION _process_SO7_CMD_GET_CONTROL_MODE(); + static SSI_STATUS_MOTION _process_SO7_CMD_GET_MOTION_SEGMENT_DIS(BYTE axis_type,BYTE _SegmentIndex); + }; #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 9b32ff4..8c271c0 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log @@ -4755,3 +4755,11 @@ Usb Port Initialized. Usb Port Initialized. Usb Port Initialized. Usb Port Initialized. +Usb Port Initialized. +Usb Port Initialized. +Usb Port Initialized. +Usb Port Initialized. +Usb Port Initialized. +Usb Port Initialized. +Usb Port Initialized. +Usb Port Initialized. 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 8375494..e618f98 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 @@ -25,21 +25,21 @@ SPEED_SLOW_X2=2.000 ; SPEED_BASE_X3=2 SPEED_MAX_X3=0 -SPEED_START_X3=0 -SPEED_FRESH_X3=100 -SPEED_SLOW_X3=0.001 +SPEED_START_X3=8 +SPEED_FRESH_X3=10 +SPEED_SLOW_X3=0.050 ; SPEED_BASE_X4=2 SPEED_MAX_X4=0 SPEED_START_X4=5 -SPEED_FRESH_X4=100 -SPEED_SLOW_X4=0.001 +SPEED_FRESH_X4=10 +SPEED_SLOW_X4=0.009 ; SPEED_BASE_X5=2 SPEED_MAX_X5=0 SPEED_START_X5=50 -SPEED_FRESH_X5=100 -SPEED_SLOW_X5=0.000 +SPEED_FRESH_X5=10 +SPEED_SLOW_X5=0.100 ; SPEED_BASE_Y1=20 SPEED_MAX_Y1=10 @@ -55,21 +55,21 @@ SPEED_SLOW_Y2=1.000 ; SPEED_BASE_Y3=2 SPEED_MAX_Y3=0 -SPEED_START_Y3=0 -SPEED_FRESH_Y3=100 -SPEED_SLOW_Y3=0.001 +SPEED_START_Y3=8 +SPEED_FRESH_Y3=10 +SPEED_SLOW_Y3=0.050 ; -SPEED_BASE_Y4=2 +SPEED_BASE_Y4=0 SPEED_MAX_Y4=0 SPEED_START_Y4=10 -SPEED_FRESH_Y4=100 -SPEED_SLOW_Y4=0.001 +SPEED_FRESH_Y4=10 +SPEED_SLOW_Y4=0.009 ; -SPEED_BASE_Y5=2 +SPEED_BASE_Y5=1 SPEED_MAX_Y5=0 SPEED_START_Y5=50 -SPEED_FRESH_Y5=100 -SPEED_SLOW_Y5=0.000 +SPEED_FRESH_Y5=10 +SPEED_SLOW_Y5=0.100 ; SPEED_BASE_Z1=20 SPEED_MAX_Z1=100 @@ -86,28 +86,28 @@ SPEED_SLOW_Z2=1.500 SPEED_BASE_Z3=3 SPEED_MAX_Z3=5 SPEED_START_Z3=5 -SPEED_FRESH_Z3=100 -SPEED_SLOW_Z3=0.001 +SPEED_FRESH_Z3=10 +SPEED_SLOW_Z3=0.100 ; -SPEED_BASE_Z4=2 +SPEED_BASE_Z4=0 SPEED_MAX_Z4=0 SPEED_START_Z4=18 -SPEED_FRESH_Z4=100 -SPEED_SLOW_Z4=0.001 +SPEED_FRESH_Z4=10 +SPEED_SLOW_Z4=0.009 ; -SPEED_BASE_Z5=2 +SPEED_BASE_Z5=5 SPEED_MAX_Z5=6 SPEED_START_Z5=133 -SPEED_FRESH_Z5=100 -SPEED_SLOW_Z5=0.000 +SPEED_FRESH_Z5=10 +SPEED_SLOW_Z5=0.100 ; -X_MOTOR_PRECISION=0.008 -Y_MOTOR_PRECISION=0.009 +X_MOTOR_PRECISION=0.004 +Y_MOTOR_PRECISION=0.008 Z_MOTOR_PRECISION=0.004 ; -X_MOTOR_WHEELBASE=1.875 -Y_MOTOR_WHEELBASE=1.875 -Z_MOTOR_WHEELBASE=1.000 +X_MOTOR_WHEELBASE=1.500 +Y_MOTOR_WHEELBASE=1.500 +Z_MOTOR_WHEELBASE=1.500 ; MOTOR_PULSE_NUM=10000 ; 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 2d38182..262aa22 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 @@ -275,9 +275,9 @@ 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 "发送到\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 "发送到\r控制器",IDC_BUTTON_SAVE_PARAMETER,96,420,50,24,BS_MULTILINE + PUSHBUTTON "读取控制器\r参数",IDC_BUTTON_READ_PARAMETER_FROM_CONTROLLER,164,420,50,24,BS_MULTILINE + PUSHBUTTON "另存为...",IDC_BUTTON_SAVE,232,420,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 @@ -333,6 +333,10 @@ BEGIN 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 + CONTROL "X闭环",IDC_CHECK_SO7_CONTROL_MODE_X,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,416,36,10 + CONTROL "Y闭环",IDC_CHECK_SO7_CONTROL_MODE_Y,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,429,36,10 + CONTROL "Z闭环",IDC_CHECK_SO7_CONTROL_MODE_Z,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,442,36,10 + GROUPBOX "控制模式",IDC_STATIC,16,404,55,51 END IDD_SO7_UTIL_AUTO_ZOOM DIALOGEX 0, 0, 426, 460 @@ -555,9 +559,9 @@ BEGIN 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,18,119,236,105 - GROUPBOX "Position",IDC_STATIC,18,227,480,36 + GROUPBOX "Position",IDC_STATIC,18,227,483,36 PUSHBUTTON "清零",IDC_BUTTON_ZERO_SET,396,241,56,13 - GROUPBOX "往返性能测试",IDC_STATIC,260,119,238,106 + GROUPBOX "往返性能测试",IDC_STATIC,260,119,240,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 @@ -585,17 +589,21 @@ BEGIN CONTROL "ErrPos",IDC_CHECK_SO7_MOVETO_FPGADATA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,458,243,34,10 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 "定位速度",IDC_STATIC,18,59,482,60 GROUPBOX "Log",IDC_STATIC,16,268,487,183 EDITTEXT IDC_EDIT_SO7_MOTION_START_CNTS,370,21,40,14,ES_AUTOHSCROLL EDITTEXT IDC_EDIT_SO7_MOTION_STOP_CNTS,370,40,40,14,ES_AUTOHSCROLL PUSHBUTTON "Set",IDC_BUTTON_SO7_MOTION_SET_CNTS,420,20,50,14 PUSHBUTTON "Get",IDC_BUTTON_SO7_MOTION_GET_CNTS,420,40,50,14 - GROUPBOX "Motion Cnts",IDC_STATIC,324,10,174,48 + GROUPBOX "Motion Cnts",IDC_STATIC,324,10,176,48 GROUPBOX "运动类型",IDC_STATIC,188,10,129,48 GROUPBOX "单位",IDC_STATIC,18,10,160,48 LTEXT "Start",IDC_STATIC,343,24,17,8 LTEXT "Stop",IDC_STATIC,343,41,16,8 + GROUPBOX "档位区段距离",IDC_STATIC,505,10,230,109 + CONTROL "",IDC_LIST_SO7_MOTION_SEGMENT_DIS,"SysListView32",LVS_REPORT | WS_BORDER | WS_TABSTOP,514,24,214,68 + PUSHBUTTON "设置参数",IDC_BUTTON_SO7_MOTION_SET_SEGMENT_DIS,609,98,50,14 + PUSHBUTTON "读取参数",IDC_BUTTON_SO7_MOTION_GET_SEGMENT_DIS,673,98,50,14 END IDD_SO7_UTIL_IMAGE_DLL DIALOGEX 0, 0, 377, 184 @@ -2531,8 +2539,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 8,0,0,0 - PRODUCTVERSION 8,0,0,0 + FILEVERSION 7,0,1,0 + PRODUCTVERSION 7,0,1,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -2549,12 +2557,12 @@ BEGIN BEGIN VALUE "CompanyName", "Hexagon Metrology" VALUE "FileDescription", "Utility for Hexagon Metrology" - VALUE "FileVersion", "8.0.0.0" + VALUE "FileVersion", "7.0.1.0" VALUE "InternalName", "Usb_Util.exe" VALUE "LegalCopyright", "Copyright 2014 Hexagon Metrology." VALUE "OriginalFilename", "Usb_Util.exe" VALUE "ProductName", "Utility" - VALUE "ProductVersion", "8.0.0.0" + VALUE "ProductVersion", "7.0.1.0" END END BLOCK "VarFileInfo" diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Automatic_Zoom.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Automatic_Zoom.cpp index dc9a251..39c5a69 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Automatic_Zoom.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Automatic_Zoom.cpp @@ -4,6 +4,7 @@ #include "stdafx.h" #include "afxdialogex.h" #include "resource.h" +#include "EditableListCtrl.h" #include "ProcessButton.h" #include "..\..\..\SevenOcean\SO7_Proto.h" #include "..\..\..\SevenOcean\CMMIO_SERIAL.H" 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 ee3a493..46848e8 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 @@ -5,11 +5,20 @@ #include "resource.h" #include "..\..\..\SevenOcean\SO7_Proto.h" #include "..\..\..\SevenOcean\CMMIO_SERIAL.H" +#include "EditableListCtrl.h" #include "ProcessButton.h" #include "SO7_UtilDlg.h" #include "SO7_VolComp.h" #include "SO7_Move_Location.h" +enum E_UPDATE_LIST_CONTROL_TYPE +{ + E_LISTCTRL_TITLE, + E_LISTCTRL_NO, + E_LISTCTRL_UPDATEDATA, + E_LISTCTRL_SAVEDATA, + E_LISTCTRL_TOTAL +}; #define RETRYNUM 3 // CSO7_Move_Location 对话框 extern CSO7_Proto* m_pSO7_Proto; @@ -48,6 +57,7 @@ void CSO7_Move_Location::DoDataExchange(CDataExchange* pDX) DDX_Text(pDX, IDC_EDIT_REPETEST_ERRORRANGE, m_RepeTest_ErrRange); DDX_Control(pDX, IDC_EDIT_REPRETEST, m_edit_RepeTest); + DDX_Control(pDX, IDC_LIST_SO7_MOTION_SEGMENT_DIS, m_ParaList); } @@ -86,6 +96,8 @@ BEGIN_MESSAGE_MAP(CSO7_Move_Location, CMFCPropertyPage) ON_BN_CLICKED(IDC_RADIO_SO7_MOVE_SPEED_GEAR5, &CSO7_Move_Location::OnBnClickedRadioSo7MoveSpeedGear5) ON_BN_CLICKED(IDC_BUTTON_SO7_MOTION_SET_CNTS, &CSO7_Move_Location::OnBnClickedButtonSo7MotionSetCnts) ON_BN_CLICKED(IDC_BUTTON_SO7_MOTION_GET_CNTS, &CSO7_Move_Location::OnBnClickedButtonSo7MotionGetCnts) + ON_BN_CLICKED(IDC_BUTTON_SO7_MOTION_SET_SEGMENT_DIS, &CSO7_Move_Location::OnBnClickedButtonSo7MotionSetSegmentDis) + ON_BN_CLICKED(IDC_BUTTON_SO7_MOTION_GET_SEGMENT_DIS, &CSO7_Move_Location::OnBnClickedButtonSo7MotionGetSegmentDis) END_MESSAGE_MAP() // CSO7_Move_Location 消息处理程序 @@ -157,6 +169,19 @@ BOOL CSO7_Move_Location::OnInitDialog() ((CEdit*)GetDlgItem(IDC_EDIT_SO7_MOTION_START_CNTS))->SetWindowTextW(_T("30")); ((CEdit*)GetDlgItem(IDC_EDIT_SO7_MOTION_STOP_CNTS))->SetWindowTextW(_T("5")); + m_UpdateListControl(E_LISTCTRL_TITLE); + m_UpdateListControl(E_LISTCTRL_NO); + if (m_pSO7_Proto->g_machine.FirmwareVerEnableWindow(FALSE); + GetDlgItem(IDC_BUTTON_SO7_MOTION_GET_CNTS)->EnableWindow(FALSE); + } + if (m_pSO7_Proto->g_machine.FirmwareVerEnableWindow(FALSE); + GetDlgItem(IDC_BUTTON_SO7_MOTION_GET_SEGMENT_DIS)->EnableWindow(FALSE); + } + UpdateData(FALSE); return TRUE; } @@ -2746,3 +2771,133 @@ void CSO7_Move_Location::OnBnClickedCheckSo7MovetoFpgadata() } +//===================================================================== +void CSO7_Move_Location::m_UpdateListControl(int _type) +{ + switch(_type) + { + case E_LISTCTRL_TITLE: + { + RECT m_rect; + m_ParaList.GetClientRect(&m_rect); //获取list的客户区 + m_ParaList.SetExtendedStyle(LVS_EX_GRIDLINES|LVS_EX_FULLROWSELECT); //设置list风格 + + m_ParaList.InsertColumn(0,_T("档位"),LVCFMT_LEFT, m_rect.right*1/7); + m_ParaList.InsertColumn(1,_T("X(mm)(小于)"),LVCFMT_LEFT, m_rect.right*2/7); + m_ParaList.InsertColumn(2,_T("Y(mm)(小于)"),LVCFMT_LEFT, m_rect.right*2/7); + m_ParaList.InsertColumn(3,_T("Z(mm)(小于)"),LVCFMT_LEFT, m_rect.right*2/7); + break; + } + case E_LISTCTRL_NO: + { + m_ParaListRows=0; + m_ParaList.InsertItem(m_ParaListRows++,_T("4")); + m_ParaList.InsertItem(m_ParaListRows++,_T("3")); + m_ParaList.InsertItem(m_ParaListRows++,_T("2")); + + m_ParaList.SetEditableItemRange(0,m_ParaListRows-1,1,3); + m_ParaList.SetColorStyleItemRange(0,m_ParaListRows-1,0,2); + break; + } + case E_LISTCTRL_UPDATEDATA: + { + int iRow=0; + int iCol=1; + CString cStr(""); + for (int iAxis=0;iAxis<3;iAxis++) + { + for (int iIndex=0;iIndex<3;iIndex++) + { + cStr.Format(_T("%.4f"),m_SegmentDis[iAxis][iIndex]); + m_ParaList.SetItemText(iRow,iCol,cStr); + iRow++; + } + iRow=0; + iCol++; + } + break; + } + case E_LISTCTRL_SAVEDATA: + { + UpdateData(TRUE); + USES_CONVERSION; + const char* cTemp; + CString cStr(""); + int iRow=0; + int iCol=1; + for (int iAxis=0;iAxis<3;iAxis++) + { + for (int iIndex=0;iIndex<3;iIndex++) + { + cStr=m_ParaList.GetItemText(iRow,iCol); + cTemp=T2A(cStr); + m_SegmentDis[iAxis][iIndex]=atof(cTemp); + iRow++; + } + iRow=0; + iCol++; + } + iRow++; + break; + } + default:break; + } +} + + +//===================================================================== +void CSO7_Move_Location::OnBnClickedButtonSo7MotionSetSegmentDis() +{ + m_UpdateListControl(E_LISTCTRL_SAVEDATA); + for (char iIndex=0;iIndex<3;iIndex++) + { + m_pSO7_Proto->g_machine.s_machine_config.x_axis._MotionSegmentDis[iIndex]= + m_pSO7_Proto->MMtoScale(m_SegmentDis[0][iIndex],m_pSO7_Proto->g_machine.s_machine_config.x_axis._scale_resolution); + m_pSO7_Proto->_send_cmd_SO7_CMD_SET_MOTION_SEGMENT_DIS(E_ACTIVE_AXIS_X,iIndex + ,m_pSO7_Proto->g_machine.s_machine_config.x_axis._MotionSegmentDis[iIndex]); + Sleep(20); + } + for (char iIndex=0;iIndex<3;iIndex++) + { + m_pSO7_Proto->g_machine.s_machine_config.y_axis._MotionSegmentDis[iIndex]= + m_pSO7_Proto->MMtoScale(m_SegmentDis[1][iIndex],m_pSO7_Proto->g_machine.s_machine_config.y_axis._scale_resolution); + m_pSO7_Proto->_send_cmd_SO7_CMD_SET_MOTION_SEGMENT_DIS(E_ACTIVE_AXIS_Y,iIndex + ,m_pSO7_Proto->g_machine.s_machine_config.y_axis._MotionSegmentDis[iIndex]); + Sleep(20); + } + for (char iIndex=0;iIndex<3;iIndex++) + { + m_pSO7_Proto->g_machine.s_machine_config.z_axis._MotionSegmentDis[iIndex]= + m_pSO7_Proto->MMtoScale(m_SegmentDis[2][iIndex],m_pSO7_Proto->g_machine.s_machine_config.z_axis._scale_resolution); + m_pSO7_Proto->_send_cmd_SO7_CMD_SET_MOTION_SEGMENT_DIS(E_ACTIVE_AXIS_Z,iIndex + ,m_pSO7_Proto->g_machine.s_machine_config.z_axis._MotionSegmentDis[iIndex]); + Sleep(20); + } +} + + +void CSO7_Move_Location::OnBnClickedButtonSo7MotionGetSegmentDis() +{ + for (char iIndex=0;iIndex<3;iIndex++) + { + m_pSO7_Proto->_send_cmd_SO7_CMD_GET_MOTION_SEGMENT_DIS(E_ACTIVE_AXIS_X,iIndex); + m_SegmentDis[0][iIndex]=m_pSO7_Proto->ScaleToMM(m_pSO7_Proto->g_machine.s_machine_config.x_axis._MotionSegmentDis[iIndex] + ,m_pSO7_Proto->g_machine.s_machine_config.x_axis._scale_resolution); + Sleep(20); + } + for (char iIndex=0;iIndex<3;iIndex++) + { + m_pSO7_Proto->_send_cmd_SO7_CMD_GET_MOTION_SEGMENT_DIS(E_ACTIVE_AXIS_Y,iIndex); + m_SegmentDis[1][iIndex]=m_pSO7_Proto->ScaleToMM(m_pSO7_Proto->g_machine.s_machine_config.y_axis._MotionSegmentDis[iIndex] + ,m_pSO7_Proto->g_machine.s_machine_config.y_axis._scale_resolution); + Sleep(20); + } + for (char iIndex=0;iIndex<3;iIndex++) + { + m_pSO7_Proto->_send_cmd_SO7_CMD_GET_MOTION_SEGMENT_DIS(E_ACTIVE_AXIS_Z,iIndex); + m_SegmentDis[2][iIndex]=m_pSO7_Proto->ScaleToMM(m_pSO7_Proto->g_machine.s_machine_config.z_axis._MotionSegmentDis[iIndex] + ,m_pSO7_Proto->g_machine.s_machine_config.z_axis._scale_resolution); + Sleep(20); + } + m_UpdateListControl(E_LISTCTRL_UPDATEDATA); +} diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Move_Location.h b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Move_Location.h index 71d9877..baab1e5 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Move_Location.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Move_Location.h @@ -19,6 +19,11 @@ protected: virtual BOOL OnSetActive(); virtual BOOL OnKillActive(); DECLARE_MESSAGE_MAP() +private: + CEditableListCtrl m_ParaList; + int m_ParaListRows; + void m_UpdateListControl(int _type); + double m_SegmentDis[3][3]; public: double m_move_to_x; double m_move_to_y; @@ -111,4 +116,6 @@ public: afx_msg void OnBnClickedRadioSo7MoveSpeedGear5(); afx_msg void OnBnClickedButtonSo7MotionSetCnts(); afx_msg void OnBnClickedButtonSo7MotionGetCnts(); + afx_msg void OnBnClickedButtonSo7MotionSetSegmentDis(); + afx_msg void OnBnClickedButtonSo7MotionGetSegmentDis(); }; 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 be3a821..60645dc 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 @@ -232,7 +232,12 @@ BOOL CSO7_Send_Parameter::OnInitDialog() ((CStatic *)GetDlgItem(IDC_STATIC_SPEED_PARA4))->SetWindowTextW(_T("刷新周期")); ((CStatic *)GetDlgItem(IDC_STATIC_SPEED_PARA5))->SetWindowTextW(_T("减速距离")); } - + if (m_pSO7_Proto->g_machine.FirmwareVerEnableWindow(FALSE); + GetDlgItem(IDC_CHECK_SO7_CONTROL_MODE_Y)->EnableWindow(FALSE); + GetDlgItem(IDC_CHECK_SO7_CONTROL_MODE_Z)->EnableWindow(FALSE); + } return TRUE; // return TRUE unless you set the focus to a control } @@ -318,6 +323,7 @@ void CSO7_Send_Parameter::OnBnClickedButtonBrowse() //================================================================ void CSO7_Send_Parameter::OnBnClickedButtonSaveParameter() { + UpdateControlMode(1); ChangeParameterOnEdit(); m_pSO7_Proto->_send_cmd_SO7_CMD_SET_SPEED_PARAMETER(0,0); Sleep(PAUSE_TIME_CHANGE_PARAMETER); @@ -402,7 +408,8 @@ void CSO7_Send_Parameter::OnBnClickedButtonSave() //================================================================ void CSO7_Send_Parameter::OnBnClickedButtonReadParameterFromController() { - // TODO: Add your control notification handler code here + UpdateControlMode(0); + ChangeParameterOnEdit(); m_pSO7_Proto->_send_cmd_SO7_CMD_READ_SPEED_PARAMETER( 0, 0); @@ -1036,4 +1043,70 @@ void CSO7_Send_Parameter::OnBnClickedCancel() m_pSO7_Proto->Save_SevenOcean_Inifile(csPath+_T("\\Utility_Config.ini")); CMFCPropertyPage::OnCancel(); } - +//===================================================================================== +void CSO7_Send_Parameter::UpdateControlMode(int _Type) +{ + if (m_pSO7_Proto->g_machine.FirmwareVer>=FirmwareVer_7_9) + { + if (_Type==1) + { + if (((CButton *)GetDlgItem(IDC_CHECK_SO7_CONTROL_MODE_X))->GetCheck()) + { + m_pSO7_Proto->_send_cmd_SO7_CMD_SET_CONTROL_MODE(E_AXIS_X,0); + } + else + { + m_pSO7_Proto->_send_cmd_SO7_CMD_SET_CONTROL_MODE(E_AXIS_X,1); + } + Sleep(20); + if (((CButton *)GetDlgItem(IDC_CHECK_SO7_CONTROL_MODE_Y))->GetCheck()) + { + m_pSO7_Proto->_send_cmd_SO7_CMD_SET_CONTROL_MODE(E_AXIS_Y,0); + } + else + { + m_pSO7_Proto->_send_cmd_SO7_CMD_SET_CONTROL_MODE(E_AXIS_Y,1); + } + Sleep(20); + if (((CButton *)GetDlgItem(IDC_CHECK_SO7_CONTROL_MODE_Z))->GetCheck()) + { + m_pSO7_Proto->_send_cmd_SO7_CMD_SET_CONTROL_MODE(E_AXIS_Z,0); + } + else + { + m_pSO7_Proto->_send_cmd_SO7_CMD_SET_CONTROL_MODE(E_AXIS_Z,1); + } + Sleep(20); + } + else + { + m_pSO7_Proto->_send_cmd_SO7_CMD_GET_CONTROL_MODE(E_AXIS_X); + if (m_pSO7_Proto->g_machine.FPGAData==1) + { + ((CButton *)GetDlgItem(IDC_CHECK_SO7_CONTROL_MODE_X))->SetCheck(FALSE); + } + else + { + ((CButton *)GetDlgItem(IDC_CHECK_SO7_CONTROL_MODE_X))->SetCheck(TRUE); + } + m_pSO7_Proto->_send_cmd_SO7_CMD_GET_CONTROL_MODE(E_AXIS_Y); + if (m_pSO7_Proto->g_machine.FPGAData==1) + { + ((CButton *)GetDlgItem(IDC_CHECK_SO7_CONTROL_MODE_Y))->SetCheck(FALSE); + } + else + { + ((CButton *)GetDlgItem(IDC_CHECK_SO7_CONTROL_MODE_Y))->SetCheck(TRUE); + } + m_pSO7_Proto->_send_cmd_SO7_CMD_GET_CONTROL_MODE(E_AXIS_Z); + if (m_pSO7_Proto->g_machine.FPGAData==1) + { + ((CButton *)GetDlgItem(IDC_CHECK_SO7_CONTROL_MODE_Z))->SetCheck(FALSE); + } + else + { + ((CButton *)GetDlgItem(IDC_CHECK_SO7_CONTROL_MODE_Z))->SetCheck(TRUE); + } + } + } +} 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 d775118..c025c28 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 @@ -87,6 +87,7 @@ public: void ShowParameterOnEdit(); void ChangeParameterOnEdit(); + void UpdateControlMode(int _Type); afx_msg void OnBnClickedOk(); afx_msg void OnBnClickedButtonBrowse(); 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 6d4d0a1..13f7af4 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 @@ -7,6 +7,7 @@ #include "..\..\..\SevenOcean\SO7_Proto.h" #include "..\..\..\SevenOcean\CAutoZoom.h" #include "ProcessButton.h" +#include "EditableListCtrl.h" #include "DrawGraph.h" #include "SO7_Send_Parameter.h" #include "SO7_Automatic_Zoom.h" @@ -18,7 +19,6 @@ #include "So7_Util_Program.h" #include "So7_Motion_Pages.h" #include "ListCtrlItemEdit.h" -#include "EditableListCtrl.h" #include "SetSo7MotionConfig.h" #include "So7_Config_Pages.h" #include "So7_XBoxController.h" 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 4998331..543e9e4 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 @@ -6,6 +6,7 @@ #include "..\..\..\SevenOcean\SO7_Proto.h" #include "..\..\..\SevenOcean\CMMIO_SERIAL.H" #include "DrawGraph.h" +#include "EditableListCtrl.h" #include "ProcessButton.h" #include "SO7_UtilDlg.h" #include "SO7_Send_Parameter.h" diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Util_External_Trig.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Util_External_Trig.cpp index 6e15ba0..bb7d117 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Util_External_Trig.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Util_External_Trig.cpp @@ -10,6 +10,13 @@ extern CSO7_Proto* m_pSO7_Proto; +enum E_UPDATE_LIST_CONTROL_TYPE +{ + E_LISTCTRL_TITLE, + E_LISTCTRL_NO, + E_LISTCTRL_CONTENT, + E_LISTCTRL_TOTAL +}; // CSo7_Util_External_Trig dialog IMPLEMENT_DYNAMIC(CSo7_Util_External_Trig, CDialog) diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Util_External_Trig.h b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Util_External_Trig.h index 7958ba6..74261aa 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Util_External_Trig.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Util_External_Trig.h @@ -2,13 +2,6 @@ // CSo7_Util_External_Trig dialog -enum E_UPDATE_LIST_CONTROL_TYPE -{ - E_LISTCTRL_TITLE, - E_LISTCTRL_NO, - E_LISTCTRL_CONTENT, - E_LISTCTRL_TOTAL -}; class CSo7_Util_External_Trig : public CDialog { DECLARE_DYNAMIC(CSo7_Util_External_Trig) 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 0578037..95ddfe9 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h @@ -493,6 +493,7 @@ #define IDC_CHECK_TEST_KEYENCE_LK_G_PROGRAM1 1394 #define IDC_CHECK_SO7_OUT_PORT 1394 #define IDC_CHECK_LKG5000_CONTINUE_READ2 1394 +#define IDC_CHECK_SO7_CONTROL_MODE_X 1394 #define IDC_BUTTON_MANUAL_HOME 1395 #define IDC_CHECK_TEST_KEYENCE_LK_G_PROGRAM2 1395 #define IDC_CHECK_ 1396 @@ -938,6 +939,7 @@ #define IDC_CHECK3 1819 #define IDC_CHECK_SO7_MOTION_AUTO_SET_ZERO 1819 #define IDC_CHECK_SO7_TOP_LIGHT_ON 1819 +#define IDC_CHECK_SO7_CONTROL_MODE_Y 1819 #define IDC_LIST_SO7_MOTION_CONFIG 1820 #define IDC_CHECK_SO7_BOTTOM_LIGHT_ON 1820 #define IDC_CHECK_SO7_TOP_LIGHT_ON2 1820 @@ -1003,8 +1005,10 @@ #define IDC_BUTTON_SO7_TRIGPULSE_WRITE_PARA 1854 #define IDC_BUTTON5 1855 #define IDC_BUTTON_SO7_TRIGPULSE_READ_PARA 1855 +#define IDC_BUTTON_SO7_MOTION_GET_SEGMENT_DIS 1855 #define IDC_BUTTON4 1856 #define IDC_BUTTON_SET_SCALE_COEFFICIENT 1856 +#define IDC_BUTTON_SO7_MOTION_SET_SEGMENT_DIS 1856 #define IDC_BUTTON_STIL_GET_DATA 1857 #define IDC_EDIT_STIL_INTERVAL 1858 #define IDC_CHECK_STIL_CONTINUE_GET_DATA 1859 @@ -1022,9 +1026,11 @@ #define IDC_EDIT_SO7_EXTRIG_TEST_TIMES 1872 #define IDC_EDIT_SO7_MOTION_STOP_CNTS 1873 #define IDC_EDIT_SO7_MOTION_START_CNTS 1874 -#define IDC_EDIT2 1875 #define IDC_EDIT_ART_PCI8622_LAST_CHANNEL 1875 #define IDC_EDIT_ART_PCI8622_FIRST_CHANNEL 1876 +#define IDC_LIST_SO7_MOTION_SEGMENT_DIS 1877 +#define IDC_CHECK4 1878 +#define IDC_CHECK_SO7_CONTROL_MODE_Z 1878 #define IDC_BUTTON_DIY_EXIT_BUTTON 32740 #define ID_EDIT_SO7_CONFIG_MOTION 32741 @@ -1034,7 +1040,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 193 #define _APS_NEXT_COMMAND_VALUE 32771 -#define _APS_NEXT_CONTROL_VALUE 1877 +#define _APS_NEXT_CONTROL_VALUE 1879 #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 22f31e3c57a6c5d98a4d9b9acbb6fd92f543185d..36831e28270f1d562e66823baef1a528dc671bde 100644 GIT binary patch delta 3690 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 W-JhrU(nLinnIJn@YJHN%(SHDoSE6|U