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

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

@@ -543,7 +543,7 @@ CSO7_Proto::CSO7_Proto()
   g_machine.s_machine_config.motion._ShiftPositionZ=0.0;
   g_machine.s_machine_config.motion._ShiftPositionZ=0.0;
 
-  g_machine.s_machine_config.motion.GetInterruptMsgMethod=E_GET_INTERRUPT_MSG_INTERRUPT;//E_GET_INTERRUPT_MSG_INQUIRY;
+  g_machine.s_machine_config.motion.GetInterruptMsgMethod=E_GET_INTERRUPT_MSG_INQUIRY;
   g_machine.s_machine_config.motion.m_WriteDataSleepTime=0;
   g_machine.s_machine_config.motion.m_AccuraErrPulseX=1;
   g_machine.s_machine_config.motion.m_AccuraErrPulseY=1;
@@ -551,6 +551,9 @@ CSO7_Proto::CSO7_Proto()
   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_TouchProbeEnable=0;
+  g_machine.s_machine_config.motion.m_JoyStickEnable=0;
+  g_machine.s_machine_config.motion.m_DebugOutputEnable=0;
   
   g_machine.s_machine_config.motion.m_SDK3000_CntThreadSleepVal=550000;
   g_machine.s_machine_config.motion.m_SV4000E_DenoisePara[0]=70;
@@ -2156,9 +2159,10 @@ SSI_STATUS_MOTION CSO7_Proto::Save_So7_Config()
     outBuff="ZOOM_MOTOR_SPEED_SLOW=";
     fprintf(m_pOutFile,"%s", outBuff);
     fprintf(m_pOutFile,"%d", g_machine.s_machine_config.zm_axis._SpeedSlow);
-    fprintf(m_pOutFile, "\n;\n");
+    fprintf(m_pOutFile, "\n");
+    fprintf(m_pOutFile, ";\n");
 
-    outBuff="[MOTION]";
+    outBuff="[CONTROLLER]";
     fprintf(m_pOutFile,"%s", outBuff);
     fprintf(m_pOutFile, "\n");
     outBuff="CLOSE_LOOP_ENABLED=";
@@ -2212,7 +2216,20 @@ SSI_STATUS_MOTION CSO7_Proto::Save_So7_Config()
     outBuff="EQUIDISTANCE_PULSE_Z=";
     fprintf(m_pOutFile,"%s", outBuff);
     fprintf(m_pOutFile,"%d", g_machine.s_machine_config.motion.m_EQUIDIS_Z);
-    fprintf(m_pOutFile, "\n;\n");
+    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);
+    fprintf(m_pOutFile, "\n");
+    outBuff="JOYSTICK_ENABLE=";
+    fprintf(m_pOutFile,"%s", outBuff);
+    fprintf(m_pOutFile,"%d", g_machine.s_machine_config.motion.m_JoyStickEnable);
+    fprintf(m_pOutFile, "\n");
+    outBuff="DEBUG_LOG_ENABLE=";
+    fprintf(m_pOutFile,"%s", outBuff);
+    fprintf(m_pOutFile,"%d", g_machine.s_machine_config.motion.m_DebugOutputEnable);
+    fprintf(m_pOutFile, "\n");
+    fprintf(m_pOutFile, ";\n");
 
     outBuff="[VIDEOCARD]";
     fprintf(m_pOutFile,"%s", outBuff);
@@ -2237,7 +2254,7 @@ SSI_STATUS_MOTION CSO7_Proto::Save_So7_Config()
     fprintf(m_pOutFile,"%s", outBuff);
     fprintf(m_pOutFile,"%d", g_machine.s_machine_config.motion.m_SV4000E_DenoisePara[3]);
     fprintf(m_pOutFile, "\n");
-    fprintf(m_pOutFile, "\n;\n");
+    fprintf(m_pOutFile, ";\n");
 
     outBuff="[HSI]";
     fprintf(m_pOutFile,"%s", outBuff);
@@ -2250,6 +2267,7 @@ SSI_STATUS_MOTION CSO7_Proto::Save_So7_Config()
     fprintf(m_pOutFile,"%s", outBuff);
     fprintf(m_pOutFile,"%d", g_machine.s_machine_config.motion.m_VideoCardType);
     fprintf(m_pOutFile, "\n");
+    fprintf(m_pOutFile, ";\n");
 
     fclose(m_pOutFile);
   }
@@ -2485,6 +2503,33 @@ SSI_STATUS_MOTION CSO7_Proto::Load_So7_Config()
             g_machine.s_machine_config.motion.m_EQUIDIS_Z=atoi(cTemp);
           }
         }
+        else if (!_stricmp(token,"TOUCH_PROBE_ENABLE"))
+        {
+          token = strtok( NULL, seps);
+          if (token)
+          {
+            strcpy(cTemp,token);
+            g_machine.s_machine_config.motion.m_TouchProbeEnable=atoi(cTemp);
+          }
+        }
+        else if (!_stricmp(token,"JOYSTICK_ENABLE"))
+        {
+          token = strtok( NULL, seps);
+          if (token)
+          {
+            strcpy(cTemp,token);
+            g_machine.s_machine_config.motion.m_JoyStickEnable=atoi(cTemp);
+          }
+        }
+        else if (!_stricmp(token,"DEBUG_LOG_ENABLE"))
+        {
+          token = strtok( NULL, seps);
+          if (token)
+          {
+            strcpy(cTemp,token);
+            g_machine.s_machine_config.motion.m_DebugOutputEnable=atoi(cTemp);
+          }
+        }
         //=================VideoCard========================
         else if (!_stricmp(token,"SDK3000_SLEEP_COUNT"))
         {

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

@@ -163,6 +163,9 @@ struct s_so7_machine_interface_config
   INT    m_EQUIDIS_X;
   INT    m_EQUIDIS_Y;
   INT    m_EQUIDIS_Z;
+  INT    m_TouchProbeEnable;
+  INT    m_JoyStickEnable;
+  INT    m_DebugOutputEnable;
   INT    m_SDK3000_CntThreadSleepVal;
   INT    m_SV4000E_DenoisePara[4];
   INT    m_MachineType;

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

@@ -2374,8 +2374,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 7,2,0,0
+ FILEVERSION 7,3,0,0
- PRODUCTVERSION 7,2,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

@@ -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);