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

完善速度档位的调试。

Browse Source
This commit is contained in:
TAO Cheng
2014-03-05 12:13:35 +08:00
parent 2b6d50bd6d
commit b250cb5920
10 changed files with 264 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp
+34 -17
View File
@@ -468,6 +468,9 @@ CSO7_Proto::CSO7_Proto()
g_machine.x._Move_Speed_Gear =2; g_machine.x._Move_Speed_Gear =2;
g_machine.y._Move_Speed_Gear =2; g_machine.y._Move_Speed_Gear =2;
g_machine.z._Move_Speed_Gear =2; g_machine.z._Move_Speed_Gear =2;
g_machine.x._MoveTo_Speed_Gear =0;
g_machine.y._MoveTo_Speed_Gear =0;
g_machine.z._MoveTo_Speed_Gear =0;
g_machine.zm._Move_Speed_Gear =2; g_machine.zm._Move_Speed_Gear =2;
g_machine.x._pos_fixed._long_ =0; g_machine.x._pos_fixed._long_ =0;
g_machine.y._pos_fixed._long_ =0; g_machine.y._pos_fixed._long_ =0;
@@ -3693,7 +3696,9 @@ SSI_STATUS_MOTION CSO7_Proto::_send_cmd_SO7_CMD_MOVE_TO_POS_XYZ(char ProbeType)
pSO7_CMD_02->s_SO7_CMD_MOVE_TO_XYZ.data[7]=(g_machine.z._pos_fixed._char_[1]); pSO7_CMD_02->s_SO7_CMD_MOVE_TO_XYZ.data[7]=(g_machine.z._pos_fixed._char_[1]);
pSO7_CMD_02->s_SO7_CMD_MOVE_TO_XYZ.data[8]=(g_machine.z._pos_fixed._char_[0]); pSO7_CMD_02->s_SO7_CMD_MOVE_TO_XYZ.data[8]=(g_machine.z._pos_fixed._char_[0]);
} }
pSO7_CMD_02->s_SO7_CMD_MOVE_TO_XYZ.data[9]=(g_machine.x._MoveTo_Speed_Gear);
pSO7_CMD_02->s_SO7_CMD_MOVE_TO_XYZ.data[10]=(g_machine.y._MoveTo_Speed_Gear);
pSO7_CMD_02->s_SO7_CMD_MOVE_TO_XYZ.data[11]=(g_machine.z._MoveTo_Speed_Gear);
ep_buff[EP_02_CMD_IDX]._size = 0x0E; ep_buff[EP_02_CMD_IDX]._size = 0x0E;
ep_buff[EP_82_DATA_IDX]._size = 0x45; ep_buff[EP_82_DATA_IDX]._size = 0x45;
@@ -4092,8 +4097,30 @@ SSI_STATUS_MOTION CSO7_Proto::_send_cmd_SO7_CMD_SET_CONSTANT_SPEED(int iSpeed,ch
WaitForSingleObject(g_hEP02_Serial_Mutex, INFINITE); WaitForSingleObject(g_hEP02_Serial_Mutex, INFINITE);
memset(ep_buff[EP_02_CMD_IDX]._buffer, 0x00, MAX_BUFF_SIZE); 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) = CT_MOTOR;
int iDeceDistance = 0; int iDeceDistance(0);
char _speed_base(0);
char _speed_fresh(0);
char _speed_start(0);
char _speed_max(0);
if (g_machine.FirmwareVer==FirmwareVer_6_X)
{
iDeceDistance = iSpeed;
}
else
{
if (iSpeed>255)
{
BYTE MaxSpeed(255);
_speed_start=static_cast<char>((iSpeed%256)+1);
_speed_max=static_cast<char>(MaxSpeed);
}
else
{
_speed_start= static_cast<char>(iSpeed);
*(ep_buff[EP_02_CMD_IDX]._buffer+6) = 0;
}
iDeceDistance =0;
}
if(axis_type == 0) if(axis_type == 0)
*(ep_buff[EP_02_CMD_IDX]._buffer+1) = CT_SET_SPEEDX; *(ep_buff[EP_02_CMD_IDX]._buffer+1) = CT_SET_SPEEDX;
else if(axis_type == 1) else if(axis_type == 1)
@@ -4102,20 +4129,10 @@ SSI_STATUS_MOTION CSO7_Proto::_send_cmd_SO7_CMD_SET_CONSTANT_SPEED(int iSpeed,ch
*(ep_buff[EP_02_CMD_IDX]._buffer+1) = CT_SET_SPEEDZ; *(ep_buff[EP_02_CMD_IDX]._buffer+1) = CT_SET_SPEEDZ;
*(ep_buff[EP_02_CMD_IDX]._buffer+2) = xyz_gear+1; *(ep_buff[EP_02_CMD_IDX]._buffer+2) = xyz_gear+1;
*(ep_buff[EP_02_CMD_IDX]._buffer+3) = 0; *(ep_buff[EP_02_CMD_IDX]._buffer+3) = _speed_base;
*(ep_buff[EP_02_CMD_IDX]._buffer+4) = 0; *(ep_buff[EP_02_CMD_IDX]._buffer+4) = _speed_fresh;
if (iSpeed>255) *(ep_buff[EP_02_CMD_IDX]._buffer+5) = _speed_start;
{ *(ep_buff[EP_02_CMD_IDX]._buffer+6) = _speed_max;
BYTE MaxSpeed(255);
*(ep_buff[EP_02_CMD_IDX]._buffer+5) = static_cast<char>((iSpeed%256)+1);
*(ep_buff[EP_02_CMD_IDX]._buffer+6) = static_cast<char>(MaxSpeed);
}
else
{
*(ep_buff[EP_02_CMD_IDX]._buffer+5) = static_cast<char>(iSpeed);
*(ep_buff[EP_02_CMD_IDX]._buffer+6) = 0;
}
iDeceDistance =0;
char cBuffer; char cBuffer;
cBuffer =static_cast<char>(iDeceDistance/1000); cBuffer =static_cast<char>(iDeceDistance/1000);
*(ep_buff[EP_02_CMD_IDX]._buffer+7) =cBuffer; *(ep_buff[EP_02_CMD_IDX]._buffer+7) =cBuffer;
PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h
+1 -1
View File
@@ -85,6 +85,7 @@ enum EFirmwareVer
typedef struct s_so7_axis // axis parameters typedef struct s_so7_axis // axis parameters
{ {
char _Move_Speed_Gear; char _Move_Speed_Gear;
char _MoveTo_Speed_Gear;
union union
{ {
long _long_; long _long_;
@@ -109,7 +110,6 @@ struct s_so7_axis_config // axis configuration
{ {
double _motor_precision;//set precision double _motor_precision;//set precision
double _motor_wheelbase;//set wheelbase double _motor_wheelbase;//set wheelbase
char _speed_base[5]; char _speed_base[5];
char _speed_fresh[5]; char _speed_fresh[5];
char _speed_start[5]; char _speed_start[5];
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log
+20
View File
@@ -3722,3 +3722,23 @@ Init:Open device succeed .
_start_machine _start_machine
Exit: Exit_SO7Usb Exit: Exit_SO7Usb
Destruct Cso7_Proto. 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.
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc
+93 -84
View File
@@ -120,7 +120,7 @@ BEGIN
LTEXT "ms",IDC_STATIC_SEC,214,386,16,9 LTEXT "ms",IDC_STATIC_SEC,214,386,16,9
EDITTEXT IDC_EDIT_UPDATE_FREQ,185,384,25,13,ES_AUTOHSCROLL | ES_READONLY EDITTEXT IDC_EDIT_UPDATE_FREQ,185,384,25,13,ES_AUTOHSCROLL | ES_READONLY
GROUPBOX "ReadOut",IDC_STATIC,17,266,224,136 GROUPBOX "ReadOut",IDC_STATIC,17,266,224,136
GROUPBOX "MOVE XYZV",IDC_STATIC,17,180,282,84 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_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 EDITTEXT IDC_EDIT_Y_POSITION_59,176,338,54,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP
EDITTEXT IDC_EDIT_Z_POSITION_59,176,351,54,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP EDITTEXT IDC_EDIT_Z_POSITION_59,176,351,54,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP
@@ -171,7 +171,7 @@ BEGIN
LTEXT "----------------------------------------------------",IDC_STATIC,305,170,140,8 LTEXT "----------------------------------------------------",IDC_STATIC,305,170,140,8
END END
IDD_SO7_UTIL_SEND_PARAMETER DIALOGEX 0, 0, 753, 481 IDD_SO7_UTIL_SEND_PARAMETER DIALOGEX 0, 0, 750, 480
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Set Parameter" CAPTION "Set Parameter"
FONT 8, "MS Shell Dlg", 400, 0, 0x1 FONT 8, "MS Shell Dlg", 400, 0, 0x1
@@ -397,19 +397,20 @@ BEGIN
CONTROL "SV4000E视频卡",IDC_RADIO_VIDEOCARD_SV4000E,"Button",BS_AUTORADIOBUTTON,39,73,68,10 CONTROL "SV4000E视频卡",IDC_RADIO_VIDEOCARD_SV4000E,"Button",BS_AUTORADIOBUTTON,39,73,68,10
CONTROL "TC4000视频卡",IDC_RADIO_VIDEOCARD_TC4000,"Button",BS_AUTORADIOBUTTON,39,90,69,10 CONTROL "TC4000视频卡",IDC_RADIO_VIDEOCARD_TC4000,"Button",BS_AUTORADIOBUTTON,39,90,69,10
CONTROL "IP Camera",IDC_RADIO_SO7_IP_CAMERA,"Button",BS_AUTORADIOBUTTON,39,107,62,10 CONTROL "IP Camera",IDC_RADIO_SO7_IP_CAMERA,"Button",BS_AUTORADIOBUTTON,39,107,62,10
CONTROL "USB Camera",IDC_RADIO_SO7_USB_CAMERA,"Button",BS_AUTORADIOBUTTON,39,124,62,10
CONTROL "控制器（USB）",IDC_RADIO_CONTROLLER,"Button",BS_AUTORADIOBUTTON,166,39,69,10 CONTROL "控制器（USB）",IDC_RADIO_CONTROLLER,"Button",BS_AUTORADIOBUTTON,166,39,69,10
CONTROL "控制器（RS232）",IDC_RADIO__SO7_RS232,"Button",BS_AUTORADIOBUTTON,166,56,77,10 CONTROL "控制器（RS232）",IDC_RADIO__SO7_RS232,"Button",BS_AUTORADIOBUTTON,166,56,77,10
CONTROL "LK_G激光",IDC_RADIO_KEYENCE_LASER,"Button",BS_AUTORADIOBUTTON,166,73,76,10 CONTROL "LK_G激光",IDC_RADIO_KEYENCE_LASER,"Button",BS_AUTORADIOBUTTON,166,73,76,10
CONTROL "LK_H激光(USB)",IDC_RADIO_KEYENCE_LASER_LK_H,"Button",BS_AUTORADIOBUTTON,166,90,76,10 CONTROL "LK_H激光(USB)",IDC_RADIO_KEYENCE_LASER_LK_H,"Button",BS_AUTORADIOBUTTON,166,90,76,10
CONTROL "LK_H¼¤¹â(ETHERNET)",IDC_RADIO_KEYENCE_LASER_LKH_ETHERNET,
"Button",BS_AUTORADIOBUTTON,166,107,85,10
CONTROL "LJ_G激光",IDC_RADIO_KEYENCE_LASER3,"Button",BS_AUTORADIOBUTTON,166,124,76,10 CONTROL "LJ_G激光",IDC_RADIO_KEYENCE_LASER3,"Button",BS_AUTORADIOBUTTON,166,124,76,10
CONTROL "Verifcation algorithm",IDC_RADIO_SO7_VERIFICATION_ALGORITHM, CONTROL "Verifcation algorithm",IDC_RADIO_SO7_VERIFICATION_ALGORITHM,
"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE,39,124,81,10 "Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE,39,141,81,10
CONTROL "Image.dll",IDC_RADIO_TEST_IMAGE_DLL,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE,39,141,45,10 CONTROL "Image.dll",IDC_RADIO_TEST_IMAGE_DLL,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE,166,141,45,10
DEFPUSHBUTTON "OK",IDOK,163,177,50,14 DEFPUSHBUTTON "OK",IDOK,163,177,50,14
PUSHBUTTON "Cancel",IDCANCEL,221,177,50,14 PUSHBUTTON "Cancel",IDCANCEL,221,177,50,14
GROUPBOX "测试选项",IDC_STATIC,20,15,242,146 GROUPBOX "测试选项",IDC_STATIC,20,15,242,146
CONTROL "LK_H¼¤¹â(ETHERNET)",IDC_RADIO_KEYENCE_LASER_LKH_ETHERNET,
"Button",BS_AUTORADIOBUTTON,166,107,85,10
END END
IDD_SO7_VIDEOCARD_SDK3000 DIALOGEX 0, 0, 488, 316 IDD_SO7_VIDEOCARD_SDK3000 DIALOGEX 0, 0, 488, 316
@@ -497,82 +498,90 @@ BEGIN
LTEXT "电机驱动器细分数",IDC_STATIC,134,124,65,8 LTEXT "电机驱动器细分数",IDC_STATIC,134,124,65,8
END END
IDD_SO7_UTIL_MOVE_LOCATION DIALOGEX 0, 0, 511, 354 IDD_SO7_UTIL_MOVE_LOCATION DIALOGEX 0, 0, 750, 480
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Move To Location" CAPTION "Move To Location"
FONT 8, "MS Shell Dlg", 400, 0, 0x1 FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN BEGIN
CONTROL "System",IDC_RADIO_SPEED_SYSTEM,"Button",BS_AUTORADIOBUTTON | WS_GROUP,179,20,39,10 CONTROL "Default",IDC_RADIO_SPEED_SYSTEM,"Button",BS_AUTORADIOBUTTON | WS_GROUP,36,80,39,10
CONTROL "Fast",IDC_RADIO_SPEED_FAST,"Button",BS_AUTORADIOBUTTON,179,31,30,10 CONTROL "Gear1",IDC_RADIO_SO7_MOVE_SPEED_GEAR1,"Button",BS_AUTORADIOBUTTON,85,80,35,10
CONTROL "Slow",IDC_RADIO_SPEED_SLOW,"Button",BS_AUTORADIOBUTTON,179,42,31,10 CONTROL "Gear2",IDC_RADIO_SO7_MOVE_SPEED_GEAR2,"Button",BS_AUTORADIOBUTTON,134,80,35,10
EDITTEXT IDC_EDIT_MOVE_TO_X,41,78,53,12,ES_AUTOHSCROLL CONTROL "Gear3",IDC_RADIO_SO7_MOVE_SPEED_GEAR3,"Button",BS_AUTORADIOBUTTON,36,94,35,10
EDITTEXT IDC_EDIT_MOVE_TO_Y,41,101,53,12,ES_AUTOHSCROLL CONTROL "Gear4",IDC_RADIO_SO7_MOVE_SPEED_GEAR4,"Button",BS_AUTORADIOBUTTON,85,94,35,10
EDITTEXT IDC_EDIT_MOVE_TO_Z,41,124,53,12,ES_AUTOHSCROLL CONTROL "Gear5",IDC_RADIO_SO7_MOVE_SPEED_GEAR5,"Button",BS_AUTORADIOBUTTON,134,94,35,10
EDITTEXT IDC_EDIT_MOVE_TO_ZM,41,147,53,12,ES_AUTOHSCROLL CONTROL "Fast",IDC_RADIO_SPEED_FAST,"Button",BS_AUTORADIOBUTTON,198,80,30,10
CONTROL "Reverse",IDC_CHECK_REVERSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,105,91,43,10 CONTROL "Slow",IDC_RADIO_SPEED_SLOW,"Button",BS_AUTORADIOBUTTON,198,94,31,10
PUSHBUTTON "Move To XYZ",IDC_BUTTON_MOVE_TO_XYZ,103,107,71,24,BS_MULTILINE CONTROL "inch",IDC_RADIO_INCH,"Button",BS_AUTORADIOBUTTON | WS_GROUP,30,31,29,10
PUSHBUTTON "Move To Zoom",IDC_BUTTON_MOVE_TO_ZOOM,103,136,71,24 CONTROL "mm",IDC_RADIO_MM,"Button",BS_AUTORADIOBUTTON,83,31,27,10
PUSHBUTTON "Move To XYZ(JM)",IDC_BUTTON_MOVE_TO_XYZ_JM,180,78,71,24,BS_MULTILINE CONTROL "pulse",IDC_RADIO_SCALE,"Button",BS_AUTORADIOBUTTON,134,31,33,10
PUSHBUTTON "Move To XYZ (Laser)",IDC_BUTTON_MOVE_TO_XYZ_LASER,180,107,70,24,BS_MULTILINE CONTROL "Relative",IDC_RADIO_MOVE_RELATIVE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,205,31,42,10
PUSHBUTTON "Move To XYZV",IDC_BUTTON_MOVE_TO_XYZV,180,136,71,24 CONTROL "Absolute",IDC_RADIO_MOVE_ABSOLUTE,"Button",BS_AUTORADIOBUTTON,265,31,44,10
EDITTEXT IDC_EDIT_REPETEST_DIS,366,78,57,12,ES_AUTOHSCROLL EDITTEXT IDC_EDIT_MOVE_TO_X,40,134,53,12,ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_REPETEST_TIMES,366,102,57,12,ES_AUTOHSCROLL EDITTEXT IDC_EDIT_MOVE_TO_Y,40,157,53,12,ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_REPETEST_INTERVAL,366,126,45,12,ES_RIGHT | ES_AUTOHSCROLL EDITTEXT IDC_EDIT_MOVE_TO_Z,40,180,53,12,ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_REPETEST_ERRORRANGE,366,150,45,12,ES_RIGHT | ES_AUTOHSCROLL EDITTEXT IDC_EDIT_MOVE_TO_ZM,40,203,53,12,ES_AUTOHSCROLL
PUSHBUTTON "Begin",IDC_BUTTON_BEGIN_REPE_TEST,436,103,56,13 CONTROL "Reverse",IDC_CHECK_REVERSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,104,147,43,10
PUSHBUTTON "Save...",IDC_BUTTON_SAVE_REPETEST,436,130,56,13 PUSHBUTTON "Move To XYZ",IDC_BUTTON_MOVE_TO_XYZ,102,163,71,24,BS_MULTILINE
GROUPBOX "System",IDC_STATIC,22,9,64,46 PUSHBUTTON "Move To Zoom",IDC_BUTTON_MOVE_TO_ZOOM,102,192,71,24
CONTROL "inch",IDC_RADIO_INCH,"Button",BS_AUTORADIOBUTTON | WS_GROUP,36,20,29,10 PUSHBUTTON "Move To XYZ(JM)",IDC_BUTTON_MOVE_TO_XYZ_JM,179,134,71,24,BS_MULTILINE
CONTROL "mm",IDC_RADIO_MM,"Button",BS_AUTORADIOBUTTON,36,30,27,10 PUSHBUTTON "Move To XYZ (Laser)",IDC_BUTTON_MOVE_TO_XYZ_LASER,179,163,70,24,BS_MULTILINE
CONTROL "pulse",IDC_RADIO_SCALE,"Button",BS_AUTORADIOBUTTON,36,40,33,10 PUSHBUTTON "Move To XYZV",IDC_BUTTON_MOVE_TO_XYZV,179,192,71,24
GROUPBOX "Move Type",IDC_STATIC,93,10,68,45 EDITTEXT IDC_EDIT_REPETEST_DIS,365,134,57,12,ES_AUTOHSCROLL
CONTROL "Relative",IDC_RADIO_MOVE_RELATIVE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,107,22,42,10 EDITTEXT IDC_EDIT_REPETEST_TIMES,365,158,57,12,ES_AUTOHSCROLL
CONTROL "Absolute",IDC_RADIO_MOVE_ABSOLUTE,"Button",BS_AUTORADIOBUTTON,107,38,44,10 EDITTEXT IDC_EDIT_REPETEST_INTERVAL,365,182,45,12,ES_RIGHT | ES_AUTOHSCROLL
GROUPBOX "Move Speed",IDC_STATIC,168,9,330,46 EDITTEXT IDC_EDIT_REPETEST_ERRORRANGE,365,206,45,12,ES_RIGHT | ES_AUTOHSCROLL
PUSHBUTTON "EXIT",IDCANCEL,454,333,50,14,NOT WS_VISIBLE PUSHBUTTON "Begin",IDC_BUTTON_BEGIN_REPE_TEST,435,159,56,13
LTEXT "x",IDC_STATIC,29,78,8,8 PUSHBUTTON "Save...",IDC_BUTTON_SAVE_REPETEST,435,186,56,13
LTEXT "y",IDC_STATIC,29,101,8,8 GROUPBOX "Unit",IDC_STATIC,18,15,160,38
LTEXT "z",IDC_STATIC,29,124,8,8 GROUPBOX "Motion Type",IDC_STATIC,188,15,129,38
LTEXT "zm",IDC_STATIC,25,147,8,8 GROUPBOX "Constant Speed",IDC_STATIC,187,68,305,41
LTEXT "x",IDC_STATIC,39,188,8,11 PUSHBUTTON "EXIT",IDCANCEL,697,449,50,14,NOT WS_VISIBLE
LTEXT "y",IDC_STATIC,131,188,8,11 LTEXT "x",IDC_STATIC,28,134,8,8
LTEXT "z",IDC_STATIC,221,188,8,11 LTEXT "y",IDC_STATIC,28,157,8,8
LTEXT "zm",IDC_STATIC,310,188,11,11 LTEXT "z",IDC_STATIC,28,180,8,8
EDITTEXT IDC_EDIT_X_AXIS,52,187,54,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP LTEXT "zm",IDC_STATIC,24,203,8,8
EDITTEXT IDC_EDIT_Y_AXIS,143,187,54,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP LTEXT "x",IDC_STATIC,38,244,8,11
EDITTEXT IDC_EDIT_Z_AXIS,234,187,54,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP LTEXT "y",IDC_STATIC,130,244,8,11
EDITTEXT IDC_EDIT_ZM_AXIS,325,187,54,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP LTEXT "z",IDC_STATIC,220,244,8,11
GROUPBOX "Move To Position",IDC_STATIC,20,63,236,105 LTEXT "zm",IDC_STATIC,309,244,11,11
GROUPBOX "Position",IDC_STATIC,20,171,480,36 EDITTEXT IDC_EDIT_X_AXIS,51,243,54,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP
PUSHBUTTON "Zero Set",IDC_BUTTON_ZERO_SET,397,185,56,13 EDITTEXT IDC_EDIT_Y_AXIS,142,243,54,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP
GROUPBOX "Repeatability Test",IDC_STATIC,261,63,238,106 EDITTEXT IDC_EDIT_Z_AXIS,233,243,54,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP
LTEXT "To",IDC_STATIC,344,79,8,8 EDITTEXT IDC_EDIT_ZM_AXIS,324,243,54,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP
LTEXT "Times",IDC_STATIC,339,105,19,8 GROUPBOX "Move To Position",IDC_STATIC,19,119,236,105
EDITTEXT IDC_EDIT_REPRETEST,19,216,429,115,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL GROUPBOX "Position",IDC_STATIC,19,227,480,36
CONTROL "x",IDC_CHECK_REPETESTX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,279,79,20,10 PUSHBUTTON "Set Zero",IDC_BUTTON_ZERO_SET,396,241,56,13
CONTROL "y",IDC_CHECK_REPETESTY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,279,92,20,10 GROUPBOX "Repeatability Test",IDC_STATIC,260,119,238,106
CONTROL "z",IDC_CHECK_REPETESTZ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,279,106,20,10 LTEXT "To",IDC_STATIC,343,135,8,8
LTEXT "Pause",IDC_STATIC,337,127,20,8 LTEXT "Times",IDC_STATIC,338,161,19,8
LTEXT "ms",IDC_STATIC,414,127,10,8 EDITTEXT IDC_EDIT_REPRETEST,21,280,429,166,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL
CONTROL "Absolute",IDC_CHECK_REPETEST_ABSOLUTE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,279,151,44,10 CONTROL "x",IDC_CHECK_REPETESTX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,278,135,20,10
LTEXT "Deadband",IDC_STATIC,328,151,34,8 CONTROL "y",IDC_CHECK_REPETESTY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,278,148,20,10
LTEXT "um",IDC_STATIC_DEADBAND_UNITS,414,151,19,8 CONTROL "z",IDC_CHECK_REPETESTZ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,278,162,20,10
CONTROL "VolComp",IDC_CHECK_REPETEST_VOLCOMP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,279,137,43,10 LTEXT "Pause",IDC_STATIC,336,183,20,8
CONTROL "V",IDC_CHECK_REPETESTV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,279,121,20,10 LTEXT "ms",IDC_STATIC,413,183,10,8
CONTROL "Output Time",IDC_CHECK_SO7_MOTION_OUTPUT_TIME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,440,79,55,10 CONTROL "Absolute",IDC_CHECK_REPETEST_ABSOLUTE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,278,207,44,10
EDITTEXT IDC_EDIT_MOTION_SPEEDX,240,27,40,14,ES_AUTOHSCROLL LTEXT "Deadband",IDC_STATIC,327,207,34,8
EDITTEXT IDC_EDIT_MOTION_SPEEDY,329,27,40,14,ES_AUTOHSCROLL LTEXT "um",IDC_STATIC_DEADBAND_UNITS,413,207,19,8
EDITTEXT IDC_EDIT_MOTION_SPEEDZ,418,27,40,14,ES_AUTOHSCROLL CONTROL "VolComp",IDC_CHECK_REPETEST_VOLCOMP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,278,193,43,10
LTEXT "X",IDC_STATIC,230,29,8,8 CONTROL "V",IDC_CHECK_REPETESTV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,278,177,20,10
LTEXT "Y",IDC_STATIC,317,29,8,8 CONTROL "Output Time",IDC_CHECK_SO7_MOTION_OUTPUT_TIME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,439,135,55,10
LTEXT "Z",IDC_STATIC,406,29,8,8 EDITTEXT IDC_EDIT_MOTION_SPEEDX,250,86,40,14,ES_AUTOHSCROLL
LTEXT "mm/s",IDC_STATIC,283,29,18,8 EDITTEXT IDC_EDIT_MOTION_SPEEDY,339,86,40,14,ES_AUTOHSCROLL
LTEXT "mm/s",IDC_STATIC,375,29,18,8 EDITTEXT IDC_EDIT_MOTION_SPEEDZ,428,86,40,14,ES_AUTOHSCROLL
LTEXT "mm/s",IDC_STATIC,462,28,18,8 LTEXT "X",IDC_STATIC,240,88,8,8
PUSHBUTTON "Clear All",IDC_BUTTON_SO7_MOVETO_CLEAR_ALL_LOG,452,266,50,21 LTEXT "Y",IDC_STATIC,327,88,8,8
CONTROL "ErrPos",IDC_CHECK_SO7_MOVETO_FPGADATA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,459,187,34,10 LTEXT "Z",IDC_STATIC,416,88,8,8
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
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, CONTROL "Auto Set Zero ",IDC_CHECK_SO7_MOTION_AUTO_SET_ZERO,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,105,75,63,10 "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
GROUPBOX "Log",IDC_STATIC,16,268,487,183
END END
IDD_SO7_UTIL_IMAGE_DLL DIALOGEX 0, 0, 377, 184 IDD_SO7_UTIL_IMAGE_DLL DIALOGEX 0, 0, 377, 184
@@ -959,9 +968,9 @@ BEGIN
IDD_SO7_UTIL_MOVE_LOCATION, DIALOG IDD_SO7_UTIL_MOVE_LOCATION, DIALOG
BEGIN BEGIN
LEFTMARGIN, 7 LEFTMARGIN, 7
RIGHTMARGIN, 504 RIGHTMARGIN, 747
TOPMARGIN, 7 TOPMARGIN, 7
BOTTOMMARGIN, 347 BOTTOMMARGIN, 463
END END
IDD_SO7_UTIL_IMAGE_DLL, DIALOG IDD_SO7_UTIL_IMAGE_DLL, DIALOG
@@ -2358,8 +2367,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 6,5,0,0 FILEVERSION 7,1,0,0
PRODUCTVERSION 6,5,0,0 PRODUCTVERSION 7,1,0,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@@ -2376,12 +2385,12 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "Hexagon Metrology" VALUE "CompanyName", "Hexagon Metrology"
VALUE "FileDescription", "Utility for Hexagon Metrology" VALUE "FileDescription", "Utility for Hexagon Metrology"
VALUE "FileVersion", "6.5.0.0" VALUE "FileVersion", "7.1.0.0"
VALUE "InternalName", "Usb_Util.exe" VALUE "InternalName", "Usb_Util.exe"
VALUE "LegalCopyright", "Copyright 2013 Hexagon Metrology." VALUE "LegalCopyright", "Copyright 2014 Hexagon Metrology."
VALUE "OriginalFilename", "Usb_Util.exe" VALUE "OriginalFilename", "Usb_Util.exe"
VALUE "ProductName", "Utility" VALUE "ProductName", "Utility"
VALUE "ProductVersion", "6.5.0.0" VALUE "ProductVersion", "7.1.0.0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Move_Location.cpp
+92 -3
View File
@@ -28,6 +28,7 @@ IMPLEMENT_DYNAMIC(CSO7_Move_Location, CMFCPropertyPage)
CSO7_Move_Location::CSO7_Move_Location(): CMFCPropertyPage(CSO7_Move_Location::IDD) CSO7_Move_Location::CSO7_Move_Location(): CMFCPropertyPage(CSO7_Move_Location::IDD)
{ {
m_bOutputTime=FALSE; m_bOutputTime=FALSE;
m_bNeedRestoreSpeed=FALSE;
} }
CSO7_Move_Location::~CSO7_Move_Location() CSO7_Move_Location::~CSO7_Move_Location()
@@ -78,6 +79,11 @@ BEGIN_MESSAGE_MAP(CSO7_Move_Location, CMFCPropertyPage)
ON_BN_CLICKED(IDC_RADIO_SPEED_SYSTEM, &CSO7_Move_Location::OnBnClickedRadioSpeedSystem) ON_BN_CLICKED(IDC_RADIO_SPEED_SYSTEM, &CSO7_Move_Location::OnBnClickedRadioSpeedSystem)
ON_BN_CLICKED(IDC_BUTTON_SO7_MOVETO_CLEAR_ALL_LOG, &CSO7_Move_Location::OnBnClickedButtonSo7MovetoClearAllLog) ON_BN_CLICKED(IDC_BUTTON_SO7_MOVETO_CLEAR_ALL_LOG, &CSO7_Move_Location::OnBnClickedButtonSo7MovetoClearAllLog)
ON_BN_CLICKED(IDC_CHECK_SO7_MOVETO_FPGADATA, &CSO7_Move_Location::OnBnClickedCheckSo7MovetoFpgadata) ON_BN_CLICKED(IDC_CHECK_SO7_MOVETO_FPGADATA, &CSO7_Move_Location::OnBnClickedCheckSo7MovetoFpgadata)
ON_BN_CLICKED(IDC_RADIO_SO7_MOVE_SPEED_GEAR1, &CSO7_Move_Location::OnBnClickedRadioSo7MoveSpeedGear1)
ON_BN_CLICKED(IDC_RADIO_SO7_MOVE_SPEED_GEAR2, &CSO7_Move_Location::OnBnClickedRadioSo7MoveSpeedGear2)
ON_BN_CLICKED(IDC_RADIO_SO7_MOVE_SPEED_GEAR3, &CSO7_Move_Location::OnBnClickedRadioSo7MoveSpeedGear3)
ON_BN_CLICKED(IDC_RADIO_SO7_MOVE_SPEED_GEAR4, &CSO7_Move_Location::OnBnClickedRadioSo7MoveSpeedGear4)
ON_BN_CLICKED(IDC_RADIO_SO7_MOVE_SPEED_GEAR5, &CSO7_Move_Location::OnBnClickedRadioSo7MoveSpeedGear5)
END_MESSAGE_MAP() END_MESSAGE_MAP()
// CSO7_Move_Location ÏûÏ¢´¦Àí³ÌÐò // CSO7_Move_Location ÏûÏ¢´¦Àí³ÌÐò
@@ -93,8 +99,6 @@ BOOL CSO7_Move_Location::OnInitDialog()
((CButton *)GetDlgItem(IDC_RADIO_INCH))->SetCheck(0); ((CButton *)GetDlgItem(IDC_RADIO_INCH))->SetCheck(0);
((CButton *)GetDlgItem(IDC_RADIO_MM))->SetCheck(1); ((CButton *)GetDlgItem(IDC_RADIO_MM))->SetCheck(1);
((CButton *)GetDlgItem(IDC_RADIO_SCALE))->SetCheck(0); ((CButton *)GetDlgItem(IDC_RADIO_SCALE))->SetCheck(0);
((CButton *)GetDlgItem(IDC_RADIO_SPEED_FAST))->SetCheck(0);
((CButton *)GetDlgItem(IDC_RADIO_SPEED_SLOW))->SetCheck(0);
((CButton *)GetDlgItem(IDC_RADIO_SPEED_SYSTEM))->SetCheck(1); ((CButton *)GetDlgItem(IDC_RADIO_SPEED_SYSTEM))->SetCheck(1);
(GetDlgItem(IDC_EDIT_MOTION_SPEEDX))->EnableWindow(FALSE); (GetDlgItem(IDC_EDIT_MOTION_SPEEDX))->EnableWindow(FALSE);
(GetDlgItem(IDC_EDIT_MOTION_SPEEDY))->EnableWindow(FALSE); (GetDlgItem(IDC_EDIT_MOTION_SPEEDY))->EnableWindow(FALSE);
@@ -634,8 +638,9 @@ void CSO7_Move_Location::OnEnKillfocusEditMotionSpeedz()
m_pSO7_Proto->_send_cmd_SO7_CMD_SET_CONSTANT_SPEED(iSpeed,2,0); m_pSO7_Proto->_send_cmd_SO7_CMD_SET_CONSTANT_SPEED(iSpeed,2,0);
} }
//===================================================================================== //=====================================================================================
void CSO7_Move_Location::OnBnClickedRadioSpeedSystem() void CSO7_Move_Location::RestoreSystemSpeed(char _Gear)
{ {
UNREFERENCED_PARAMETER(_Gear);
(GetDlgItem(IDC_EDIT_MOTION_SPEEDX))->EnableWindow(FALSE); (GetDlgItem(IDC_EDIT_MOTION_SPEEDX))->EnableWindow(FALSE);
(GetDlgItem(IDC_EDIT_MOTION_SPEEDY))->EnableWindow(FALSE); (GetDlgItem(IDC_EDIT_MOTION_SPEEDY))->EnableWindow(FALSE);
(GetDlgItem(IDC_EDIT_MOTION_SPEEDZ))->EnableWindow(FALSE); (GetDlgItem(IDC_EDIT_MOTION_SPEEDZ))->EnableWindow(FALSE);
@@ -645,9 +650,92 @@ void CSO7_Move_Location::OnBnClickedRadioSpeedSystem()
Sleep(20); Sleep(20);
m_pSO7_Proto->_send_cmd_SO7_CMD_SET_SPEED_PARAMETER(2,0); m_pSO7_Proto->_send_cmd_SO7_CMD_SET_SPEED_PARAMETER(2,0);
} }
//=====================================================================================
void CSO7_Move_Location::OnBnClickedRadioSpeedSystem()
{
if (m_bNeedRestoreSpeed)
{
RestoreSystemSpeed();
}
m_bNeedRestoreSpeed=FALSE;
char _Gear(0);
m_pSO7_Proto->g_machine.x._MoveTo_Speed_Gear=_Gear;
m_pSO7_Proto->g_machine.y._MoveTo_Speed_Gear=_Gear;
m_pSO7_Proto->g_machine.z._MoveTo_Speed_Gear=_Gear;
}
//=====================================================================================
void CSO7_Move_Location::OnBnClickedRadioSo7MoveSpeedGear1()
{
if (m_bNeedRestoreSpeed)
{
RestoreSystemSpeed();
}
m_bNeedRestoreSpeed=FALSE;
char _Gear(4);
m_pSO7_Proto->g_machine.x._MoveTo_Speed_Gear=_Gear;
m_pSO7_Proto->g_machine.y._MoveTo_Speed_Gear=_Gear;
m_pSO7_Proto->g_machine.z._MoveTo_Speed_Gear=_Gear;
}
//=====================================================================================
void CSO7_Move_Location::OnBnClickedRadioSo7MoveSpeedGear2()
{
if (m_bNeedRestoreSpeed)
{
RestoreSystemSpeed();
}
m_bNeedRestoreSpeed=FALSE;
char _Gear(3);
m_pSO7_Proto->g_machine.x._MoveTo_Speed_Gear=_Gear;
m_pSO7_Proto->g_machine.y._MoveTo_Speed_Gear=_Gear;
m_pSO7_Proto->g_machine.z._MoveTo_Speed_Gear=_Gear;
}
//=====================================================================================
void CSO7_Move_Location::OnBnClickedRadioSo7MoveSpeedGear3()
{
if (m_bNeedRestoreSpeed)
{
RestoreSystemSpeed();
}
m_bNeedRestoreSpeed=FALSE;
char _Gear(2);
m_pSO7_Proto->g_machine.x._MoveTo_Speed_Gear=_Gear;
m_pSO7_Proto->g_machine.y._MoveTo_Speed_Gear=_Gear;
m_pSO7_Proto->g_machine.z._MoveTo_Speed_Gear=_Gear;
}
//=====================================================================================
void CSO7_Move_Location::OnBnClickedRadioSo7MoveSpeedGear4()
{
if (m_bNeedRestoreSpeed)
{
RestoreSystemSpeed();
}
m_bNeedRestoreSpeed=FALSE;
char _Gear(1);
m_pSO7_Proto->g_machine.x._MoveTo_Speed_Gear=_Gear;
m_pSO7_Proto->g_machine.y._MoveTo_Speed_Gear=_Gear;
m_pSO7_Proto->g_machine.z._MoveTo_Speed_Gear=_Gear;
}
//=====================================================================================
void CSO7_Move_Location::OnBnClickedRadioSo7MoveSpeedGear5()
{
if (m_bNeedRestoreSpeed)
{
RestoreSystemSpeed();
}
m_bNeedRestoreSpeed=FALSE;
char _Gear(5);
m_pSO7_Proto->g_machine.x._MoveTo_Speed_Gear=_Gear;
m_pSO7_Proto->g_machine.y._MoveTo_Speed_Gear=_Gear;
m_pSO7_Proto->g_machine.z._MoveTo_Speed_Gear=_Gear;
}
//===================================================================================== //=====================================================================================
void CSO7_Move_Location::OnBnClickedRadioSpeedFast() void CSO7_Move_Location::OnBnClickedRadioSpeedFast()
{ {
m_bNeedRestoreSpeed=TRUE;
(GetDlgItem(IDC_EDIT_MOTION_SPEEDX))->EnableWindow(TRUE); (GetDlgItem(IDC_EDIT_MOTION_SPEEDX))->EnableWindow(TRUE);
(GetDlgItem(IDC_EDIT_MOTION_SPEEDY))->EnableWindow(TRUE); (GetDlgItem(IDC_EDIT_MOTION_SPEEDY))->EnableWindow(TRUE);
(GetDlgItem(IDC_EDIT_MOTION_SPEEDZ))->EnableWindow(TRUE); (GetDlgItem(IDC_EDIT_MOTION_SPEEDZ))->EnableWindow(TRUE);
@@ -676,6 +764,7 @@ void CSO7_Move_Location::OnBnClickedRadioSpeedFast()
//===================================================================================== //=====================================================================================
void CSO7_Move_Location::OnBnClickedRadioSpeedSlow() void CSO7_Move_Location::OnBnClickedRadioSpeedSlow()
{ {
m_bNeedRestoreSpeed=TRUE;
(GetDlgItem(IDC_EDIT_MOTION_SPEEDX))->EnableWindow(TRUE); (GetDlgItem(IDC_EDIT_MOTION_SPEEDX))->EnableWindow(TRUE);
(GetDlgItem(IDC_EDIT_MOTION_SPEEDY))->EnableWindow(TRUE); (GetDlgItem(IDC_EDIT_MOTION_SPEEDY))->EnableWindow(TRUE);
(GetDlgItem(IDC_EDIT_MOTION_SPEEDZ))->EnableWindow(TRUE); (GetDlgItem(IDC_EDIT_MOTION_SPEEDZ))->EnableWindow(TRUE);
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Move_Location.h
+7
View File
@@ -76,6 +76,8 @@ public:
double m_duration; double m_duration;
CString m_OutputTime; CString m_OutputTime;
void OutputWithScroll(const CString &strNewText,CEdit &edtOutput); void OutputWithScroll(const CString &strNewText,CEdit &edtOutput);
BOOL m_bNeedRestoreSpeed;
void RestoreSystemSpeed(char _Gear=0);
afx_msg void OnBnClickedCancel(); afx_msg void OnBnClickedCancel();
afx_msg void OnBnClickedButtonMoveToXyz(); afx_msg void OnBnClickedButtonMoveToXyz();
afx_msg void OnTimer(UINT_PTR nIDEvent); afx_msg void OnTimer(UINT_PTR nIDEvent);
@@ -102,4 +104,9 @@ public:
afx_msg void OnBnClickedRadioSpeedSystem(); afx_msg void OnBnClickedRadioSpeedSystem();
afx_msg void OnBnClickedButtonSo7MovetoClearAllLog(); afx_msg void OnBnClickedButtonSo7MovetoClearAllLog();
afx_msg void OnBnClickedCheckSo7MovetoFpgadata(); afx_msg void OnBnClickedCheckSo7MovetoFpgadata();
afx_msg void OnBnClickedRadioSo7MoveSpeedGear1();
afx_msg void OnBnClickedRadioSo7MoveSpeedGear2();
afx_msg void OnBnClickedRadioSo7MoveSpeedGear3();
afx_msg void OnBnClickedRadioSo7MoveSpeedGear4();
afx_msg void OnBnClickedRadioSo7MoveSpeedGear5();
}; };
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.cpp
+3 -6
View File
@@ -866,10 +866,7 @@ void CSO7_UtilDlg::OnBnClickedButtonSetOutPort()
m_SetIOStatusAddr=static_cast<char>(iSelAddr); m_SetIOStatusAddr=static_cast<char>(iSelAddr);
break; break;
} }
case 4: default:
case 5:
case 6:
case 7:
{ {
m_SetIOStatusAddr=10+1+static_cast<char>(iSelAddr-4); m_SetIOStatusAddr=10+1+static_cast<char>(iSelAddr-4);
break; break;
@@ -982,7 +979,7 @@ void CSO7_UtilDlg::OnBnClickedButtonSo7TestZSignal()
} }
void CSO7_UtilDlg::TestZSignal() void CSO7_UtilDlg::TestZSignal()
{ {
if (((CButton *)GetDlgItem(IDC_CHECK_SO7_OUT_PORT))->GetCheck()) if (FALSE)//FPGA IO
{ {
BYTE cdata[3]={0}; BYTE cdata[3]={0};
//x //x
@@ -1025,7 +1022,7 @@ void CSO7_UtilDlg::TestZSignal()
if (m_pSO7_Proto->g_machine.z._ZSignal_pos._long_ > 8388608) if (m_pSO7_Proto->g_machine.z._ZSignal_pos._long_ > 8388608)
m_pSO7_Proto->g_machine.z._ZSignal_pos._long_=m_pSO7_Proto->g_machine.z._ZSignal_pos._long_-16777216; m_pSO7_Proto->g_machine.z._ZSignal_pos._long_=m_pSO7_Proto->g_machine.z._ZSignal_pos._long_-16777216;
} }
else else//ARM INTERRUPT
{ {
m_pSO7_Proto->_send_cmd_SO7_CMD_READ_ZSIGNAL_POS_X(); m_pSO7_Proto->_send_cmd_SO7_CMD_READ_ZSIGNAL_POS_X();
m_pSO7_Proto->_send_cmd_SO7_CMD_READ_ZSIGNAL_POS_Y(); m_pSO7_Proto->_send_cmd_SO7_CMD_READ_ZSIGNAL_POS_Y();
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Option.cpp
+4
View File
@@ -126,7 +126,11 @@ BOOL CSo7_Option::OnInitDialog()
((CButton *)GetDlgItem(IDC_RADIO_VIDEOCARD_SV4000E))->EnableWindow(FALSE); ((CButton *)GetDlgItem(IDC_RADIO_VIDEOCARD_SV4000E))->EnableWindow(FALSE);
((CButton *)GetDlgItem(IDC_RADIO_VIDEOCARD_TC4000))->EnableWindow(FALSE); ((CButton *)GetDlgItem(IDC_RADIO_VIDEOCARD_TC4000))->EnableWindow(FALSE);
((CButton *)GetDlgItem(IDC_RADIO_SO7_IP_CAMERA))->EnableWindow(FALSE); ((CButton *)GetDlgItem(IDC_RADIO_SO7_IP_CAMERA))->EnableWindow(FALSE);
((CButton *)GetDlgItem(IDC_RADIO_SO7_USB_CAMERA))->EnableWindow(FALSE);
((CButton *)GetDlgItem(IDC_RADIO_KEYENCE_LASER))->EnableWindow(FALSE); ((CButton *)GetDlgItem(IDC_RADIO_KEYENCE_LASER))->EnableWindow(FALSE);
((CButton *)GetDlgItem(IDC_RADIO_KEYENCE_LASER_LK_H))->EnableWindow(FALSE);
((CButton *)GetDlgItem(IDC_RADIO_KEYENCE_LASER_LKH_ETHERNET))->EnableWindow(FALSE);
((CButton *)GetDlgItem(IDC_RADIO_KEYENCE_LASER3))->EnableWindow(FALSE);
((CButton *)GetDlgItem(IDC_RADIO_SO7_VERIFICATION_ALGORITHM))->EnableWindow(FALSE); ((CButton *)GetDlgItem(IDC_RADIO_SO7_VERIFICATION_ALGORITHM))->EnableWindow(FALSE);
((CButton *)GetDlgItem(IDC_RADIO_TEST_IMAGE_DLL))->EnableWindow(FALSE); ((CButton *)GetDlgItem(IDC_RADIO_TEST_IMAGE_DLL))->EnableWindow(FALSE);
#endif #endif
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h
+9 -1
View File
@@ -716,6 +716,8 @@
#define IDC_STATIC_TC4000_PICTURE 1602 #define IDC_STATIC_TC4000_PICTURE 1602
#define IDC_RADIO_SO7_IP_CAMERA 1603 #define IDC_RADIO_SO7_IP_CAMERA 1603
#define IDC_RADIO_TC4000_CHANNEL1 1604 #define IDC_RADIO_TC4000_CHANNEL1 1604
#define IDC_RADIO_SO7_IP_CAMERA2 1604
#define IDC_RADIO_SO7_USB_CAMERA 1604
#define IDC_RADIO_TC4000_CHANNEL2 1605 #define IDC_RADIO_TC4000_CHANNEL2 1605
#define IDC_RADIO_TC4000_CHANNEL3 1606 #define IDC_RADIO_TC4000_CHANNEL3 1606
#define IDC_RADIO_TC4000_CHANNEL4 1607 #define IDC_RADIO_TC4000_CHANNEL4 1607
@@ -877,6 +879,7 @@
#define IDC_RADIO_READ_INPUT_PORT 1804 #define IDC_RADIO_READ_INPUT_PORT 1804
#define IDC_RADIO2 1805 #define IDC_RADIO2 1805
#define IDC_RADIO_READ_OUTPUT_PORT 1805 #define IDC_RADIO_READ_OUTPUT_PORT 1805
#define IDC_RADIO_SO7_MOVE_SPEED_GEAR2 1805
#define IDC_RADIO_MACHINE_TESASTARE 1806 #define IDC_RADIO_MACHINE_TESASTARE 1806
#define IDC_RADIO_READ_OUTPUT_PORT2 1806 #define IDC_RADIO_READ_OUTPUT_PORT2 1806
#define IDC_EDIT_MOVETO_DEG 1807 #define IDC_EDIT_MOVETO_DEG 1807
@@ -914,8 +917,13 @@
#define IDC_EDIT_KEYENCE_LKG5000_MSG 1830 #define IDC_EDIT_KEYENCE_LKG5000_MSG 1830
#define IDC_BTN_KEYENCE_LKG5000_ETHERNET_START_SCAN 1831 #define IDC_BTN_KEYENCE_LKG5000_ETHERNET_START_SCAN 1831
#define IDC_BTN_KEYENCE_LKG5000_ETHERNET_STOP_SCAN 1832 #define IDC_BTN_KEYENCE_LKG5000_ETHERNET_STOP_SCAN 1832
#define IDC_RADIO_SO7_MOVE_SPEED_GEAR1 1832
#define IDC_BTN_KEYENCE_LKG5000_ETHERNET_START_SCAN2 1833 #define IDC_BTN_KEYENCE_LKG5000_ETHERNET_START_SCAN2 1833
#define IDC_RADIO_SO7_MOVE_SPEED_GEAR3 1833
#define IDC_BTN_KEYENCE_LKG5000_ETHERNET_STOP_SCAN2 1834 #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 IDC_BUTTON_DIY_EXIT_BUTTON 32740
#define ID_EDIT_SO7_CONFIG_MOTION 32741 #define ID_EDIT_SO7_CONFIG_MOTION 32741
@@ -925,7 +933,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS #ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 191 #define _APS_NEXT_RESOURCE_VALUE 191
#define _APS_NEXT_COMMAND_VALUE 32771 #define _APS_NEXT_COMMAND_VALUE 32771
#define _APS_NEXT_CONTROL_VALUE 1832 #define _APS_NEXT_CONTROL_VALUE 1836
#define _APS_NEXT_SYMED_VALUE 104 #define _APS_NEXT_SYMED_VALUE 104
#endif #endif
#endif #endif
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo
BIN
View File
Binary file not shown.