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

新增so7_config.ini文件的参数，debuglog开关，摇杆开关，探头开关。

Browse Source
This commit is contained in:
TAO Cheng
2014-03-11 17:36:17 +08:00
parent ad05ad7437
commit 447aa91fd9
5 changed files with 100 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc
+4 -4
View File
@@ -2374,8 +2374,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 7,2,0,0
PRODUCTVERSION 7,2,0,0
FILEVERSION 7,3,0,0
PRODUCTVERSION 7,3,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -2392,12 +2392,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Hexagon Metrology"
VALUE "FileDescription", "Utility for Hexagon Metrology"
VALUE "FileVersion", "7.2.0.0"
VALUE "FileVersion", "7.3.0.0"
VALUE "InternalName", "Usb_Util.exe"
VALUE "LegalCopyright", "Copyright 2014 Hexagon Metrology."
VALUE "OriginalFilename", "Usb_Util.exe"
VALUE "ProductName", "Utility"
VALUE "ProductVersion", "7.2.0.0"
VALUE "ProductVersion", "7.3.0.0"
END
END
BLOCK "VarFileInfo"
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SetSo7MotionConfig.cpp
+42 -5
View File
@@ -60,7 +60,7 @@ BOOL CSetSo7MotionConfig::OnInitDialog()
}
UpdateLabelName();
UpdateDataValue();
m_ConfigList.SetMaxItemIndex(0,17,2,2);
m_ConfigList.SetMaxItemIndex(0,20,2,2);
return TRUE;
}
@@ -147,6 +147,23 @@ void CSetSo7MotionConfig::UpdateLabelName()
m_ConfigList.SetItemText(iRow,iCol+2,cStr);
iRow++;
cStr="TOUCH_PROBE_ENABLE";
m_ConfigList.SetItemText(iRow,iCol,cStr);
cStr="0:Disable,1:Enable";
m_ConfigList.SetItemText(iRow,iCol+2,cStr);
iRow++;
cStr="JOYSTICK_ENABLE";
m_ConfigList.SetItemText(iRow,iCol,cStr);
cStr="0:Disable,1:Enable";
m_ConfigList.SetItemText(iRow,iCol+2,cStr);
iRow++;
cStr="DEBUG_LOG_ENABLE";
m_ConfigList.SetItemText(iRow,iCol,cStr);
cStr="0:Disable,1:Enable";
m_ConfigList.SetItemText(iRow,iCol+2,cStr);
iRow++;
//=================VIDEOCARD==================
cStr="SDK3000_SLEEP_COUNT";
m_ConfigList.SetItemText(iRow,iCol,cStr);
@@ -156,25 +173,25 @@ void CSetSo7MotionConfig::UpdateLabelName()
cStr="SV4000E_DENOISE_PARA_CHANNEL1";
m_ConfigList.SetItemText(iRow,iCol,cStr);
cStr="default:70";
cStr="effective range:5-100;default:70";
m_ConfigList.SetItemText(iRow,iCol+2,cStr);
iRow++;
cStr="SV4000E_DENOISE_PARA_CHANNEL2";
m_ConfigList.SetItemText(iRow,iCol,cStr);
cStr="default:70";
cStr="effective range:5-100;default:70";
m_ConfigList.SetItemText(iRow,iCol+2,cStr);
iRow++;
cStr="SV4000E_DENOISE_PARA_CHANNEL3";
m_ConfigList.SetItemText(iRow,iCol,cStr);
cStr="default:70";
cStr="effective range:5-100;default:70";
m_ConfigList.SetItemText(iRow,iCol+2,cStr);
iRow++;
cStr="SV4000E_DENOISE_PARA_CHANNEL4";
m_ConfigList.SetItemText(iRow,iCol,cStr);
cStr="default:70";
cStr="effective range:5-100;default:70";
m_ConfigList.SetItemText(iRow,iCol+2,cStr);
iRow++;
}
@@ -209,6 +226,13 @@ 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_TouchProbeEnable);
m_ConfigList.SetItemText(iRow++,iCol,cStr);
cStr.Format(_T("%d"),m_pSO7_Proto->g_machine.s_machine_config.motion.m_JoyStickEnable);
m_ConfigList.SetItemText(iRow++,iCol,cStr);
cStr.Format(_T("%d"),m_pSO7_Proto->g_machine.s_machine_config.motion.m_DebugOutputEnable);
m_ConfigList.SetItemText(iRow++,iCol,cStr);
cStr.Format(_T("%d"),m_pSO7_Proto->g_machine.s_machine_config.motion.m_SDK3000_CntThreadSleepVal);
m_ConfigList.SetItemText(iRow++,iCol,cStr);
cStr.Format(_T("%d"),m_pSO7_Proto->g_machine.s_machine_config.motion.m_SV4000E_DenoisePara[0]);
@@ -280,6 +304,19 @@ void CSetSo7MotionConfig::SaveDataValue()
cStr=m_ConfigList.GetItemText(iRow,iCol);
cTemp=T2A(cStr);
m_pSO7_Proto->g_machine.s_machine_config.motion.m_EQUIDIS_Z=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);
cTemp=T2A(cStr);
m_pSO7_Proto->g_machine.s_machine_config.motion.m_JoyStickEnable=atoi(cTemp);
iRow++;
cStr=m_ConfigList.GetItemText(iRow,iCol);
cTemp=T2A(cStr);
m_pSO7_Proto->g_machine.s_machine_config.motion.m_DebugOutputEnable=atoi(cTemp);
iRow++;
cStr=m_ConfigList.GetItemText(iRow,iCol);
cTemp=T2A(cStr);