diff --git a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp index b7f60b2..d96ec1f 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp @@ -231,6 +231,12 @@ void CSO7_Proto::_process_rcv_transfer_data(int iEP) case CT_READ_SEC_REALZ: _process_SO7_CMD_READ_ZSIGNAL_POS_Z(); break; + case CT_WRITE_SYSTEM: + _process_SO7_CMD_WRITE_DATA_TO_FPGA(); + break; + case CT_READ_SYSTEM: + _process_SO7_CMD_READ_DATA_FROM_FPGA(); + 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]); @@ -443,6 +449,7 @@ CSO7_Proto::CSO7_Proto() ep_buff[i]._event = NULL; }; g_machine.IsOffline=TRUE; + g_machine.FPGAData=0; g_machine.x._Move_Speed_Gear =2; g_machine.y._Move_Speed_Gear =2; g_machine.z._Move_Speed_Gear =2; @@ -4087,6 +4094,49 @@ SSI_STATUS_MOTION CSO7_Proto::_send_cmd_SO7_CMD_READ_ZSIGNAL_POS_Z() ReleaseMutex(g_hEP02_Serial_Mutex); return SSI_STATUS_MOTION_NORMAL; } +//============================================================== +SSI_STATUS_MOTION CSO7_Proto::_send_cmd_SO7_CMD_WRITE_DATA_TO_FPGA(char axis_type,char Addr,char Data) +{ + WaitForSingleObject(g_hEP02_Serial_Mutex, INFINITE); + memset(ep_buff[EP_02_CMD_IDX]._buffer, 0x00, MAX_BUFF_SIZE); + + *(ep_buff[EP_02_CMD_IDX]._buffer) = CT_DATA; + *(ep_buff[EP_02_CMD_IDX]._buffer+1) = CT_WRITE_SYSTEM; + *(ep_buff[EP_02_CMD_IDX]._buffer+2)=axis_type; + *(ep_buff[EP_02_CMD_IDX]._buffer+3)=Addr; + *(ep_buff[EP_02_CMD_IDX]._buffer+4)=Data; + + ep_buff[EP_02_CMD_IDX]._size = 0x05; + ep_buff[EP_82_DATA_IDX]._size = 0x01; + + g_hEP02_Thread_State=THREAD_RUNNING_STATE1; + g_hEP8x_Thread_State=THREAD_RUNNING_STATE2; + _do_single_threaded_usb_comm(EP_02_CMD_IDX); + ReleaseMutex(g_hEP02_Serial_Mutex); + return SSI_STATUS_MOTION_NORMAL; +} +//============================================================== +SSI_STATUS_MOTION CSO7_Proto::_send_cmd_SO7_CMD_READ_DATA_FROM_FPGA(char axis_type,char Addr) +{ + WaitForSingleObject(g_hEP02_Serial_Mutex, INFINITE); + memset(ep_buff[EP_02_CMD_IDX]._buffer, 0x00, MAX_BUFF_SIZE); + + *(ep_buff[EP_02_CMD_IDX]._buffer) = CT_DATA; + *(ep_buff[EP_02_CMD_IDX]._buffer+1) = CT_READ_SYSTEM; + *(ep_buff[EP_02_CMD_IDX]._buffer+2)=axis_type; + *(ep_buff[EP_02_CMD_IDX]._buffer+3)=Addr; + *(ep_buff[EP_02_CMD_IDX]._buffer+4)=0; + + ep_buff[EP_02_CMD_IDX]._size = 0x05; + ep_buff[EP_82_DATA_IDX]._size = 0x12; + + 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() { @@ -4386,3 +4436,15 @@ SSI_STATUS_MOTION CSO7_Proto::_process_SO7_CMD_READ_ZSIGNAL_POS_Z() return SSI_STATUS_MOTION_NORMAL; } +//============================================================== +SSI_STATUS_MOTION CSO7_Proto::_process_SO7_CMD_WRITE_DATA_TO_FPGA() +{ + g_machine.FPGAData = *(ep_buff[EP_82_DATA_IDX]._buffer); + return SSI_STATUS_MOTION_NORMAL; +} +//============================================================== +SSI_STATUS_MOTION CSO7_Proto::_process_SO7_CMD_READ_DATA_FROM_FPGA() +{ + g_machine.FPGAData = *(ep_buff[EP_82_DATA_IDX]._buffer); + 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 986c57a..a15a11b 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h @@ -201,6 +201,7 @@ struct struct_so7_machine char Sys_Reset_Flag; char cVerNumber; char InterruptFlag[2]; + char FPGAData; char InPortStatus; int _motor_pulse_num; BOOL IsOffline; @@ -407,6 +408,8 @@ public: SSI_STATUS_MOTION _send_cmd_SO7_CMD_READ_ZSIGNAL_POS_X(); SSI_STATUS_MOTION _send_cmd_SO7_CMD_READ_ZSIGNAL_POS_Y(); SSI_STATUS_MOTION _send_cmd_SO7_CMD_READ_ZSIGNAL_POS_Z(); + SSI_STATUS_MOTION _send_cmd_SO7_CMD_WRITE_DATA_TO_FPGA(char axis_type,char Addr,char Data); + SSI_STATUS_MOTION _send_cmd_SO7_CMD_READ_DATA_FROM_FPGA(char axis_type,char Addr); static SSI_STATUS_MOTION _process_SO7_CMD_MOVE_X(); static SSI_STATUS_MOTION _process_SO7_CMD_MOVE_Y(); @@ -440,6 +443,8 @@ public: static SSI_STATUS_MOTION _process_SO7_CMD_READ_ZSIGNAL_POS_X(); static SSI_STATUS_MOTION _process_SO7_CMD_READ_ZSIGNAL_POS_Y(); static SSI_STATUS_MOTION _process_SO7_CMD_READ_ZSIGNAL_POS_Z(); + static SSI_STATUS_MOTION _process_SO7_CMD_WRITE_DATA_TO_FPGA(); + static SSI_STATUS_MOTION _process_SO7_CMD_READ_DATA_FROM_FPGA(); }; 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 8e31165..db2fec0 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log @@ -2137,3 +2137,18 @@ Unable to open device 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/Release/UtilityDebug.Log b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Release/UtilityDebug.Log index 2976218..c63ebc0 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Release/UtilityDebug.Log +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Release/UtilityDebug.Log @@ -107,3 +107,18 @@ Construct Cso7_Proto. Destruct Cso7_Proto. Construct Cso7_Proto. Destruct Cso7_Proto. +Construct Cso7_Proto. +Unable to open device Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Unable to open device 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 edc498f..ad97e83 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 @@ -73,21 +73,21 @@ BEGIN EDITTEXT IDC_EDIT_X_SCALE_COEFFICIENT,46,284,54,12,ES_CENTER | ES_AUTOHSCROLL EDITTEXT IDC_EDIT_Y_SCALE_COEFFICIENT,109,284,54,12,ES_CENTER | ES_AUTOHSCROLL EDITTEXT IDC_EDIT_Z_SCALE_COEFFICIENT,172,284,54,12,ES_CENTER | ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_SET_VER_NO,325,317,45,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_SET_VER_NO,325,313,45,14,ES_AUTOHSCROLL GROUPBOX "USB Control",IDC_STATIC,15,12,89,115 GROUPBOX "Config",IDC_STATIC,13,129,55,83 GROUPBOX "Get_Data",IDC_STATIC,114,13,98,115 PUSHBUTTON "当前探头：激光",IDC_BUTTON_PROBE_ONOFF,7,459,48,20,BS_MULTILINE | NOT WS_VISIBLE PUSHBUTTON "当前状态：夹具开",IDC_BUTTON_FIXTURE_ONOFF,7,459,48,20,BS_MULTILINE | NOT WS_VISIBLE PUSHBUTTON "当前状态：夹具上",IDC_BUTTON_FIXTURE_UPDOWN,7,459,48,20,BS_MULTILINE | NOT WS_VISIBLE - GROUPBOX "Ver NO.",IDC_STATIC,252,303,145,37 - LTEXT "Set Ver NO.",IDC_STATIC,273,320,39,8 - GROUPBOX "Common Cmd",IDC_STATIC,253,345,144,54 - CONTROL "X",IDC_RADIO_SELECT_X,"Button",BS_AUTORADIOBUTTON,274,354,20,10 - CONTROL "Y",IDC_RADIO_SELECT_Y,"Button",BS_AUTORADIOBUTTON,317,354,20,10 - CONTROL "Z",IDC_RADIO_SELECT_Z,"Button",BS_AUTORADIOBUTTON,360,354,20,10 - PUSHBUTTON "Set Section",IDC_BUTTON_SET_SECTION,271,374,46,21,BS_MULTILINE - PUSHBUTTON "Correction Scale",IDC_BUTTON_CORRECTION_SCALE,327,374,46,21,BS_MULTILINE + GROUPBOX "Ver NO.",IDC_STATIC,252,303,145,29 + LTEXT "Set Ver NO.",IDC_STATIC,272,316,39,8 + GROUPBOX "R/W Data",IDC_STATIC,253,334,144,65 + CONTROL "X",IDC_RADIO_SELECT_X,"Button",BS_AUTORADIOBUTTON,261,348,20,10 + CONTROL "Y",IDC_RADIO_SELECT_Y,"Button",BS_AUTORADIOBUTTON,261,364,20,10 + CONTROL "Z",IDC_RADIO_SELECT_Z,"Button",BS_AUTORADIOBUTTON,261,380,20,10 + PUSHBUTTON "Set Section",IDC_BUTTON_SET_SECTION,7,458,46,21,BS_MULTILINE | NOT WS_VISIBLE + PUSHBUTTON "Correction Scale",IDC_BUTTON_CORRECTION_SCALE,7,458,46,21,BS_MULTILINE | NOT WS_VISIBLE GROUPBOX "Light Control",IDC_STATIC,226,14,85,113 LTEXT "Top",IDC_STATIC,236,28,18,11 LTEXT "Bottom",IDC_STATIC,234,43,22,11 @@ -143,12 +143,18 @@ BEGIN CONTROL "",IDC_MFCBUTTON_STATUS_IN_PORT4,"MfcButton",WS_TABSTOP,353,72,21,14 CONTROL "",IDC_MFCBUTTON_STATUS_IN_PORT5,"MfcButton",WS_TABSTOP,353,88,21,14 CONTROL "",IDC_MFCBUTTON_STATUS_IN_PORT6,"MfcButton",WS_TABSTOP,353,104,21,14 - EDITTEXT IDC_EDIT_SO7_READ_IO_STATUS_ADDRESS,87,465,40,14,ES_AUTOHSCROLL | NOT WS_VISIBLE - LTEXT "Addr",IDC_STATIC,67,462,16,8,NOT WS_VISIBLE + EDITTEXT IDC_EDIT_SO7_READ_IO_STATUS_ADDRESS,79,465,40,14,ES_AUTOHSCROLL | NOT WS_VISIBLE + LTEXT "Addr",IDC_STATIC,63,463,16,8,NOT WS_VISIBLE PUSHBUTTON "Test Z Signal",IDC_BUTTON_SO7_TEST_Z_SIGNAL,169,235,61,14 PUSHBUTTON "CNC Program",IDC_BUTTON_SO7_CNC_PROGRAM,281,274,52,19 GROUPBOX "CNC",IDC_STATIC,252,265,143,34 CONTROL "Laser ON",IDC_CHECK_SO7_TURN_ON_FFF_LASER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,112,223,47,10 + EDITTEXT IDC_EDIT_RWDATA_DATA,307,371,44,13,ES_AUTOHSCROLL + PUSHBUTTON "Write",IDC_BUTTON_SO7_SENDDATATOFPGA,360,344,34,19 + PUSHBUTTON "Read",IDC_BUTTON_SO7_READDATAFROMFPGA,360,369,34,19 + LTEXT "Addr",IDC_STATIC,287,351,16,8 + LTEXT "Data",IDC_STATIC,287,373,16,8 + COMBOBOX IDC_COMBO_RWDATA_ADDR,307,348,45,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END IDD_S07_UTIL_SEND_PARAMETER DIALOGEX 0, 0, 753, 481 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 36fc94d..5a95d55 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 @@ -134,6 +134,8 @@ BEGIN_MESSAGE_MAP(CSO7_UtilDlg, CDialog) ON_BN_CLICKED(IDC_BUTTON_SO7_TEST_Z_SIGNAL, &CSO7_UtilDlg::OnBnClickedButtonSo7TestZSignal) ON_BN_CLICKED(IDC_BUTTON_SO7_CNC_PROGRAM, &CSO7_UtilDlg::OnBnClickedButtonSo7CncProgram) ON_BN_CLICKED(IDC_CHECK_SO7_TURN_ON_FFF_LASER, &CSO7_UtilDlg::OnBnClickedCheckSo7TurnOnFffLaser) + ON_BN_CLICKED(IDC_BUTTON_SO7_SENDDATATOFPGA, &CSO7_UtilDlg::OnBnClickedButtonSo7Senddatatofpga) + ON_BN_CLICKED(IDC_BUTTON_SO7_READDATAFROMFPGA, &CSO7_UtilDlg::OnBnClickedButtonSo7Readdatafromfpga) END_MESSAGE_MAP() @@ -227,6 +229,17 @@ BOOL CSO7_UtilDlg::OnInitDialog() ((CButton *)GetDlgItem(IDC_RADIO_SELECT_Y))->SetCheck(false); ((CButton *)GetDlgItem(IDC_RADIO_SELECT_Z))->SetCheck(false); + CString csTmp=_T(""); + ((CComboBox *)GetDlgItem(IDC_COMBO_RWDATA_ADDR))->ResetContent(); + for(int i=0;i<16;i++) + { + csTmp.Format(_T("%d"),i); + ((CComboBox *)GetDlgItem(IDC_COMBO_RWDATA_ADDR))->InsertString(i,csTmp); + } + ((CComboBox *)GetDlgItem(IDC_COMBO_RWDATA_ADDR))->SetCurSel(10); + GetDlgItem(IDC_EDIT_SO7_READ_IO_STATUS_ADDRESS)->SetWindowTextW(_T("4")); + GetDlgItem(IDC_EDIT_RWDATA_DATA)->SetWindowTextW(_T("0")); + CString csPath; m_pSO7_Proto->GetAppPath(csPath); m_pSO7_Proto->Load_SevenOcean_Inifile(csPath+_T("\\Utility_Config.ini")); @@ -252,7 +265,6 @@ BOOL CSO7_UtilDlg::OnInitDialog() g_pLoggerDebug = new CLogger(_T("\\UtilityDebug.Log")); } - GetDlgItem(IDC_EDIT_SO7_READ_IO_STATUS_ADDRESS)->SetWindowTextW(_T("4")); UpdateData(FALSE); @@ -1062,6 +1074,81 @@ void CSO7_UtilDlg::TestZSignal() m_ZsignalPosZ=m_pSO7_Proto->g_machine.z._ZSignal_pos._long_; } +//================================================================================================ +void CSO7_UtilDlg::OnBnClickedButtonSo7Senddatatofpga() +{ + UpdateData(TRUE); + USES_CONVERSION; + CString str; + GetDlgItem(IDC_EDIT_RWDATA_DATA)->GetWindowText(str); + const char* cTempValue=T2A(str); + char cTmpData= static_cast(atoi(cTempValue)); + char cAxis(0); + if (((CButton *)GetDlgItem(IDC_RADIO_SELECT_X))->GetCheck()) + { + cAxis=2; + } + else if (((CButton *)GetDlgItem(IDC_RADIO_SELECT_Y))->GetCheck()) + { + cAxis=1; + } + else if (((CButton *)GetDlgItem(IDC_RADIO_SELECT_Z))->GetCheck()) + { + cAxis=3; + } + else + { + cAxis=0; + } + char cAddr(0); + cAddr=static_cast(((CComboBox *)GetDlgItem(IDC_COMBO_RWDATA_ADDR))->GetCurSel()); + m_pSO7_Proto->_send_cmd_SO7_CMD_WRITE_DATA_TO_FPGA(cAxis,cAddr,cTmpData); + if (m_pSO7_Proto->g_machine.FPGAData>0) + { + m_OutMessage=_T("Write data successful."); + } + else + { + m_OutMessage=_T("Failed to write data ."); + } + OutputWithScroll(m_OutMessage,m_edMSG); +} + + +//================================================================================================ +void CSO7_UtilDlg::OnBnClickedButtonSo7Readdatafromfpga() +{ + UpdateData(TRUE); + USES_CONVERSION; + CString str; + GetDlgItem(IDC_EDIT_RWDATA_DATA)->GetWindowText(str); + const char* cTempValue=T2A(str); + char cTmpData(0); + cTmpData= static_cast(atoi(cTempValue)); + char cAxis(0); + if (((CButton *)GetDlgItem(IDC_RADIO_SELECT_X))->GetCheck()) + { + cAxis=2; + } + else if (((CButton *)GetDlgItem(IDC_RADIO_SELECT_Y))->GetCheck()) + { + cAxis=1; + } + else if (((CButton *)GetDlgItem(IDC_RADIO_SELECT_Z))->GetCheck()) + { + cAxis=3; + } + else + { + cAxis=0; + } + char cAddr(0); + cAddr=static_cast(((CComboBox *)GetDlgItem(IDC_COMBO_RWDATA_ADDR))->GetCurSel()); + m_pSO7_Proto->_send_cmd_SO7_CMD_READ_DATA_FROM_FPGA(cAxis,cAddr); + m_OutMessage.Format(_T("[Read]Data=%d ."),m_pSO7_Proto->g_machine.FPGAData); + OutputWithScroll(m_OutMessage,m_edMSG); +} + //================================================================================================ void CSO7_UtilDlg::OnEnKillfocusEditSo7ReadIoStatusAddress() { @@ -1302,3 +1389,5 @@ void CSO7_UtilDlg::OnBnClickedCheckSo7TurnOnFffLaser() m_pSO7_Proto->_send_cmd_SO7_CMD_COMMON_COMMAND(CT_MOTOR,CT_M_LASE_OFF,0); } } + + 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 bf36b44..ce0ec4d 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 @@ -114,4 +114,6 @@ public: afx_msg void OnBnClickedButtonSo7TestZSignal(); afx_msg void OnBnClickedButtonSo7CncProgram(); afx_msg void OnBnClickedCheckSo7TurnOnFffLaser(); + afx_msg void OnBnClickedButtonSo7Senddatatofpga(); + afx_msg void OnBnClickedButtonSo7Readdatafromfpga(); }; 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 82d7ec7..c9fa46a 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h @@ -6,10 +6,10 @@ #define IDSTOP_AUTO_TEST 3 #define IDC_BUTTON_MOVE_W 4 #define ID_OK_START 5 +#define IDS_ABOUTBOX 7 #define IDSTOP_AUTO_TEST_MITUTOYO 8 #define IDM_ABOUTBOX 0x0010 #define IDD_ABOUTBOX 100 -#define IDS_ABOUTBOX 7 #define IDD_MV_UTIL_DIALOG 101 #define IDD_DIALOG_FRAME_ID 102 #define IDD_MV_UTIL_MOVE_LOCATION 103 @@ -153,29 +153,6 @@ #define IDC_EDIT_DECEL_X 1095 #define IDC_EDIT_DECEL_Y 1096 #define IDC_EDIT_DECEL_Z 1097 -#define IDC_RADIO_SPEED_SLOW 1770 -#define IDC_RADIO_SCALE 1772 -#define IDC_EDIT_SPEED_X 1773 -#define IDC_EDIT_SPEED_Y 1774 -#define IDC_EDIT_SPEED_Z 1775 -#define IDC_EDIT_ACC_X 1776 -#define IDC_EDIT_ACC_Y 1777 -#define IDC_EDIT_ACC_Z 1778 -#define IDC_EDIT_DEC_X 1779 -#define IDC_EDIT_DEC_Y 1780 -#define IDC_EDIT_DEC_Z 1781 -#define IDC_EDIT_MANUAL_SPEED_X 1782 -#define IDC_EDIT_MANUAL_SPEED_Y 1783 -#define IDC_EDIT_MANUAL_SPEED_Z 1784 -#define IDC_EDIT_MANUAL_ACC_X 1785 -#define IDC_EDIT_MANUAL_ACC_Y 1786 -#define IDC_EDIT_MANUAL_ACC_Z 1787 -#define IDC_EDIT_MANUAL_DEC_X 1788 -#define IDC_EDIT_MANUAL_DEC_Y 1789 -#define IDC_EDIT_MANUAL_DEC_Z 1790 -#define IDC_RADIO_SPEED_USER_DEFINED 1791 -#define IDC_CHECK_USE_MANUAL_MOTION_PARAMETERS 1792 -#define IDC_EDIT_MOVE_W 1793 #define IDC_BUTTON_ALL_ON 1101 #define IDC_BUTTON_ALL_OFF 1102 #define IDC_POLLING_SPEEDTEST 1104 @@ -659,6 +636,7 @@ #define IDC_RADIO_SAMPLE_Z 1540 #define IDC_BUTTON_READ_IMAGE 1541 #define IDC_BUTTON2 1542 +#define IDC_BUTTON_SO7_READDATAFROMFPGA 1542 #define IDC_BUTTON_STOP_SAMPLE_SCURVE 1543 #define IDC_BTN_CONFIGURE_MOVEVOUT 1544 #define IDC_BUTTON_STOP_SCAN_KEYENCE_LK_GLASER 1545 @@ -826,20 +804,48 @@ #define IDC_EDIT_READOUT_Y 1707 #define IDC_BUTTON_SO7_PROGRAM_NEW_CNC 1710 #define IDC_BUTTON_SO7_PROGRAM_SAVE_CNC_FILE 1711 -#define IDC_BUTTON_SO7_PROGRAM_OPEN_CNC 1712 +#define IDC_BUTTON_SO7_PROGRAM_OPEN_CNC 1712 #define IDC_EDIT_SO7_PROGEAM_CNC_RUING_TIMES 1713 -#define IDC_RADIO_MACHINE_TM_065 1714 -#define IDD_SO7_UTIL_IMAGE_DLL 1715 -#define IDD_SO7_UTIL_MANUAL_MACHINE 1716 -#define IDC_BUTTON_READ_PROGRAM 1717 -#define IDD_SO7_VIDEOCARD_TC4000 1718 +#define IDC_RADIO_MACHINE_TM_065 1714 +#define IDD_SO7_UTIL_IMAGE_DLL 1715 +#define IDD_SO7_UTIL_MANUAL_MACHINE 1716 +#define IDC_BUTTON_READ_PROGRAM 1717 +#define IDD_SO7_VIDEOCARD_TC4000 1718 +#define IDC_RADIO_SPEED_SLOW 1770 +#define IDC_RADIO_SCALE 1772 +#define IDC_EDIT_SPEED_X 1773 +#define IDC_EDIT_SPEED_Y 1774 +#define IDC_EDIT_SPEED_Z 1775 +#define IDC_EDIT_ACC_X 1776 +#define IDC_EDIT_ACC_Y 1777 +#define IDC_EDIT_ACC_Z 1778 +#define IDC_EDIT_DEC_X 1779 +#define IDC_EDIT_DEC_Y 1780 +#define IDC_EDIT_DEC_Z 1781 +#define IDC_EDIT_MANUAL_SPEED_X 1782 +#define IDC_EDIT_MANUAL_SPEED_Y 1783 +#define IDC_EDIT_MANUAL_SPEED_Z 1784 +#define IDC_EDIT_MANUAL_ACC_X 1785 +#define IDC_EDIT_MANUAL_ACC_Y 1786 +#define IDC_EDIT_MANUAL_ACC_Z 1787 +#define IDC_EDIT_MANUAL_DEC_X 1788 +#define IDC_EDIT_MANUAL_DEC_Y 1789 +#define IDC_EDIT_MANUAL_DEC_Z 1790 +#define IDC_RADIO_SPEED_USER_DEFINED 1791 +#define IDC_CHECK_USE_MANUAL_MOTION_PARAMETERS 1792 +#define IDC_EDIT_MOVE_W 1793 +#define IDC_EDIT_RWDATA_DATA 1793 +#define IDC_BUTTON1 1794 +#define IDC_BUTTON_SO7_SENDDATATOFPGA 1794 +#define IDC_COMBO_RWDATA_ADDR 1795 + // Next default values for new objects // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 188 #define _APS_NEXT_COMMAND_VALUE 32771 -#define _APS_NEXT_CONTROL_VALUE 1793 +#define _APS_NEXT_CONTROL_VALUE 1796 #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 1ce7e40..c939d1f 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