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

新增so7_config.ini文件的参数，CNC运动停顿判断开关。V7.7

Browse Source
This commit is contained in:
TAO Cheng
2014-03-21 15:04:39 +08:00
parent d61bee185c
commit ba1d352b60
10 changed files with 208 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp
+28
View File
@@ -599,6 +599,8 @@ SSI_STATUS_MOTION CSO7_Proto::so7_config_para_set_default()
g_machine.s_machine_config.motion.m_EQUIDIS_X=0;
g_machine.s_machine_config.motion.m_EQUIDIS_Y=0;
g_machine.s_machine_config.motion.m_EQUIDIS_Z=0;
g_machine.s_machine_config.motion.m_CNC_Deadlock_Solution=1;
g_machine.s_machine_config.motion.m_CNC_Deadlock_JudgeMaxCnts=6;
g_machine.s_machine_config.motion.m_TouchProbeEnable=0;
g_machine.s_machine_config.motion.m_JoyStickEnable=0;
g_machine.s_machine_config.motion.m_DebugOutputEnable=0;
@@ -2221,6 +2223,14 @@ SSI_STATUS_MOTION CSO7_Proto::Save_So7_Config()
fprintf(m_pOutFile,"%s", outBuff);
fprintf(m_pOutFile,"%d", g_machine.s_machine_config.motion.m_EQUIDIS_Z);
fprintf(m_pOutFile, "\n");
outBuff="CNC_DEADLOCK_SOLUTION=";
fprintf(m_pOutFile,"%s", outBuff);
fprintf(m_pOutFile,"%d", g_machine.s_machine_config.motion.m_CNC_Deadlock_Solution);
fprintf(m_pOutFile, "\n");
outBuff="CNC_DEADLOCK_MAX_CNTS=";
fprintf(m_pOutFile,"%s", outBuff);
fprintf(m_pOutFile,"%d", g_machine.s_machine_config.motion.m_CNC_Deadlock_JudgeMaxCnts);
fprintf(m_pOutFile, "\n");
outBuff="TOUCH_PROBE_ENABLE=";
fprintf(m_pOutFile,"%s", outBuff);
fprintf(m_pOutFile,"%d", g_machine.s_machine_config.motion.m_TouchProbeEnable);
@@ -2507,6 +2517,24 @@ SSI_STATUS_MOTION CSO7_Proto::Load_So7_Config()
g_machine.s_machine_config.motion.m_EQUIDIS_Z=atoi(cTemp);
}
}
else if (!_stricmp(token,"CNC_DEADLOCK_SOLUTION"))
{
token = strtok( NULL, seps);
if (token)
{
strcpy(cTemp,token);
g_machine.s_machine_config.motion.m_CNC_Deadlock_Solution=atoi(cTemp);
}
}
else if (!_stricmp(token,"CNC_DEADLOCK_MAX_CNTS"))
{
token = strtok( NULL, seps);
if (token)
{
strcpy(cTemp,token);
g_machine.s_machine_config.motion.m_CNC_Deadlock_JudgeMaxCnts=atoi(cTemp);
}
}
else if (!_stricmp(token,"TOUCH_PROBE_ENABLE"))
{
token = strtok( NULL, seps);
PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h
+2
View File
@@ -171,6 +171,8 @@ struct s_so7_machine_interface_config
INT m_EQUIDIS_X;
INT m_EQUIDIS_Y;
INT m_EQUIDIS_Z;
INT m_CNC_Deadlock_Solution;
INT m_CNC_Deadlock_JudgeMaxCnts;
INT m_TouchProbeEnable;
INT m_JoyStickEnable;
INT m_DebugOutputEnable;
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log
+71
View File
@@ -4396,3 +4396,74 @@ Construct 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
Init:Open device succeed .
_start_machine
Exit: Exit_SO7Usb
Destruct Cso7_Proto.
Construct Cso7_Proto.
Init:Open device succeed .
_start_machine
Exit: Exit_SO7Usb
Destruct Cso7_Proto.
Construct Cso7_Proto.
Init:Open device succeed .
_start_machine
Exit: Exit_SO7Usb
Destruct Cso7_Proto.
Construct Cso7_Proto.
Init:Open device succeed .
_start_machine
Exit: Exit_SO7Usb
Destruct Cso7_Proto.
Construct Cso7_Proto.
Init:Open device succeed .
_start_machine
Exit: Exit_SO7Usb
Destruct Cso7_Proto.
Construct Cso7_Proto.
Init:Open device succeed .
_start_machine
Exit: Exit_SO7Usb
Destruct Cso7_Proto.
Construct Cso7_Proto.
Init:Open device succeed .
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/so7_config.ini
+2
View File
@@ -24,6 +24,8 @@ ACCURA_ERROR_PULSE_Z=1
EQUIDISTANCE_PULSE_X=0
EQUIDISTANCE_PULSE_Y=0
EQUIDISTANCE_PULSE_Z=0
CNC_DEADLOCK_SOLUTION=1
CNC_DEADLOCK_MAX_CNTS=6
TOUCH_PROBE_ENABLE=0
JOYSTICK_ENABLE=0
DEBUG_LOG_ENABLE=0
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc
+8 -8
View File
@@ -16,7 +16,7 @@
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
// 中文(简体，中国) resources
// Chinese (Simplified, PRC) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS)
LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
@@ -1517,12 +1517,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 // 中文(简体，中国) resources
#endif // Chinese (Simplified, PRC) resources
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// 英语(美国) resources
// English (United States) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
@@ -2417,8 +2417,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 7,5,0,0
PRODUCTVERSION 7,5,0,0
FILEVERSION 7,7,0,0
PRODUCTVERSION 7,7,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -2435,12 +2435,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Hexagon Metrology"
VALUE "FileDescription", "Utility for Hexagon Metrology"
VALUE "FileVersion", "7.5.0.0"
VALUE "FileVersion", "7.7.0.0"
VALUE "InternalName", "Usb_Util.exe"
VALUE "LegalCopyright", "Copyright 2014 Hexagon Metrology."
VALUE "OriginalFilename", "Usb_Util.exe"
VALUE "ProductName", "Utility"
VALUE "ProductVersion", "7.5.0.0"
VALUE "ProductVersion", "7.7.0.0"
END
END
BLOCK "VarFileInfo"
@@ -2465,7 +2465,7 @@ BEGIN
IDS_SO7_ABOUTBOX "&About Utility for SO7..."
END
#endif // 英语(美国) resources
#endif // English (United States) resources
/////////////////////////////////////////////////////////////////////////////
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SetSo7MotionConfig.cpp
+76 -52
View File
@@ -48,10 +48,10 @@ BOOL CSetSo7MotionConfig::OnInitDialog()
m_ConfigList.GetClientRect(&m_rect); //获取list的客户区
m_ConfigList.SetExtendedStyle(LVS_EX_GRIDLINES|LVS_EX_FULLROWSELECT); //设置list风格
m_ConfigList.InsertColumn(0,_T("编号"),LVCFMT_LEFT, m_rect.right/20);
m_ConfigList.InsertColumn(1,_T("参数名"),LVCFMT_LEFT, m_rect.right*6/20);
m_ConfigList.InsertColumn(2,_T("值"),LVCFMT_LEFT, m_rect.right*2/20);
m_ConfigList.InsertColumn(3,_T("描述"),LVCFMT_LEFT, m_rect.right*11/20);
m_ConfigList.InsertColumn(0,_T("编号"),LVCFMT_LEFT, m_rect.right*2/40);
m_ConfigList.InsertColumn(1,_T("参数名"),LVCFMT_LEFT, m_rect.right*12/40);
m_ConfigList.InsertColumn(2,_T("值"),LVCFMT_LEFT, m_rect.right*3/40);
m_ConfigList.InsertColumn(3,_T("描述"),LVCFMT_LEFT, m_rect.right*22/40);
for (int i = 1; i < 100; i++)
{
@@ -61,8 +61,8 @@ BOOL CSetSo7MotionConfig::OnInitDialog()
}
UpdateLabelName();
UpdateDataValue();
m_ConfigList.SetEditableItemRange(0,20,2,2);
m_ConfigList.SetColorStyleItemRange(0,22,0,3);
m_ConfigList.SetEditableItemRange(0,22,2,2);
m_ConfigList.SetColorStyleItemRange(0,24,0,3);
return TRUE;
}
@@ -71,141 +71,153 @@ void CSetSo7MotionConfig::UpdateLabelName()
int iRow=0;
int iCol=1;
CString cStr("");
cStr="CLOSE_LOOP_ENABLED";
cStr=L"CLOSE_LOOP_ENABLED";
m_ConfigList.SetItemText(iRow,iCol,cStr);
cStr="软件闭环判断功能；0：禁用，1：使能；默认值：0";
cStr=L"软件闭环判断功能；0：禁用，1：使能；默认值：0";
m_ConfigList.SetItemText(iRow,iCol+2,cStr);
iRow++;
cStr="MOTION_RETRY_TIMES";
cStr=L"MOTION_RETRY_TIMES";
m_ConfigList.SetItemText(iRow,iCol,cStr);
cStr="软件闭环判断重试次数；有效范围:0-255；默认值：0";
cStr=L"软件闭环判断重试次数；有效范围:0-255；默认值：0";
m_ConfigList.SetItemText(iRow,iCol+2,cStr);
iRow++;
cStr="SHIFT_POSITION_X";
cStr=L"SHIFT_POSITION_X";
m_ConfigList.SetItemText(iRow,iCol,cStr);
cStr="软件闭环判断X偏移距离(mm)；有效范围:0-65535；默认值：0";
cStr=L"软件闭环判断X偏移距离(mm)；有效范围:0-65535；默认值：0";
m_ConfigList.SetItemText(iRow,iCol+2,cStr);
iRow++;
cStr="SHIFT_POSITION_Y";
cStr=L"SHIFT_POSITION_Y";
m_ConfigList.SetItemText(iRow,iCol,cStr);
cStr="软件闭环判断Y偏移距离(mm)；有效范围:0-65535；默认值：0";
cStr=L"软件闭环判断Y偏移距离(mm)；有效范围:0-65535；默认值：0";
m_ConfigList.SetItemText(iRow,iCol+2,cStr);
iRow++;
cStr="SHIFT_POSITION_Z";
cStr=L"SHIFT_POSITION_Z";
m_ConfigList.SetItemText(iRow,iCol,cStr);
cStr="软件闭环判断Z偏移距离(mm)；有效范围:0-65535；默认值：0";
cStr=L"软件闭环判断Z偏移距离(mm)；有效范围:0-65535；默认值：0";
m_ConfigList.SetItemText(iRow,iCol+2,cStr);
iRow++;
cStr="GET_USB_MESSAGE_METHOD";
cStr=L"GET_USB_MESSAGE_METHOD";
m_ConfigList.SetItemText(iRow,iCol,cStr);
cStr="USB读取消息方式；0：中断方式，1：查询方式；默认值：1";
cStr=L"USB读取消息方式；0:Firmware V3.X,1:Firmware V6.X；默认值：1";
m_ConfigList.SetItemText(iRow,iCol+2,cStr);
iRow++;
cStr="WRITE_DATA_SLEEP_TIME";
cStr=L"WRITE_DATA_SLEEP_TIME";
m_ConfigList.SetItemText(iRow,iCol,cStr);
cStr="USB通信休息时间（ms）；有效范围:0-255；默认值：0";
cStr=L"USB通信休息时间（ms）；有效范围:0-255；默认值：0";
m_ConfigList.SetItemText(iRow,iCol+2,cStr);
iRow++;
cStr="ACCURA_ERROR_PULSE_X";
cStr=L"ACCURA_ERROR_PULSE_X";
m_ConfigList.SetItemText(iRow,iCol,cStr);
cStr="允许定位误差脉冲数；有效范围:1-255；默认值：1";
cStr=L"允许定位误差脉冲数；有效范围:1-255；默认值：1";
m_ConfigList.SetItemText(iRow,iCol+2,cStr);
iRow++;
cStr="ACCURA_ERROR_PULSE_Y";
cStr=L"ACCURA_ERROR_PULSE_Y";
m_ConfigList.SetItemText(iRow,iCol,cStr);
cStr="允许定位误差脉冲数；有效范围:1-255；默认值：1";
cStr=L"允许定位误差脉冲数；有效范围:1-255；默认值：1";
m_ConfigList.SetItemText(iRow,iCol+2,cStr);
iRow++;
cStr="ACCURA_ERROR_PULSE_Z";
cStr=L"ACCURA_ERROR_PULSE_Z";
m_ConfigList.SetItemText(iRow,iCol,cStr);
cStr="允许定位误差脉冲数；有效范围:1-255；默认值：1";
cStr=L"允许定位误差脉冲数；有效范围:1-255；默认值：1";
m_ConfigList.SetItemText(iRow,iCol+2,cStr);
iRow++;
cStr="EQUIDISTANCE_PULSE_X";
cStr=L"EQUIDISTANCE_PULSE_X";
m_ConfigList.SetItemText(iRow,iCol,cStr);
cStr="输出等间距脉冲；有效范围:0-255；默认值：0";
cStr=L"输出等间距脉冲；有效范围:0-255；默认值：0";
m_ConfigList.SetItemText(iRow,iCol+2,cStr);
iRow++;
cStr="EQUIDISTANCE_PULSE_Y";
cStr=L"EQUIDISTANCE_PULSE_Y";
m_ConfigList.SetItemText(iRow,iCol,cStr);
cStr="输出等间距脉冲；有效范围:0-255；默认值：0";
cStr=L"输出等间距脉冲；有效范围:0-255；默认值：0";
m_ConfigList.SetItemText(iRow,iCol+2,cStr);
iRow++;
cStr="EQUIDISTANCE_PULSE_Z";
cStr=L"EQUIDISTANCE_PULSE_Z";
m_ConfigList.SetItemText(iRow,iCol,cStr);
cStr="输出等间距脉冲；有效范围:0-255；默认值：0";
cStr=L"输出等间距脉冲；有效范围:0-255；默认值：0";
m_ConfigList.SetItemText(iRow,iCol+2,cStr);
iRow++;
cStr="TOUCH_PROBE_ENABLE";
cStr=L"CNC_DEADLOCK_SOLUTION";
m_ConfigList.SetItemText(iRow,iCol,cStr);
cStr="接触探针功能；0：禁用，1：使能；默认值：0";
cStr=L"解决CNC运行停顿问题；0：禁用，1：启用；默认值：1";
m_ConfigList.SetItemText(iRow,iCol+2,cStr);
iRow++;
cStr=L"CNC_DEADLOCK_MAX_CNTS";
m_ConfigList.SetItemText(iRow,iCol,cStr);
cStr=L"CNC运行停顿判断次数；有效范围:1-255；默认值：6";
m_ConfigList.SetItemText(iRow,iCol+2,cStr);
iRow++;
cStr=L"TOUCH_PROBE_ENABLE";
m_ConfigList.SetItemText(iRow,iCol,cStr);
cStr=L"接触探针功能；0：禁用，1：使能；默认值：0";
m_ConfigList.SetItemText(iRow,iCol+2,cStr);
iRow++;
cStr="JOYSTICK_ENABLE";
cStr=L"JOYSTICK_ENABLE";
m_ConfigList.SetItemText(iRow,iCol,cStr);
cStr="摇杆功能；0：禁用，1：使能；默认值：0";
cStr=L"摇杆功能；0：禁用，1：使能；默认值：0";
m_ConfigList.SetItemText(iRow,iCol+2,cStr);
iRow++;
cStr="DEBUG_LOG_ENABLE";
cStr=L"DEBUG_LOG_ENABLE";
m_ConfigList.SetItemText(iRow,iCol,cStr);
cStr="软件运行记录功能；0：禁用，1：使能；默认值：0";
cStr=L"软件运行记录功能；0：禁用，1：使能；默认值：0";
m_ConfigList.SetItemText(iRow,iCol+2,cStr);
iRow++;
//=================VIDEOCARD==================
cStr="SDK3000_SLEEP_COUNT";
cStr=L"SDK3000_SLEEP_COUNT";
m_ConfigList.SetItemText(iRow,iCol,cStr);
cStr="SDK3000去条纹参数；有效范围:500000-700000；默认值：550000";
cStr=L"SDK3000去条纹参数；有效范围:500000-700000；默认值：550000";
m_ConfigList.SetItemText(iRow,iCol+2,cStr);
iRow++;
cStr="SV4000E_DENOISE_PARA_CHANNEL1";
cStr=L"SV4000E_DENOISE_PARA_CHANNEL1";
m_ConfigList.SetItemText(iRow,iCol,cStr);
cStr="SV4000E降噪参数；有效范围:5-100；默认值：70";
cStr=L"SV4000E降噪参数；有效范围:5-100；默认值：70";
m_ConfigList.SetItemText(iRow,iCol+2,cStr);
iRow++;
cStr="SV4000E_DENOISE_PARA_CHANNEL2";
cStr=L"SV4000E_DENOISE_PARA_CHANNEL2";
m_ConfigList.SetItemText(iRow,iCol,cStr);
cStr="SV4000E降噪参数；有效范围:5-100；默认值：70";
cStr=L"SV4000E降噪参数；有效范围:5-100；默认值：70";
m_ConfigList.SetItemText(iRow,iCol+2,cStr);
iRow++;
cStr="SV4000E_DENOISE_PARA_CHANNEL3";
cStr=L"SV4000E_DENOISE_PARA_CHANNEL3";
m_ConfigList.SetItemText(iRow,iCol,cStr);
cStr="SV4000E降噪参数；有效范围:5-100；默认值：70";
cStr=L"SV4000E降噪参数；有效范围:5-100；默认值：70";
m_ConfigList.SetItemText(iRow,iCol+2,cStr);
iRow++;
cStr="SV4000E_DENOISE_PARA_CHANNEL4";
cStr=L"SV4000E_DENOISE_PARA_CHANNEL4";
m_ConfigList.SetItemText(iRow,iCol,cStr);
cStr="SV4000E降噪参数；有效范围:5-100；默认值：70";
cStr=L"SV4000E降噪参数；有效范围:5-100；默认值：70";
m_ConfigList.SetItemText(iRow,iCol+2,cStr);
iRow++;
cStr="MACHINE_CONTROLLER_TYPE";
cStr=L"MACHINE_CONTROLLER_TYPE";
m_ConfigList.SetItemText(iRow,iCol,cStr);
cStr="控制器类型；保留项；默认值：0";
cStr=L"控制器类型；保留项；默认值：0";
m_ConfigList.SetItemText(iRow,iCol+2,cStr);
iRow++;
cStr="MACHINE_VIDEOCARD_TYPE";
cStr=L"MACHINE_VIDEOCARD_TYPE";
m_ConfigList.SetItemText(iRow,iCol,cStr);
cStr="视频卡类型；保留项；默认值：0";
cStr=L"视频卡类型；保留项；默认值：0";
m_ConfigList.SetItemText(iRow,iCol+2,cStr);
iRow++;
}
@@ -240,6 +252,10 @@ void CSetSo7MotionConfig::UpdateDataValue()
m_ConfigList.SetItemText(iRow++,iCol,cStr);
cStr.Format(_T("%d"),m_pSO7_Proto->g_machine.s_machine_config.motion.m_EQUIDIS_Z);
m_ConfigList.SetItemText(iRow++,iCol,cStr);
cStr.Format(_T("%d"),m_pSO7_Proto->g_machine.s_machine_config.motion.m_CNC_Deadlock_Solution);
m_ConfigList.SetItemText(iRow++,iCol,cStr);
cStr.Format(_T("%d"),m_pSO7_Proto->g_machine.s_machine_config.motion.m_CNC_Deadlock_JudgeMaxCnts);
m_ConfigList.SetItemText(iRow++,iCol,cStr);
cStr.Format(_T("%d"),m_pSO7_Proto->g_machine.s_machine_config.motion.m_TouchProbeEnable);
m_ConfigList.SetItemText(iRow++,iCol,cStr);
cStr.Format(_T("%d"),m_pSO7_Proto->g_machine.s_machine_config.motion.m_JoyStickEnable);
@@ -327,6 +343,14 @@ void CSetSo7MotionConfig::SaveDataValue()
iRow++;
cStr=m_ConfigList.GetItemText(iRow,iCol);
cTemp=T2A(cStr);
m_pSO7_Proto->g_machine.s_machine_config.motion.m_CNC_Deadlock_Solution=atoi(cTemp);
iRow++;
cStr=m_ConfigList.GetItemText(iRow,iCol);
cTemp=T2A(cStr);
m_pSO7_Proto->g_machine.s_machine_config.motion.m_CNC_Deadlock_JudgeMaxCnts=atoi(cTemp);
iRow++;
cStr=m_ConfigList.GetItemText(iRow,iCol);
cTemp=T2A(cStr);
m_pSO7_Proto->g_machine.s_machine_config.motion.m_TouchProbeEnable=atoi(cTemp);
iRow++;
cStr=m_ConfigList.GetItemText(iRow,iCol);
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Option.cpp
+6 -5
View File
@@ -190,11 +190,6 @@ void CSo7_Option::OnBnClickedOk()
{
delete m_pSO7_Proto;
m_pSO7_Proto=NULL;
}
if (m_pSO7_Proto_Aux)
{
delete m_pSO7_Proto_Aux;
m_pSO7_Proto_Aux = NULL;
}
if (m_pEF8000_Interface)
{
@@ -212,6 +207,12 @@ void CSo7_Option::OnBnClickedOk()
So7_UtilUsbCtlR* pSo7_UtilUsbCtlR=new So7_UtilUsbCtlR();
pSo7_UtilUsbCtlR->DoModal();
delete pSo7_UtilUsbCtlR;
if (m_pSO7_Proto_Aux)
{
delete m_pSO7_Proto_Aux;
m_pSO7_Proto_Aux=nullptr;
}
}
else if (((CButton *)GetDlgItem(IDC_RADIO__SO7_RS232))->GetCheck())
{
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_UtilUsbCtlR.cpp
+9 -7
View File
@@ -59,16 +59,18 @@ BOOL So7_UtilUsbCtlR::OnInitDialog()
//=====================================================================================
void So7_UtilUsbCtlR::OnBnClickedButtonStartSo7RMachine()
{
SSI_STATUS_MOTION rStatus=SSI_STATUS_UNKNOWN_ERROR;
if (m_pSO7_Proto_Aux)
{
m_pSO7_Proto_Aux->Init_SO7Usb();
rStatus=m_pSO7_Proto_Aux->Init_SO7Usb();
}
m_pSO7_Proto_Aux->_send_cmd_SO7_CMD_RESET_R(0);
UpdateCtrlsStatus(TRUE);
UpdateR1CtrlsStatus(FALSE);
UpdateR2CtrlsStatus(FALSE);
if (rStatus==SSI_STATUS_MOTION_NORMAL)
{
m_pSO7_Proto_Aux->_send_cmd_SO7_CMD_RESET_R(0);
UpdateCtrlsStatus(TRUE);
UpdateR1CtrlsStatus(FALSE);
UpdateR2CtrlsStatus(FALSE);
}
}
//=====================================================================================
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Usb_Util.vcxproj.filters
+6 -2
View File
@@ -196,10 +196,12 @@
<ClCompile Include="So7_XBoxController.cpp">
<Filter>Sources Files</Filter>
</ClCompile>
<ClCompile Include="So7_UtilUsbCtlR.cpp" />
<ClCompile Include="..\..\..\SevenOcean\SO7_Proto_Aux.cpp">
<Filter>Sources Files</Filter>
</ClCompile>
<ClCompile Include="So7_UtilUsbCtlR.cpp">
<Filter>Sources Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="CaptureDataDlg.h">
@@ -430,10 +432,12 @@
<ClInclude Include="So7_XBoxController.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="So7_UtilUsbCtlR.h" />
<ClInclude Include="..\..\..\SevenOcean\SO7_Proto_Aux.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="So7_UtilUsbCtlR.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="ReadMe.txt" />
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo
BIN
View File
Binary file not shown.