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

新增CCS-PRIMA使能参数设置。

Browse Source
This commit is contained in:
TAO Cheng
2014-06-04 14:35:27 +08:00
parent ff4f68d009
commit 59d5b292a2
10 changed files with 101 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SetSo7MotionConfig.cpp
+14 -2
View File
@@ -61,8 +61,8 @@ BOOL CSetSo7MotionConfig::OnInitDialog()
}
UpdateLabelName();
UpdateDataValue();
m_ConfigList.SetEditableItemRange(0,36,2,2);
m_ConfigList.SetColorStyleItemRange(0,36,0,3);
m_ConfigList.SetEditableItemRange(0,37,2,2);
m_ConfigList.SetColorStyleItemRange(0,37,0,3);
return TRUE;
}
@@ -178,6 +178,12 @@ void CSetSo7MotionConfig::UpdateLabelName()
cStr=L"摇杆功能；0：禁用，1：使能；默认值：0";
m_ConfigList.SetItemText(iRow,iCol+2,cStr);
iRow++;
cStr=L"CCS_PRIMA_ENABLE";
m_ConfigList.SetItemText(iRow,iCol,cStr);
cStr=L"CCS-PRIMA激光；0：禁用，1：使能；默认值：0";
m_ConfigList.SetItemText(iRow,iCol+2,cStr);
iRow++;
cStr=L"DEBUG_LOG_ENABLE";
m_ConfigList.SetItemText(iRow,iCol,cStr);
@@ -334,6 +340,8 @@ void CSetSo7MotionConfig::UpdateDataValue()
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_STIL_CCS_PRIMA_Enable);
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);
@@ -462,6 +470,10 @@ void CSetSo7MotionConfig::SaveDataValue()
iRow++;
cStr=m_ConfigList.GetItemText(iRow,iCol);
cTemp=T2A(cStr);
m_pSO7_Proto->g_machine.s_machine_config.motion.m_STIL_CCS_PRIMA_Enable=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++;
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Option.cpp
+2 -2
View File
@@ -23,11 +23,11 @@
#include "Videocard_TC4000.h"
#include "..\..\..\Videocard\SV4000E\SV4000E.h"
#include "Videocard_SV4000E.h"
#endif //_RELEASE_FULL_VERSION
#include "..\..\..\STIL\Common\inc\cAcqEasy.h"
#include "..\..\..\STIL\STIL_CCS_PRIMA_Laser.h"
#include "STIL_CCS_PRIMA_Dlg.h"
#endif //_RELEASE_FULL_VERSION
#include "SO7_UtilDlg.h"
#include "So7_UtilUsbCtlR.h"
#include "..\..\..\Keyence\Keyence_Laser.h"
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil_VS2010.sln
+6 -2
View File
@@ -6,8 +6,14 @@ EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MachineInterfaceDll", "MachineInterfaceDll\MachineInterfaceDll.vcxproj", "{A945B062-6081-49F0-992D-D14769C4C7D4}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Win32TestDll", "Win32TestDll\Win32TestDll.vcxproj", "{BF02B850-BB32-4635-9E53-8583C474884D}"
ProjectSection(ProjectDependencies) = postProject
{A945B062-6081-49F0-992D-D14769C4C7D4} = {A945B062-6081-49F0-992D-D14769C4C7D4}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleTestDll", "ConsoleTestDll\ConsoleTestDll.csproj", "{5E3B7ED1-B324-4966-8527-D29873AC3815}"
ProjectSection(ProjectDependencies) = postProject
{A945B062-6081-49F0-992D-D14769C4C7D4} = {A945B062-6081-49F0-992D-D14769C4C7D4}
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -72,7 +78,6 @@ Global
{A945B062-6081-49F0-992D-D14769C4C7D4}.ReleaseSO7|Mixed Platforms.ActiveCfg = Release|Win32
{A945B062-6081-49F0-992D-D14769C4C7D4}.ReleaseSO7|Mixed Platforms.Build.0 = Release|Win32
{A945B062-6081-49F0-992D-D14769C4C7D4}.ReleaseSO7|Win32.ActiveCfg = Release|Win32
{A945B062-6081-49F0-992D-D14769C4C7D4}.ReleaseSO7|Win32.Build.0 = Release|Win32
{A945B062-6081-49F0-992D-D14769C4C7D4}.ReleaseSO7|x64.ActiveCfg = Release|Win32
{A945B062-6081-49F0-992D-D14769C4C7D4}.ReleaseSO7|x86.ActiveCfg = Release|Win32
{A945B062-6081-49F0-992D-D14769C4C7D4}.Template|Mixed Platforms.ActiveCfg = Release|Win32
@@ -96,7 +101,6 @@ Global
{BF02B850-BB32-4635-9E53-8583C474884D}.ReleaseSO7|Mixed Platforms.ActiveCfg = Release|Win32
{BF02B850-BB32-4635-9E53-8583C474884D}.ReleaseSO7|Mixed Platforms.Build.0 = Release|Win32
{BF02B850-BB32-4635-9E53-8583C474884D}.ReleaseSO7|Win32.ActiveCfg = Release|Win32
{BF02B850-BB32-4635-9E53-8583C474884D}.ReleaseSO7|Win32.Build.0 = Release|Win32
{BF02B850-BB32-4635-9E53-8583C474884D}.ReleaseSO7|x64.ActiveCfg = Release|Win32
{BF02B850-BB32-4635-9E53-8583C474884D}.ReleaseSO7|x86.ActiveCfg = Release|Win32
{BF02B850-BB32-4635-9E53-8583C474884D}.Template|Mixed Platforms.ActiveCfg = Release|Win32
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo
BIN
View File
Binary file not shown.