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

修改config文件配置

Browse Source
This commit is contained in:
TAO Cheng
2014-05-28 14:36:38 +08:00
parent 73da2cb8fc
commit 92299ad02a
10 changed files with 154 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc
+12 -11
View File
@@ -16,7 +16,7 @@
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
// Chinese (Simplified, PRC) resources
// 中文(简体，中国) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS)
LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
@@ -84,9 +84,9 @@ BEGIN
PUSHBUTTON "Test AutoZoom",IDC_BUTTON_AUTO_ZOOM,29,82,63,18,BS_MULTILINE
PUSHBUTTON "Set Reset Flag",IDC_BUTTON_SET_RESET_FLAG,104,108,60,15
PUSHBUTTON "Home V",IDC_BUTTON_RESET_V,167,87,60,15
EDITTEXT IDC_EDIT_X_SCALE_COEFFICIENT,64,286,39,12,ES_CENTER | ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_Y_SCALE_COEFFICIENT,123,286,39,12,ES_CENTER | ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_Z_SCALE_COEFFICIENT,182,286,39,12,ES_CENTER | ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_X_SCALE_COEFFICIENT,37,290,39,12,ES_CENTER | ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_Y_SCALE_COEFFICIENT,96,290,39,12,ES_CENTER | ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_Z_SCALE_COEFFICIENT,155,290,39,12,ES_CENTER | ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_SET_VER_NO,261,25,29,14,ES_AUTOHSCROLL
GROUPBOX "USB Control",IDC_STATIC,17,12,81,59
GROUPBOX "Config",IDC_STATIC,17,130,116,44
@@ -129,10 +129,9 @@ BEGIN
LTEXT "Reference Mark",IDC_STATIC,179,311,52,8
LTEXT "Pos Update Frequency",IDC_STATIC,106,386,74,8
LTEXT "Spare1",IDC_STATIC,304,111,24,8
CTEXT "X",IDC_STATIC,80,274,8,8
CTEXT "Y",IDC_STATIC,139,275,8,8
CTEXT "Z",IDC_STATIC,198,274,8,8
CTEXT "光栅尺分辨率",IDC_STATIC,26,282,27,20
CTEXT "X",IDC_STATIC,26,292,8,8
CTEXT "Y",IDC_STATIC,84,291,8,8
CTEXT "Z",IDC_STATIC,143,291,8,8
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
@@ -178,6 +177,8 @@ BEGIN
PUSHBUTTON "Write",IDC_BUTTON_SO7_TRIGPULSE_WRITE_PARA,224,138,34,15
PUSHBUTTON "Read",IDC_BUTTON_SO7_TRIGPULSE_READ_PARA,224,156,34,15
EDITTEXT IDC_EDIT_SO7_TRIGPULSE_DIS2,184,155,36,14,ES_AUTOHSCROLL
PUSHBUTTON "确定",IDC_BUTTON_SET_SCALE_COEFFICIENT,202,285,34,19
GROUPBOX "光栅尺分辨率(μm)",IDC_STATIC,18,277,223,31
END
IDD_SO7_UTIL_SEND_PARAMETER DIALOGEX 0, 0, 750, 480
@@ -1555,12 +1556,12 @@ IDB_BITMAP_Z_DOWN BITMAP "res\\bmp\\Z_DOWN.bmp"
IDB_BITMAP_Z_UP BITMAP "res\\bmp\\Z_UP.bmp"
IDB_BITMAP_X_LEFT BITMAP "res\\bmp\\X_LEFT.BMP"
IDB_BITMAP_X_RIGHT BITMAP "res\\bmp\\X_RIGHT.bmp"
#endif // Chinese (Simplified, PRC) resources
#endif // 中文(简体，中国) resources
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// English (United States) resources
// 英语(美国) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
@@ -2503,7 +2504,7 @@ BEGIN
IDS_SO7_ABOUTBOX "&About Utility for SO7..."
END
#endif // English (United States) resources
#endif // 英语(美国) resources
/////////////////////////////////////////////////////////////////////////////
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.cpp
+14 -38
View File
@@ -112,9 +112,6 @@ BEGIN_MESSAGE_MAP(CSO7_UtilDlg, CDialog)
ON_BN_CLICKED(IDC_BUTTON_SET_RESET_FLAG, &CSO7_UtilDlg::OnBnClickedButtonSetResetFlag)
ON_BN_CLICKED(IDC_BUTTON_RESET_WORKTABLE_RIGHT, &CSO7_UtilDlg::OnBnClickedButtonResetWorktableRight)
ON_BN_CLICKED(IDC_BUTTON_SET_OUT_PORT, &CSO7_UtilDlg::OnBnClickedButtonSetOutPort)
ON_EN_KILLFOCUS(IDC_EDIT_X_SCALE_COEFFICIENT, &CSO7_UtilDlg::OnEnKillfocusEditXScaleCoefficient)
ON_EN_KILLFOCUS(IDC_EDIT_Y_SCALE_COEFFICIENT, &CSO7_UtilDlg::OnEnKillfocusEditYScaleCoefficient)
ON_EN_KILLFOCUS(IDC_EDIT_Z_SCALE_COEFFICIENT, &CSO7_UtilDlg::OnEnKillfocusEditZScaleCoefficient)
ON_BN_CLICKED(IDC_BUTTON_AUTO_ZOOM, &CSO7_UtilDlg::OnBnClickedButtonAutoZoom)
ON_BN_CLICKED(IDC_BUTTON_MANUAL_HOME, &CSO7_UtilDlg::OnBnClickedButtonManualHome)
ON_BN_CLICKED(IDC_BUTTON_SETUP_SO7CONFIG, &CSO7_UtilDlg::OnBnClickedButtonSetupSo7config)
@@ -143,6 +140,7 @@ BEGIN_MESSAGE_MAP(CSO7_UtilDlg, CDialog)
ON_BN_CLICKED(IDC_RADIO_READ_LIMIT_SWITCH, &CSO7_UtilDlg::OnBnClickedRadioReadLimitSwitch)
ON_BN_CLICKED(IDC_BUTTON_SO7_TRIGPULSE_WRITE_PARA, &CSO7_UtilDlg::OnBnClickedButtonSo7TrigpulseWritePara)
ON_BN_CLICKED(IDC_BUTTON_SO7_TRIGPULSE_READ_PARA, &CSO7_UtilDlg::OnBnClickedButtonSo7TrigpulseReadPara)
ON_BN_CLICKED(IDC_BUTTON_SET_SCALE_COEFFICIENT, &CSO7_UtilDlg::OnBnClickedButtonSetScaleCoefficient)
END_MESSAGE_MAP()
@@ -934,41 +932,6 @@ void CSO7_UtilDlg::OnBnClickedButtonSetOutPort()
m_pSO7_Proto->_send_cmd_SO7_CMD_COMMON_COMMAND_DATA(CT_DATA,CT_WRITE_IO_DAT,m_SetIOStatusAddr,cSetValue);
}
}
void CSO7_UtilDlg::OnEnKillfocusEditXScaleCoefficient()
{
UpdateData(TRUE);
USES_CONVERSION;
const char* cTempValue=T2A(m_cs_XScaleCoeff);
m_pSO7_Proto->g_machine.s_machine_config.x_axis._scale_resolution = atof(cTempValue);
m_pSO7_Proto->Save_So7_Config();
}
void CSO7_UtilDlg::OnEnKillfocusEditYScaleCoefficient()
{
UpdateData(TRUE);
USES_CONVERSION;
const char* cTempValue=T2A(m_cs_YScaleCoeff);
m_pSO7_Proto->g_machine.s_machine_config.y_axis._scale_resolution = atof(cTempValue);
m_pSO7_Proto->Save_So7_Config();
}
void CSO7_UtilDlg::OnEnKillfocusEditZScaleCoefficient()
{
UpdateData(TRUE);
USES_CONVERSION;
const char* cTempValue=T2A(m_cs_ZScaleCoeff);
m_pSO7_Proto->g_machine.s_machine_config.z_axis._scale_resolution = atof(cTempValue);
m_pSO7_Proto->Save_So7_Config();
}
void CSO7_UtilDlg::OnBnClickedButtonMotionParameter()
{
KillTimer(1);
@@ -1583,3 +1546,16 @@ void CSO7_UtilDlg::OnBnClickedButtonSo7TrigpulseReadPara()
m_pSO7_Proto->g_machine.TrigPara.TrigCurIndex,m_pSO7_Proto->g_machine.TrigPara.TrigCurPara);
OutputWithScroll(m_OutMessage,m_edMSG);
}
//======================================================
void CSO7_UtilDlg::OnBnClickedButtonSetScaleCoefficient()
{
UpdateData(TRUE);
USES_CONVERSION;
const char* cTempValue=T2A(m_cs_XScaleCoeff);
m_pSO7_Proto->g_machine.s_machine_config.x_axis._scale_resolution = atof(cTempValue);
cTempValue=T2A(m_cs_YScaleCoeff);
m_pSO7_Proto->g_machine.s_machine_config.y_axis._scale_resolution = atof(cTempValue);
cTempValue=T2A(m_cs_ZScaleCoeff);
m_pSO7_Proto->g_machine.s_machine_config.z_axis._scale_resolution = atof(cTempValue);
m_pSO7_Proto->Save_So7_Config();
}
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.h
+1 -3
View File
@@ -103,9 +103,6 @@ public:
afx_msg void OnBnClickedButtonSetResetFlag();
afx_msg void OnBnClickedButtonResetWorktableRight();
afx_msg void OnBnClickedButtonSetOutPort();
afx_msg void OnEnKillfocusEditXScaleCoefficient();
afx_msg void OnEnKillfocusEditYScaleCoefficient();
afx_msg void OnEnKillfocusEditZScaleCoefficient();
afx_msg void OnBnClickedButtonAutoZoom();
afx_msg void OnBnClickedButtonManualHome();
afx_msg void OnBnClickedButtonSetupSo7config();
@@ -134,4 +131,5 @@ public:
afx_msg void OnBnClickedRadioReadLimitSwitch();
afx_msg void OnBnClickedButtonSo7TrigpulseWritePara();
afx_msg void OnBnClickedButtonSo7TrigpulseReadPara();
afx_msg void OnBnClickedButtonSetScaleCoefficient();
};
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h
+3 -1
View File
@@ -986,6 +986,8 @@
#define IDC_BUTTON_SO7_TRIGPULSE_WRITE_PARA 1854
#define IDC_BUTTON5 1855
#define IDC_BUTTON_SO7_TRIGPULSE_READ_PARA 1855
#define IDC_BUTTON4 1856
#define IDC_BUTTON_SET_SCALE_COEFFICIENT 1856
#define IDC_BUTTON_DIY_EXIT_BUTTON 32740
#define ID_EDIT_SO7_CONFIG_MOTION 32741
@@ -995,7 +997,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 191
#define _APS_NEXT_COMMAND_VALUE 32771
#define _APS_NEXT_CONTROL_VALUE 1855
#define _APS_NEXT_CONTROL_VALUE 1857
#define _APS_NEXT_SYMED_VALUE 104
#endif
#endif