去除配置so7_config的功能。

PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp

@@ -2166,7 +2166,7 @@ SSI_STATUS_MOTION CSO7_Proto::Save_So7_Config()
   char *outBuff = NULL;
   CString csAppPath;
   GetAppPath(csAppPath);
-  CString cFileName=csAppPath+_T("\\so7_config.ini");
+  CString cFileName=csAppPath+_T("\\UtilitySo7Config.ini");
   _wfopen_s(&m_pOutFile, cFileName, _T("wt"));
   if (!m_pOutFile)
   {
@@ -2400,7 +2400,7 @@ SSI_STATUS_MOTION CSO7_Proto::Save_So7_Config()
   return SSI_STATUS_MOTION_NORMAL;
 }
 //******************************************************************************
-SSI_STATUS_MOTION CSO7_Proto::Load_So7_Config()
+SSI_STATUS_MOTION CSO7_Proto::Load_So7_Config(int _FileName)
 {
   FILE   *hConfigFile = NULL;
   char    szLine[MAX_BUFF_SIZE];
@@ -2409,7 +2409,15 @@ SSI_STATUS_MOTION CSO7_Proto::Load_So7_Config()
   char   cTemp[30]={0};
   CString csAppPath;
   GetAppPath(csAppPath);
-  CString csSO7ConfigFile =csAppPath+_T("\\so7_config.ini");
+  CString csSO7ConfigFile(_T(""));
+  if (_FileName==1)
+  {
+    csSO7ConfigFile=csAppPath+_T("\\so7_config.ini");
+  } 
+  else
+  {
+    csSO7ConfigFile=csAppPath+_T("\\UtilitySo7Config.ini");
+  }
   _wfopen_s(&hConfigFile,csSO7ConfigFile,_T("rt"));
   if(hConfigFile)
   {
@@ -4485,7 +4493,7 @@ SSI_STATUS_MOTION CSO7_Proto::_calculate_straightline_motion(double dSpeedMM)
 {
   CString csAppPath;
   GetAppPath(csAppPath);
-  CString csSO7ConfigFile = csAppPath + _T("\\Utility_Config.ini");
+  CString csSO7ConfigFile = csAppPath + _T("\\Utility_config.ini");
   Load_SevenOcean_Inifile(csSO7ConfigFile);
 
   g_machine.s_machine_config.x_axis._speed_max[0]=static_cast<char>(g_machine.s_machine_config.x_axis._speed_max[0]*dSpeedMM);

PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.h

@@ -453,7 +453,7 @@ public:
 	SSI_STATUS_MOTION _process_replay_capture_commands(char *inBuff, FILE* pInFile);
 	SSI_STATUS_MOTION Load_SevenOcean_Inifile(CString csSO7INIFile);
 	SSI_STATUS_MOTION Save_SevenOcean_Inifile(CString csSO7INIFile);
-  SSI_STATUS_MOTION Load_So7_Config();
+  SSI_STATUS_MOTION Load_So7_Config(int _FileName=0);
   SSI_STATUS_MOTION Save_So7_Config();
 	SSI_STATUS_MOTION GetAppPath(CString &Path);
 	SSI_STATUS_MOTION ExtractAppPath(CString &Path);

PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/MachineInterfaceDll/MachineInterfaceDll.cpp

@@ -36,7 +36,7 @@ extern "C" EXP_IMP SSI_STATUS_MOTION Machine_Startup(bool bOfflineOnly,EHOME_MAC
       m_pSO7_Proto->_start_machine();
       if (rStatus==SSI_STATUS_MOTION_NORMAL)
       {
-        rStatus=m_pSO7_Proto->Load_So7_Config();
+        rStatus=m_pSO7_Proto->Load_So7_Config(1);
         rStatus=LoadMotionParameter();
         if (rStatus==SSI_STATUS_MOTION_NORMAL)
         {

PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc

@@ -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
@@ -128,7 +128,7 @@ BEGIN
     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,28,94,63,25,BS_MULTILINE
+    PUSHBUTTON      "配置INI文件",IDC_BUTTON_SETUP_SO7CONFIG,28,94,63,25,BS_MULTILINE
     LTEXT           "1",IDC_STATIC_IO_ADDR1,403,28,8,8
     LTEXT           "2",IDC_STATIC_IO_ADDR2,403,44,8,8
     LTEXT           "3",IDC_STATIC_IO_ADDR3,403,60,8,8
@@ -1848,12 +1848,12 @@ BEGIN
     IDS_SO7_ABOUTBOX        "&About Utility for SO7..."
 END
 
-#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
@@ -2812,7 +2812,7 @@ BEGIN
     END
 END
 
-#endif    // 英语(美国) resources
+#endif    // English (United States) resources
 /////////////////////////////////////////////////////////////////////////////
 
 

PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SetSo7MotionConfig.cpp

@@ -558,7 +558,7 @@ void CSetSo7MotionConfig::OnBnClickedButtonSo7MotionConfigOk()
   CString m_csMsg=_T("");
   m_pSO7_Proto->Save_So7_Config();
   m_pSO7_Proto->GetAppPath(m_csMsg);
-  m_csMsg=_T("配置文件保存在:")+m_csMsg+_T("\\so7_config.ini。");
+  m_csMsg=_T("配置文件保存在:")+m_csMsg+_T("\\UtilitySo7Config.ini。");
   OutputWithScroll(m_csMsg,m_edit_MsgOut);
 }
 void CSetSo7MotionConfig::OnBnClickedButtonSo7MotionConfigSetDefault()

PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Option.cpp

@@ -148,16 +148,18 @@ BOOL CSo7_Option::OnInitDialog()
   ((CButton *)GetDlgItem(IDC_RADIO_VIDEOCARD_TC4000))->SetCheck(FALSE);
   ((CButton *)GetDlgItem(IDC_RADIO_VIDEOCARD_MV900))->SetCheck(FALSE);
   ((CButton *)GetDlgItem(IDC_RADIO_SO7_IP_CAMERA))->SetCheck(FALSE);
-  ((CButton *)GetDlgItem(IDC_RADIO_CONTROLLER))->SetCheck(FALSE);
+  ((CButton *)GetDlgItem(IDC_RADIO_CONTROLLER))->SetCheck(TRUE);
   ((CButton *)GetDlgItem(IDC_RADIO__SO7_RS232))->SetCheck(FALSE);
   ((CButton *)GetDlgItem(IDC_RADIO_KEYENCE_LASER))->SetCheck(FALSE);
   ((CButton *)GetDlgItem(IDC_RADIO_SO7_VERIFICATION_ALGORITHM))->SetCheck(FALSE);
   ((CButton *)GetDlgItem(IDC_RADIO_TEST_IMAGE_DLL))->SetCheck(FALSE);
   ((CButton *)GetDlgItem(IDC_RADIO_ART_PCI8622))->SetCheck(FALSE);
   ((CButton *)GetDlgItem(IDC_RADIO_SO7_OMRON_PLC))->SetCheck(FALSE);
-  ((CButton *)GetDlgItem(IDC_RADIO_SO7_OMRON_PLC_SERVER))->SetCheck(TRUE);
+  ((CButton *)GetDlgItem(IDC_RADIO_SO7_OMRON_PLC_SERVER))->SetCheck(FALSE);
   
 #ifdef _RELEASE_SO7_CONTROLER_ONLY
+  ((CButton *)GetDlgItem(IDC_RADIO_SO7_OMRON_PLC))->EnableWindow(FALSE);
+  ((CButton *)GetDlgItem(IDC_RADIO_SO7_OMRON_PLC_SERVER))->EnableWindow(FALSE);
   ((CButton *)GetDlgItem(IDC_RADIO_VIDEOCARD_SDK3000))->EnableWindow(FALSE);
   ((CButton *)GetDlgItem(IDC_RADIO_VIDEOCARD_SV2000E))->EnableWindow(FALSE);
   ((CButton *)GetDlgItem(IDC_RADIO_VIDEOCARD_SV4000E))->EnableWindow(FALSE);