格式整理，在原来基础上做减法减去遥杆、光照、探针等功能

2022-09-30 16:45:28 +08:00
parent 7c4c565d09
commit 2f481baaa2
57 changed files with 84021 additions and 207 deletions
@@ -0,0 +1,5 @@
+*.CopyComplete
+*.txt
+*.resources
+*.licenses
+HSI_HexagonMI_EF3/x64/Debug/
@@ -1,7 +1,7 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.2017
+# Visual Studio Version 17
+VisualStudioVersion = 17.2.32616.157
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HSI_Sevenocean_EF1", "..\EF3-Interfac\PcDmis\Base\Interfac\Msi\Hsi\Tools\UsbUtility\HSI_Sevenocean_EF1\HSI_Sevenocean_EF1.vcxproj", "{09F6ECED-CD30-4ACA-BD5E-FFB4F53C353A}"
 EndProject
@@ -15,6 +15,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HSI_HexagonMI_EF3", "HSI_He
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ACS Motion", "Motion\ACS Motion\ACS Motion.csproj", "{19741897-37D8-43EE-94A2-637975035CEA}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HSI_CONTROLLER_WPFTest", "..\EF3-Interfac\PcDmis\Base\Interfac\Msi\Hsi\Tools\UsbUtility\HSI_GOOGOL_GTS800_WPFTest\HSI_CONTROLLER_WPFTest.csproj", "{A21A5B56-EB1C-4377-9E76-141FAC055988}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WPFSerialAssistant", "..\项目资料\锁存板（串口）\SerialAssistant-Version_1.3.0\WPFSerialAssistant\WPFSerialAssistant.csproj", "{DA01B86D-5BC1-4863-BAAC-71B309B09CC0}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -27,7 +31,6 @@ Global
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{09F6ECED-CD30-4ACA-BD5E-FFB4F53C353A}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{09F6ECED-CD30-4ACA-BD5E-FFB4F53C353A}.Debug|x64.ActiveCfg = Debug|x64
-		{09F6ECED-CD30-4ACA-BD5E-FFB4F53C353A}.Debug|x64.Build.0 = Debug|x64
 		{09F6ECED-CD30-4ACA-BD5E-FFB4F53C353A}.Debug|x86.ActiveCfg = Debug|Win32
 		{09F6ECED-CD30-4ACA-BD5E-FFB4F53C353A}.Debug|x86.Build.0 = Debug|Win32
 		{09F6ECED-CD30-4ACA-BD5E-FFB4F53C353A}.Release|Any CPU.ActiveCfg = Release|Win32
@@ -38,7 +41,6 @@ Global
 		{B8B35406-6406-424C-94B4-C6BB4A481413}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B8B35406-6406-424C-94B4-C6BB4A481413}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B8B35406-6406-424C-94B4-C6BB4A481413}.Debug|x64.ActiveCfg = Debug|x64
-		{B8B35406-6406-424C-94B4-C6BB4A481413}.Debug|x64.Build.0 = Debug|x64
 		{B8B35406-6406-424C-94B4-C6BB4A481413}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{B8B35406-6406-424C-94B4-C6BB4A481413}.Debug|x86.Build.0 = Debug|Any CPU
 		{B8B35406-6406-424C-94B4-C6BB4A481413}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -50,7 +52,6 @@ Global
 		{7ED499CB-651C-4154-9741-EEF347BDBFB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7ED499CB-651C-4154-9741-EEF347BDBFB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7ED499CB-651C-4154-9741-EEF347BDBFB5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7ED499CB-651C-4154-9741-EEF347BDBFB5}.Debug|x64.Build.0 = Debug|Any CPU
 		{7ED499CB-651C-4154-9741-EEF347BDBFB5}.Debug|x86.ActiveCfg = Debug|x86
 		{7ED499CB-651C-4154-9741-EEF347BDBFB5}.Debug|x86.Build.0 = Debug|x86
 		{7ED499CB-651C-4154-9741-EEF347BDBFB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -61,7 +62,6 @@ Global
 		{7ED499CB-651C-4154-9741-EEF347BDBFB5}.Release|x86.Build.0 = Release|x86
 		{3B731938-04B1-46FE-9EEA-CBDD1D3B522A}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{3B731938-04B1-46FE-9EEA-CBDD1D3B522A}.Debug|x64.ActiveCfg = Debug|x64
-		{3B731938-04B1-46FE-9EEA-CBDD1D3B522A}.Debug|x64.Build.0 = Debug|x64
 		{3B731938-04B1-46FE-9EEA-CBDD1D3B522A}.Debug|x86.ActiveCfg = Debug|Win32
 		{3B731938-04B1-46FE-9EEA-CBDD1D3B522A}.Debug|x86.Build.0 = Debug|Win32
 		{3B731938-04B1-46FE-9EEA-CBDD1D3B522A}.Release|Any CPU.ActiveCfg = Release|Win32
@@ -81,7 +81,6 @@ Global
 		{ECCF081D-DDA4-49D5-A03F-9DD5AB8B666B}.Release|x86.Build.0 = Release|Win32
 		{19741897-37D8-43EE-94A2-637975035CEA}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{19741897-37D8-43EE-94A2-637975035CEA}.Debug|x64.ActiveCfg = Debug|x64
-		{19741897-37D8-43EE-94A2-637975035CEA}.Debug|x64.Build.0 = Debug|x64
 		{19741897-37D8-43EE-94A2-637975035CEA}.Debug|x86.ActiveCfg = Debug|x86
 		{19741897-37D8-43EE-94A2-637975035CEA}.Debug|x86.Build.0 = Debug|x86
 		{19741897-37D8-43EE-94A2-637975035CEA}.Release|Any CPU.ActiveCfg = Release|x86
@@ -89,6 +88,29 @@ Global
 		{19741897-37D8-43EE-94A2-637975035CEA}.Release|x64.Build.0 = Release|x64
 		{19741897-37D8-43EE-94A2-637975035CEA}.Release|x86.ActiveCfg = Release|x86
 		{19741897-37D8-43EE-94A2-637975035CEA}.Release|x86.Build.0 = Release|x86
+		{A21A5B56-EB1C-4377-9E76-141FAC055988}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A21A5B56-EB1C-4377-9E76-141FAC055988}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A21A5B56-EB1C-4377-9E76-141FAC055988}.Debug|x64.ActiveCfg = Debug|x64
+		{A21A5B56-EB1C-4377-9E76-141FAC055988}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A21A5B56-EB1C-4377-9E76-141FAC055988}.Debug|x86.Build.0 = Debug|Any CPU
+		{A21A5B56-EB1C-4377-9E76-141FAC055988}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A21A5B56-EB1C-4377-9E76-141FAC055988}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A21A5B56-EB1C-4377-9E76-141FAC055988}.Release|x64.ActiveCfg = Release|x64
+		{A21A5B56-EB1C-4377-9E76-141FAC055988}.Release|x64.Build.0 = Release|x64
+		{A21A5B56-EB1C-4377-9E76-141FAC055988}.Release|x86.ActiveCfg = Release|Any CPU
+		{A21A5B56-EB1C-4377-9E76-141FAC055988}.Release|x86.Build.0 = Release|Any CPU
+		{DA01B86D-5BC1-4863-BAAC-71B309B09CC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DA01B86D-5BC1-4863-BAAC-71B309B09CC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DA01B86D-5BC1-4863-BAAC-71B309B09CC0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DA01B86D-5BC1-4863-BAAC-71B309B09CC0}.Debug|x64.Build.0 = Debug|Any CPU
+		{DA01B86D-5BC1-4863-BAAC-71B309B09CC0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DA01B86D-5BC1-4863-BAAC-71B309B09CC0}.Debug|x86.Build.0 = Debug|Any CPU
+		{DA01B86D-5BC1-4863-BAAC-71B309B09CC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DA01B86D-5BC1-4863-BAAC-71B309B09CC0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DA01B86D-5BC1-4863-BAAC-71B309B09CC0}.Release|x64.ActiveCfg = Release|Any CPU
+		{DA01B86D-5BC1-4863-BAAC-71B309B09CC0}.Release|x64.Build.0 = Release|Any CPU
+		{DA01B86D-5BC1-4863-BAAC-71B309B09CC0}.Release|x86.ActiveCfg = Release|Any CPU
+		{DA01B86D-5BC1-4863-BAAC-71B309B09CC0}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -84,24 +84,24 @@ HSI_API HSI_STATUS WINAPI HSI_SHUTDOWM()
    delete g_pLogger2;
    g_pLogger2 = NULL;
  }
-  if (g_pHSI_Illumination)
-  {
-    rStatus = g_pHSI_Illumination->Shutdown();
-    delete g_pHSI_Illumination;
-    g_pHSI_Illumination = nullptr;
-  }
+  //if (g_pHSI_Illumination)
+  //{
+  //  rStatus = g_pHSI_Illumination->Shutdown();
+  //  delete g_pHSI_Illumination;
+  //  g_pHSI_Illumination = nullptr;
+  //}
  if (g_pHSI_Motion)
  {
    rStatus = g_pHSI_Motion->Shutdown();
    delete g_pHSI_Motion;
    g_pHSI_Motion = nullptr;
  }
-	if (g_pHSI_JoyStick)
-	{
-		g_pHSI_JoyStick->SuspendJoyStickThread();
-		delete g_pHSI_JoyStick;
-		g_pHSI_JoyStick = nullptr;
-	}
+	//if (g_pHSI_JoyStick)
+	//{
+	//	g_pHSI_JoyStick->SuspendJoyStickThread();
+	//	delete g_pHSI_JoyStick;
+	//	g_pHSI_JoyStick = nullptr;
+	//}
 	if (g_pHSI_Sevenocean_EF3)
  {
    g_pHSI_Sevenocean_EF3->Shutdown();
@@ -170,11 +170,11 @@ HSI_API HSI_STATUS WINAPI HSI_MOTION_STARTUP(bool bHome)
 			case 0:
 				break;
 			case 1:
-				if (!g_pHSI_JoyStick)
-				{
-					g_pHSI_JoyStick = new HSI_Joystick(g_pHSI_Motion);
-					g_pHSI_JoyStick->ResumeJoyStickThread();
-				}
+				//if (!g_pHSI_JoyStick)
+				//{
+				//	g_pHSI_JoyStick = new HSI_Joystick(g_pHSI_Motion);
+				//	g_pHSI_JoyStick->ResumeJoyStickThread();
+				//}
 				break;
 			default:
 				break;
@@ -188,19 +188,25 @@ HSI_API HSI_STATUS WINAPI HSI_MOTION_STARTUP(bool bHome)
  return rStatus;
 }
 //===========================================================================
-HSI_API HSI_STATUS WINAPI HSI_MOTION_IS_HOMED(bool &bHomed)
-{
-  auto rStatus = HSI_STATUS_NORMAL;
-  if (g_pHSI_Motion)
-  {
-    rStatus = g_pHSI_Motion->IsHomed(bHomed);
-  }
-  else
-  {
-    rStatus = HSI_STATUS_FAILED;
-  }
-  return rStatus;
-}
+/**
+ * .询问机台是否在原点
+ *
+ * \param bHomed 是否在 原 点
+ * \return
+ */
+//HSI_API HSI_STATUS WINAPI HSI_MOTION_IS_HOMED(bool &bHomed)
+//{
+//  auto rStatus = HSI_STATUS_NORMAL;
+//  if (g_pHSI_Motion)
+//  {
+//    rStatus = g_pHSI_Motion->IsHomed(bHomed);
+//  }
+//  else
+//  {
+//    rStatus = HSI_STATUS_FAILED;
+//  }
+//  return rStatus;
+//}
 //===========================================================================
 HSI_API HSI_STATUS WINAPI HSI_EF3MOTION_GET_SPEED_XYZ(int axis,double &Speed)
 {
@@ -974,8 +980,10 @@ HSI_API HSI_STATUS WINAPI HSI_MOTION_FINDORIGINTEST(bool type)
 	return rStatus;
 }

-
+#if  0
 /////////////////////////////////////////////////////////////////////////////
+
+
 #pragma region   // ILLUMINATION API
 //===========================================================================
 HSI_API HSI_STATUS WINAPI HSI_ILLUMINATION_IS_SUPPORTED(UINT &Types)
@@ -1144,6 +1152,7 @@ HSI_API HSI_STATUS WINAPI HSI_ILLUMINATION_TESTLIGHT(bool flag)
 }
 //===========================================================================
 #pragma endregion
+ //  0
 /////////////////////////////////////////////////////////////////////////////
 #pragma region probe
 //===========================================================================
@@ -1335,6 +1344,8 @@ HSI_API HSI_STATUS WINAPI HSI_TP_SHUTDOWN()
 //===========================================================================
 #pragma endregion

+#endif
+
 #pragma region Test
 //===========================================================================
 HSI_API HSI_STATUS WINAPI HSI_MOTION_COLLECTPOS(bool isEnable, MOTOR_AXISCHOOES_CMD axis, short cycle)
@@ -0,0 +1,20 @@
+;HSI_Sevenocean_EF3.def : 声明 DLL 的模块参数。
+
+LIBRARY "HSI"
+
+EXPORTS
+      ;此处可以是显式导出
+	  
+HSI_MOTION_STARTUP
+HSI_SET_EVENT_CALLBACK
+HSI_MOTION_SHUTDOWN
+HSI_MOTION_STARTUP
+HSI_MOTION_IS_HOMED
+HSI_EF3MOTION_GET_SPEED_XYZ
+HSI_MOTION_SET_SPEED_EX
+HSI_MOTION_JOG
+HSI_MOTION_STOP_JOG
+HSI_MOTION_GET_POSITION_XYZ
+HSI_MOTION_SET_POSITION_XYZ
+HSI_MOTION_ABORT_MOTION
+HSI_SHUTDOWM
@@ -234,11 +234,11 @@ struct sHSIEventProperties

 // >>>> In Interfaces
 typedef VOID(WINAPI *pEventCallback)(HSI_EVENT_TYPE EventType, HSI_EVENT_RESPONSE_TYPE ResponseType, UINT EventID, char EventData[HSI_MaxStringLength + 1], UINT &EventCallbackID);
-HSI_API HSI_STATUS WINAPI HSI_STARTUP(HWND _hWnd, bool _bOfflineOnly);
-HSI_API HSI_STATUS WINAPI HSI_GET_INTERFACE_VERSION(UINT &APIVersionMajor, UINT &APIVersionMinor);
-HSI_API HSI_STATUS WINAPI HSI_GET_MACHINE_INFO(int &_NumMachineTypes);
-HSI_API HSI_STATUS WINAPI HSI_SET_EVENT_CALLBACK(pEventCallback _pCallback);
-HSI_API HSI_STATUS WINAPI HSI_SHUTDOWM();
+//HSI_API HSI_STATUS WINAPI HSI_STARTUP(HWND _hWnd, bool _bOfflineOnly);
+//HSI_API HSI_STATUS WINAPI HSI_GET_INTERFACE_VERSION(UINT &APIVersionMajor, UINT &APIVersionMinor);
+//HSI_API HSI_STATUS WINAPI HSI_GET_MACHINE_INFO(int &_NumMachineTypes);
+//HSI_API HSI_STATUS WINAPI HSI_SET_EVENT_CALLBACK(pEventCallback _pCallback);
+//HSI_API HSI_STATUS WINAPI HSI_SHUTDOWM();

 // <<<< Out Interfaces

@@ -347,8 +347,8 @@ const int HSI_MAX_POSITIONS_STORED = 500;

 // >>>> In Interfaces
 HSI_API HSI_STATUS WINAPI HSI_MOTION_IS_SUPPORTED(UINT &Types);
-HSI_API HSI_STATUS WINAPI HSI_MOTION_STARTUP(bool bHome);
-HSI_API HSI_STATUS WINAPI HSI_MOTION_IS_HOMED(bool &bHomed);
+//HSI_API HSI_STATUS WINAPI HSI_MOTION_STARTUP(bool bHome);
+//HSI_API HSI_STATUS WINAPI HSI_MOTION_IS_HOMED(bool &bHomed);

 HSI_API HSI_STATUS WINAPI HSI_MOTION_GET_SPEED_XYZ(double &Speed);
 HSI_API HSI_STATUS WINAPI HSI_EF3MOTION_GET_SPEED_XYZ(int axis, double &Speed);
@@ -368,10 +368,10 @@ HSI_API HSI_STATUS WINAPI HSI_MOTION_GET_REFRESH_DEADBAND(double &Deadband);

 HSI_API HSI_STATUS WINAPI HSI_MOTION_JOG(UINT AxisTypes, double Speed);
 HSI_API HSI_STATUS WINAPI HSI_MOTION_STOP_JOG();
-HSI_API BOOL       WINAPI HSI_MOTION_GET_PROBE_TOUCH();
-HSI_API HSI_STATUS WINAPI HSI_MOTION_TOUCH_MOVE(double dSpeed, double dEndPosX, double dEndPosY, double dEndPosZ, double dI, double dJ, double dK);
+//HSI_API BOOL       WINAPI HSI_MOTION_GET_PROBE_TOUCH();
+//HSI_API HSI_STATUS WINAPI HSI_MOTION_TOUCH_MOVE(double dSpeed, double dEndPosX, double dEndPosY, double dEndPosZ, double dI, double dJ, double dK);
 HSI_API HSI_STATUS WINAPI HSI_MOTION_GET_POSITION_XYZ(UINT AxisTypes, double &PositionX, double &PositionY, double &PositionZ, double &Time);
-HSI_API HSI_STATUS WINAPI HSI_MOTION_GET_POSITION_XYZA_PROBE(UINT AxisTypes, double &PositionX, double &PositionY, double &PositionZ, double &dI, double &dJ, double &dK, double &PositionA);
+//HSI_API HSI_STATUS WINAPI HSI_MOTION_GET_POSITION_XYZA_PROBE(UINT AxisTypes, double &PositionX, double &PositionY, double &PositionZ, double &dI, double &dJ, double &dK, double &PositionA);
 HSI_API HSI_STATUS WINAPI HSI_MOTION_GET_POSITIONPROBE(UINT AxisTypes, double &PositionX, double &PositionY, double &PositionZ, double &PositionA);
 HSI_API HSI_STATUS WINAPI HSI_MOTION_GET_ENCODER_XYZ(long *lEncVal);

@@ -389,21 +389,21 @@ HSI_API HSI_STATUS WINAPI HSI_MOTION_DCC_SCAN_SET_DATA(UINT AxisTypes, HSI_SCAN_
 HSI_API HSI_STATUS WINAPI HSI_MOTION_DCC_SCAN_START();
 HSI_API HSI_STATUS WINAPI HSI_MOTION_DCC_SCAN_STOP();

-HSI_API HSI_STATUS WINAPI HSI_MOTION_IS_SUPPORTED_EX(UINT AxisTypes, UINT &Types);
-HSI_API HSI_STATUS WINAPI HSI_MOTION_STARTUP_EX(UINT AxisTypes, bool bHome);
-HSI_API HSI_STATUS WINAPI HSI_MOTION_GET_SCALE_RESOLUTION_EX(UINT AxisTypes, double &Scale);
-HSI_API HSI_STATUS WINAPI HSI_MOTION_SET_SCALE_RESOLUTION_EX(UINT AxisTypes, double Scale);
-HSI_API HSI_STATUS WINAPI HSI_MOTION_GET_POSITION_EX(UINT AxisTypes, double &Position, double &Time);
-HSI_API HSI_STATUS WINAPI HSI_MOTION_SET_POSITION_EX(UINT AxisTypes, double  Position, HSI_MOTION_MOVE_TYPE eType, double dSpeedGear);
-HSI_API HSI_STATUS WINAPI HSI_MOTION_GET_SPEED_EX(UINT AxisTypes, double &Speed);
-HSI_API HSI_STATUS WINAPI HSI_MOTION_SET_SPEED_EX(UINT AxisTypes, double  Speed);
-HSI_API HSI_STATUS WINAPI HSI_MOTION_GET_ACCELERATION_EX(UINT AxisTypes, double &Accel);
-HSI_API HSI_STATUS WINAPI HSI_MOTION_SET_ACCELERATION_EX(UINT AxisTypes, double Accel);
+//HSI_API HSI_STATUS WINAPI HSI_MOTION_IS_SUPPORTED_EX(UINT AxisTypes, UINT &Types);
+//HSI_API HSI_STATUS WINAPI HSI_MOTION_STARTUP_EX(UINT AxisTypes, bool bHome);
+//HSI_API HSI_STATUS WINAPI HSI_MOTION_GET_SCALE_RESOLUTION_EX(UINT AxisTypes, double &Scale);
+//HSI_API HSI_STATUS WINAPI HSI_MOTION_SET_SCALE_RESOLUTION_EX(UINT AxisTypes, double Scale);
+//HSI_API HSI_STATUS WINAPI HSI_MOTION_GET_POSITION_EX(UINT AxisTypes, double &Position, double &Time);
+//HSI_API HSI_STATUS WINAPI HSI_MOTION_SET_POSITION_EX(UINT AxisTypes, double  Position, HSI_MOTION_MOVE_TYPE eType, double dSpeedGear);
+//HSI_API HSI_STATUS WINAPI HSI_MOTION_GET_SPEED_EX(UINT AxisTypes, double &Speed);
+//HSI_API HSI_STATUS WINAPI HSI_MOTION_SET_SPEED_EX(UINT AxisTypes, double  Speed);
+//HSI_API HSI_STATUS WINAPI HSI_MOTION_GET_ACCELERATION_EX(UINT AxisTypes, double &Accel);
+//HSI_API HSI_STATUS WINAPI HSI_MOTION_SET_ACCELERATION_EX(UINT AxisTypes, double Accel);

-HSI_API HSI_STATUS WINAPI HSI_MOTION_SET_MAGNIFICATION(UINT AxisTypes, double mag, HSI_MOTION_MOVE_TYPE eType, double dSpeedGear);
-HSI_API HSI_STATUS WINAPI HSI_MOTION_GET_MAGNIFICATION(UINT AxisTypes, double &mag);
-HSI_API HSI_STATUS WINAPI HSI_MOTION_SET_SCALE_POS(UINT AxisTypes, double ScalePos, HSI_MOTION_MOVE_TYPE eType, double dSpeedGear);
-HSI_API HSI_STATUS WINAPI HSI_MOTION_GET_SCALE_POS(UINT AxisTypes, double &ScalePos);
+//HSI_API HSI_STATUS WINAPI HSI_MOTION_SET_MAGNIFICATION(UINT AxisTypes, double mag, HSI_MOTION_MOVE_TYPE eType, double dSpeedGear);
+//HSI_API HSI_STATUS WINAPI HSI_MOTION_GET_MAGNIFICATION(UINT AxisTypes, double &mag);
+//HSI_API HSI_STATUS WINAPI HSI_MOTION_SET_SCALE_POS(UINT AxisTypes, double ScalePos, HSI_MOTION_MOVE_TYPE eType, double dSpeedGear);
+//HSI_API HSI_STATUS WINAPI HSI_MOTION_GET_SCALE_POS(UINT AxisTypes, double &ScalePos);

 HSI_API HSI_STATUS WINAPI HSI_MOTION_SHUTDOWN();
 // <<<< Out Interfaces
@@ -75,6 +75,7 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <LinkIncremental>true</LinkIncremental>
    <IncludePath>\DirectXLib\Include;$(IncludePath)</IncludePath>
+    <OutDir>$(MSBuildProjectDirectory)\$(Platform)\$(Configuration)\</OutDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <LinkIncremental>true</LinkIncremental>
@@ -99,7 +100,8 @@
      <SubSystem>Windows</SubSystem>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <AdditionalDependencies>hid.lib;setupapi.lib;DirectXLib\lib\x64\d2d1.lib;DirectXLib\lib\x64\d3d9.lib;DirectXLib\lib\x64\d3d10.lib;DirectXLib\lib\x64\d3d10_1.lib;DirectXLib\lib\x64\d3d11.lib;DirectXLib\lib\x64\d3dcompiler.lib;DirectXLib\lib\x64\D3DCSX.lib;DirectXLib\lib\x64\d3dx9.lib;DirectXLib\lib\x64\d3dx10.lib;DirectXLib\lib\x64\d3dx11.lib;DirectXLib\lib\x64\d3dxof.lib;DirectXLib\lib\x64\dinput8.lib;DirectXLib\lib\x64\dsound.lib;DirectXLib\lib\x64\dwrite.lib;DirectXLib\lib\x64\DxErr.lib;DirectXLib\lib\x64\dxgi.lib;DirectXLib\lib\x64\dxguid.lib;DirectXLib\lib\x64\X3DAudio.lib;DirectXLib\lib\x64\xapobase.lib;DirectXLib\lib\x64\XAPOFX.lib;DirectXLib\lib\x64\XInput.lib;%(AdditionalDependencies);%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>.\HSI_Sevenocean_EF3.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
    </Link>
    <PostBuildEvent>
      <Command>
@@ -169,17 +171,10 @@ xcopy "$(OutDir)\$(ProjectName).pdb" ..\HSI_GOOGOL_GTS800_WPFTest\bin\Debug\HSI.
      <ModuleDefinitionFile>.\HSI_Sevenocean_EF3.def</ModuleDefinitionFile>
    </Link>
  </ItemDefinitionGroup>
-  <ItemGroup>
-    <Text Include="ReadMe.txt" />
-  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="HSI.h" />
    <ClInclude Include="SevenOcean\CMMIO_BASE.H" />
    <ClInclude Include="logger.h" />
-    <ClInclude Include="CXDirectXInput.h" />
-    <ClInclude Include="HSI_Function.h" />
-    <ClInclude Include="HSI_Illumination.h" />
-    <ClInclude Include="HSI_JoyStick.h" />
    <ClInclude Include="HSI_Motion.h" />
    <ClInclude Include="HSI_Sevenocean_EF3.h" />
    <ClInclude Include="resource.h" />
@@ -191,11 +186,7 @@ xcopy "$(OutDir)\$(ProjectName).pdb" ..\HSI_GOOGOL_GTS800_WPFTest\bin\Debug\HSI.
    <ClCompile Include="SevenOcean\CMMIO_BASE.CPP" />
    <ClCompile Include="SevenOcean\CMMIO_SERIAL.CPP" />
    <ClCompile Include="logger.cpp" />
-    <ClCompile Include="CXDirectXInput.cpp" />
    <ClCompile Include="HSI.cpp" />
-    <ClCompile Include="HSI_Function.cpp" />
-    <ClCompile Include="HSI_Illumination.cpp" />
-    <ClCompile Include="HSI_JoyStick.cpp" />
    <ClCompile Include="HSI_Motion.cpp" />
    <ClCompile Include="HSI_Sevenocean_EF3.cpp" />
    <ClCompile Include="stdafx.cpp">
@@ -205,16 +196,6 @@ xcopy "$(OutDir)\$(ProjectName).pdb" ..\HSI_GOOGOL_GTS800_WPFTest\bin\Debug\HSI.
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
    </ClCompile>
  </ItemGroup>
-  <ItemGroup>
-    <None Include="HSI_Sevenocean_EF3.def" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="HSI_Sevenocean_EF3.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <Library Include="Debug\hid.lib" />
-    <Library Include="Debug\setupapi.lib" />
-  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="SevenOcean\CMMIO_BASE.CPP" />
+    <ClCompile Include="SevenOcean\CMMIO_SERIAL.CPP" />
+    <ClCompile Include="logger.cpp" />
+    <ClCompile Include="HSI.cpp" />
+    <ClCompile Include="HSI_Motion.cpp" />
+    <ClCompile Include="HSI_Sevenocean_EF3.cpp" />
+    <ClCompile Include="stdafx.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="HSI.h" />
+    <ClInclude Include="SevenOcean\CMMIO_BASE.H" />
+    <ClInclude Include="logger.h" />
+    <ClInclude Include="HSI_Motion.h" />
+    <ClInclude Include="HSI_Sevenocean_EF3.h" />
+    <ClInclude Include="resource.h" />
+    <ClInclude Include="stdafx.h" />
+    <ClInclude Include="targetver.h" />
+    <ClInclude Include="version.h" />
+  </ItemGroup>
+</Project>
@@ -141,94 +141,95 @@ typedef enum {
 class HSI_Motion : public HSI
 {
 public:
-  HSI_Motion();
-  ~HSI_Motion();
-  HSI_STATUS IsSupported(UINT &Types);
+	HSI_Motion();
+	~HSI_Motion();
+	HSI_STATUS IsSupported(UINT &Types);

-  virtual HSI_STATUS Startup(HWND _hWnd, bool _bOfflineOnly);
+	virtual HSI_STATUS Startup(HWND _hWnd, bool _bOfflineOnly);

-  HSI_STATUS GetFirmwareVersion(byte *version);
+	HSI_STATUS GetFirmwareVersion(byte *version);

-  HSI_STATUS HomeMachine(bool bHomed);
-  HSI_STATUS HomeJog(short AxisNumber, short Dir, bool Wait = false);
-  HSI_STATUS HomeFindIndex();
-  HSI_STATUS ZeroPos(bool bZeroPos);
-  HSI_STATUS IsHomed(bool &bHomed);
-  HSI_STATUS GetSpeedXyz(int AxisNum, double &Speed);
-  HSI_STATUS SetSpeedXyz(double  Speed);
-  HSI_STATUS GetFocusSpeed(double &Speed);
-  HSI_STATUS SetFocusSpeed(double Speed);
-  HSI_STATUS GetAccelerationXyz(double &AccelX, double &AccelY, double &AccelZ);
-  HSI_STATUS SetAccelerationXyz(double  AccelX, double  AccelY, double  AccelZ);
-  HSI_STATUS GetSpeedR(double &Speed);
-  HSI_STATUS SetSpeedR(double  Speed);
+	HSI_STATUS HomeMachine(bool bHomed);
+	HSI_STATUS HomeJog(short AxisNumber, short Dir, bool Wait = false);
+	HSI_STATUS HomeFindIndex();
+	HSI_STATUS ZeroPos(bool bZeroPos);
+	HSI_STATUS IsHomed(bool &bHomed);
+	HSI_STATUS GetSpeedXyz(int AxisNum, double &Speed);
+	HSI_STATUS SetSpeedXyz(double  Speed);
+	HSI_STATUS GetFocusSpeed(double &Speed);
+	HSI_STATUS SetFocusSpeed(double Speed);
+	HSI_STATUS GetAccelerationXyz(double &AccelX, double &AccelY, double &AccelZ);
+	HSI_STATUS SetAccelerationXyz(double  AccelX, double  AccelY, double  AccelZ);
+	HSI_STATUS GetSpeedR(double &Speed);
+	HSI_STATUS SetSpeedR(double  Speed);

-  HSI_STATUS GetScaleResolution(double &_ScaleX, double &_ScaleY, double &_ScaleZ);
-  HSI_STATUS SetScaleResolution(double _ScaleX, double _ScaleY, double _ScaleZ);
+	HSI_STATUS GetScaleResolution(double &_ScaleX, double &_ScaleY, double &_ScaleZ);
+	HSI_STATUS SetScaleResolution(double _ScaleX, double _ScaleY, double _ScaleZ);

-  HSI_STATUS GetDeadBand(double &DeadbandX, double &DeadbandY, double &DeadbandZ, double &DeadbandR);
-  HSI_STATUS GetRefreshDeadBand(double &Deadband);
+	HSI_STATUS GetDeadBand(double &DeadbandX, double &DeadbandY, double &DeadbandZ, double &DeadbandR);
+	HSI_STATUS GetRefreshDeadBand(double &Deadband);

-  HSI_STATUS Jog(UINT AxisTypes, double Speed);
+	HSI_STATUS Jog(UINT AxisTypes, double Speed);
 	HSI_STATUS JoyStick(UINT AxisTypes, long Speed);
 	HSI_STATUS StopJog();

 	HSI_STATUS StopJogEx(UINT AxisTypes);

-  HSI_STATUS GetPositionEncPrfMulti(UINT AxisTypes, double *EncPos, double *PrfPos, int Count);
-  HSI_STATUS GetPositionXyz(UINT AxisTypes, double &PositionX, double &PositionY, double &PositionZ, double &Time);
-  HSI_STATUS GetPositionXyzaProbe(UINT AxisTypes, double &PositionX, double &PositionY, double &PositionZ, double &PositionA);
+	HSI_STATUS GetPositionEncPrfMulti(UINT AxisTypes, double *EncPos, double *PrfPos, int Count);
+	HSI_STATUS GetPositionXyz(UINT AxisTypes, double &PositionX, double &PositionY, double &PositionZ, double &Time);
+	HSI_STATUS GetPositionXyzaProbe(UINT AxisTypes, double &PositionX, double &PositionY, double &PositionZ, double &PositionA);
 	HSI_STATUS GetEncoderXyz(long *lEncoderVal);
-  HSI_STATUS JogProbe(UINT AxisTypes, double Speed);
-  void ProbeRetractManDist(int RetractManDist);
-  int CaculateStepMotorACC(int pos, int maxacc, int minacc);
-  HSI_STATUS SetPositionXyz(UINT AxisTypes, double  PositionX, double  PositionY, double  PositionZ, HSI_MOTION_MOVE_TYPE eType, double dFlyRadius);
-  HSI_STATUS SetPositionXyza(UINT AxisTypes, double  PositionX, double  PositionY, double  PositionZ, double  PositionA, HSI_MOTION_MOVE_TYPE eType, double dFlyRadius);
-  HSI_STATUS SetPositionXyzCache(UINT AxisTypes, HSI_MOTION_MOVE_TYPE eType, int DataCount, Point *CacheData);
-  HSI_STATUS GetPositionR(UINT AxisTypes, double &PositionR, double &Time);
-  HSI_STATUS SetPositionR(UINT AxisTypes, double  PositionR, HSI_MOTION_AXIS_R_MOVE_TYPE DirectionType, bool bWait);
-  HSI_STATUS SetCircleInterpolate(double  PositionX, double  PositionY, double  PositionZ);
-  HSI_STATUS Load_EF3_Motion_Inifile(CString GoogolIniFile);
-  HSI_STATUS Load_EF3_Config_Inifile(CString GoogolIniFile);
-  HSI_STATUS AbortMotion();
+	HSI_STATUS JogProbe(UINT AxisTypes, double Speed);
+	void ProbeRetractManDist(int RetractManDist);
+	int CaculateStepMotorACC(int pos, int maxacc, int minacc);
+	HSI_STATUS SetPositionXyz(UINT AxisTypes, double  PositionX, double  PositionY, double  PositionZ, HSI_MOTION_MOVE_TYPE eType, double dFlyRadius);
+	HSI_STATUS SetPositionXyza(UINT AxisTypes, double  PositionX, double  PositionY, double  PositionZ, double  PositionA, HSI_MOTION_MOVE_TYPE eType, double dFlyRadius);
+	HSI_STATUS SetPositionXyzCache(UINT AxisTypes, HSI_MOTION_MOVE_TYPE eType, int DataCount, Point *CacheData);
+	HSI_STATUS GetPositionR(UINT AxisTypes, double &PositionR, double &Time);
+	HSI_STATUS SetPositionR(UINT AxisTypes, double  PositionR, HSI_MOTION_AXIS_R_MOVE_TYPE DirectionType, bool bWait);
+	HSI_STATUS SetCircleInterpolate(double  PositionX, double  PositionY, double  PositionZ);
+	HSI_STATUS Load_EF3_Motion_Inifile(CString GoogolIniFile);
+	HSI_STATUS Load_EF3_Config_Inifile(CString GoogolIniFile);
+	HSI_STATUS AbortMotion();

-  HSI_STATUS GetDIO(UINT IOChannel, UINT& _Status);
-  HSI_STATUS SetDIO(UINT IOChannel, UINT _Status);
-  HSI_STATUS GetAxisStatus(int* _Status);
-  HSI_STATUS GetAppPath(CString &Path);  
-  virtual HSI_STATUS Shutdown();
+	HSI_STATUS GetDIO(UINT IOChannel, UINT& _Status);
+	HSI_STATUS SetDIO(UINT IOChannel, UINT _Status);
+	HSI_STATUS GetAxisStatus(int* _Status);
+	HSI_STATUS GetAppPath(CString &Path);  
+	virtual HSI_STATUS Shutdown();

-  HSI_STATUS IsSupportedEx(UINT AxisTypes, UINT &Types);
-  HSI_STATUS StartupEx(UINT AxisTypes, bool bHome);
-  HSI_STATUS GetScaleResolutionEx(UINT AxisTypes, double &Scale);
-  HSI_STATUS SetScaleResolutionEx(UINT AxisTypes, double Scale);
-  HSI_STATUS GetPositionEx(UINT AxisTypes, double &Position, double &Time); 
-  HSI_STATUS SetPositionStep(UINT AxisTypes, double  Position, HSI_MOTION_MOVE_TYPE eType, double dSpeedGear);
-  HSI_STATUS SetPositionEx(UINT AxisTypes, double  Position, HSI_MOTION_MOVE_TYPE eType, double dSpeedGear);
-  HSI_STATUS GetSpeedEx(UINT AxisTypes, double &Speed);
-  HSI_STATUS SetSpeedEx(UINT AxisTypes, double Speed);
-  HSI_STATUS GetAccelerationEx(UINT AxisTypes, double &Accel);
-  HSI_STATUS SetAccelerationEx(UINT AxisTypes, double Accel);
+	HSI_STATUS IsSupportedEx(UINT AxisTypes, UINT &Types);
+	HSI_STATUS StartupEx(UINT AxisTypes, bool bHome);
+	HSI_STATUS GetScaleResolutionEx(UINT AxisTypes, double &Scale);
+	HSI_STATUS SetScaleResolutionEx(UINT AxisTypes, double Scale);
+	HSI_STATUS GetPositionEx(UINT AxisTypes, double &Position, double &Time); 
+	HSI_STATUS SetPositionStep(UINT AxisTypes, double  Position, HSI_MOTION_MOVE_TYPE eType, double dSpeedGear);
+	HSI_STATUS SetPositionEx(UINT AxisTypes, double  Position, HSI_MOTION_MOVE_TYPE eType, double dSpeedGear);
+	HSI_STATUS GetSpeedEx(UINT AxisTypes, double &Speed);
+	HSI_STATUS SetSpeedEx(UINT AxisTypes, double Speed);
+	HSI_STATUS GetAccelerationEx(UINT AxisTypes, double &Accel);
+	HSI_STATUS SetAccelerationEx(UINT AxisTypes, double Accel);

-  HSI_STATUS SetTriggerLight(int triggleNum, int delayLighting, int delayLightBefor,int triggleMode, double* Intensities);
-  HSI_STATUS DCCPPStartPoint(double *startPoint);
-  HSI_STATUS DCCScanSetData(UINT AxisTypes, HSI_SCAN_MOTION_TYPE eType, UINT lTrigNumber, double* dTrigDis);
-  HSI_STATUS DCCScanStart();
-  HSI_STATUS DCCScanStop();
-  HSI_STATUS DCCForLightPlate();
+	HSI_STATUS SetTriggerLight(int triggleNum, int delayLighting, int delayLightBefor,int triggleMode, double* Intensities);
+	HSI_STATUS DCCPPStartPoint(double *startPoint);
+	HSI_STATUS DCCScanSetData(UINT AxisTypes, HSI_SCAN_MOTION_TYPE eType, UINT lTrigNumber, double* dTrigDis);
+	HSI_STATUS DCCScanStart();
+	HSI_STATUS DCCScanStop();
+	HSI_STATUS DCCForLightPlate();

-  HSI_STATUS IOStep(bool RunSts);
-  HSI_STATUS IOprogram(byte* SendData,int length);
+	HSI_STATUS IOStep(bool RunSts);
+	HSI_STATUS IOprogram(byte* SendData,int length);

-  HSI_STATUS FindOriginTest(bool state);
+	HSI_STATUS FindOriginTest(bool state);
+
+	HSI_STATUS StartPlcJob(int* CamerasDis, int* BinsDis, int SubArea,int filterTime1, int filterTime2,int pluseSumDis);
+	HSI_STATUS SendBinResult(int* BinResult);
+	HSI_STATUS GetTriggleCount(int* nCount, int& nArea);
+	HSI_STATUS GluePPSpnts(int* ppsDir, double* gluePPSPos, int* delayLightBefore, int* lightTime, double* lightData, int num);
+	HSI_STATUS GlueDispenser(int* index, int* cirdirection , double* gluePos, int num);
+	HSI_STATUS GlueDispenserStart(double xOffset, double yOffset, double qOffset);
+	HSI_STATUS GetPntsDistance(double& ptpDistance,int& spTimeCount);

-  HSI_STATUS StartPlcJob(int* CamerasDis, int* BinsDis, int SubArea,int filterTime1, int filterTime2,int pluseSumDis);
-  HSI_STATUS SendBinResult(int* BinResult);
-  HSI_STATUS GetTriggleCount(int* nCount, int& nArea);
-  HSI_STATUS GluePPSpnts(int* ppsDir, double* gluePPSPos, int* delayLightBefore, int* lightTime, double* lightData, int num);
-  HSI_STATUS GlueDispenser(int* index, int* cirdirection , double* gluePos, int num);
-  HSI_STATUS GlueDispenserStart(double xOffset, double yOffset, double qOffset);
-  HSI_STATUS GetPntsDistance(double& ptpDistance,int& spTimeCount);
 public:
  static int    m_Thread_State;
  static HANDLE m_Thread_Id;
@@ -468,26 +469,26 @@ public:
  void UpdateMotionStateData();

  //读取EF3的JOG位置 以便停止JOG运动
-  static unsigned __stdcall m_ThreadJOGStop(LPVOID pThis);
-  void CreateThreadJOGStop();
-  void CloseThreadJOGStop();
-  void UpdateMotionStateJOGStop();
+	static unsigned __stdcall m_ThreadJOGStop(LPVOID pThis);
+	void CreateThreadJOGStop();
+	void CloseThreadJOGStop();
+	void UpdateMotionStateJOGStop();

-  void SendMsgMotionFinished();
-  void SendMsgProbeFinished();
-  VOID EventCallback(sHSIEventProperties& sEventProp);
-  int SpeedPercent(int AxisNum, double &Speed,int &DriveSpeed,int &StartSpeed, int &AccLine, int &DecLine,int &AccCurve,int &DecCurve);
+	void SendMsgMotionFinished();
+	void SendMsgProbeFinished();
+	VOID EventCallback(sHSIEventProperties& sEventProp);
+	int SpeedPercent(int AxisNum, double &Speed,int &DriveSpeed,int &StartSpeed, int &AccLine, int &DecLine,int &AccCurve,int &DecCurve);
 	bool SpeedPercentJoyStick(int AxisNum, long &Speed, int &DriveSpeed, int &StartSpeed, int &AccLine, int &DecLine, int &AccCurve, int &DecCurve);
 	void HomeJogGearsChoice(int AxisType, int JogGears, int &DriveSpeed, int &StartSpeed, int &AccLine, int &DecLine, int &AccCurve, int &DecCurve);
-  short AxisConvertIndex(UINT AxisTypes);
-  short IndexConvertAxis(int Index);
-  double LimitOver(UINT AxisTypes, double &LimitPos); 
-  int P2P(short AxisNumber, long Pos, double Speed, double Acc);
-  void DoEvents();
-  HSI_STATUS DriverAlarmStatus();
-  HSI_STATUS FirstHome();
-  HSI_STATUS SpecialMotorHome(short AxisNum);
-  HSI_STATUS SpecialMotorMove(short AxisNum, double Position);
+	short AxisConvertIndex(UINT AxisTypes);
+	short IndexConvertAxis(int Index);
+	double LimitOver(UINT AxisTypes, double &LimitPos); 
+	int P2P(short AxisNumber, long Pos, double Speed, double Acc);
+	void DoEvents();
+	HSI_STATUS DriverAlarmStatus();
+	HSI_STATUS FirstHome();
+	HSI_STATUS SpecialMotorHome(short AxisNum);
+	HSI_STATUS SpecialMotorMove(short AxisNum, double Position);

 private:
  UINT ActiveAxis;
@@ -29,6 +29,13 @@ HSI_Sevenocean_EF3::~HSI_Sevenocean_EF3()
  TRACE0("HSI_Sevenocean_EF3 Destructor!\n");
 }
 //===========================================================================
+/**
+ * HSI 初始化
+ * 
+ * \param _hWnd ：消息传输句柄
+ * \param _bOfflineOnly ：暂无用，默认 False
+ * \return 
+ */
 HSI_STATUS HSI_Sevenocean_EF3::Startup(HWND _hWnd, bool _bOfflineOnly)
 {
  auto rStatus = HSI_STATUS_NORMAL;
@@ -5,11 +5,11 @@ LIBRARY "HSI"
 EXPORTS
      ;此处可以是显式导出
 	  
-HSI_STARTUP
-HSI_GET_INTERFACE_VERSION
-HSI_GET_MACHINE_INFO
-HSI_SET_EVENT_CALLBACK
-HSI_SHUTDOWM
+;HSI_STARTUP
+;HSI_GET_INTERFACE_VERSION
+;HSI_GET_MACHINE_INFO
+;HSI_SET_EVENT_CALLBACK
+;HSI_SHUTDOWM

 HSI_MOTION_IS_SUPPORTED
 HSI_MOTION_GET_FIREWAREVERION
@@ -89,16 +89,16 @@ HSI_ILLUMINATION_SET_LAMP_STATE_ALL
 HSI_ILLUMINATION_SHUTDOWN
 HSI_ILLUMINATION_TESTLIGHT

-HSI_TP_STARTUP
-HSI_TP_ENABLE
-HSI_TP_GETACTIVEPROBE
-HSI_TP_SETACTIVEPROBE
-HSI_TP_SETMANUALTOUCHDATA
-HSI_TP_SETTIPOFFSET
-HSI_TP_GETTIPOFFSET
-HSI_TP_SETUPMEASUREPOINT
-HSI_TP_DOMEASURE
-HSI_TP_ISMEASURING
-HSI_TP_GETMEASUREDATA
-HSI_MOTION_SET_PLAN_SCAN
-HSI_TP_SHUTDOWN
+;HSI_TP_STARTUP
+;HSI_TP_ENABLE
+;HSI_TP_GETACTIVEPROBE
+;HSI_TP_SETACTIVEPROBE
+;HSI_TP_SETMANUALTOUCHDATA
+;HSI_TP_SETTIPOFFSET
+;HSI_TP_GETTIPOFFSET
+;HSI_TP_SETUPMEASUREPOINT
+;HSI_TP_DOMEASURE
+;HSI_TP_ISMEASURING
+;HSI_TP_GETMEASUREDATA
+;HSI_MOTION_SET_PLAN_SCAN
+;HSI_TP_SHUTDOWN
@@ -4,8 +4,8 @@ echo Generate release version

 ::需要人工设置的版本号----------------------------------------------------------------------------------
 set major_ver=1
-set minor_ver=1
-set revsion_ver=1
+set minor_ver=0
+set revsion_ver=0

 ::------------------------------------------------------------------------------------------------------
 set revfile="%~dp0version.h"
@@ -4,13 +4,13 @@
 #define HSI_VERSION_NUM                 
 #define HSI_VERSION_SET               _T("")  
 ///  
-#define HSI_VERSION                   "1.1.1" 
-#define HSI_VERSION_CSTRING           _T("1.1.1")  
+#define HSI_VERSION                   "1.0.0" 
+#define HSI_VERSION_CSTRING           _T("1.0.0")  
 #define HSI_VERSION_MAJOR             1  
-#define HSI_VERSION_MINOR             1  
-#define HSI_VERSION_REVISION          1  
+#define HSI_VERSION_MINOR             0  
+#define HSI_VERSION_REVISION          0  
 #define HSI_VERSION_REVNUM              
 #define HSI_VERSION_BUILD_DATE        _T(__DATE__ )  
 #define HSI_VERSION_BUILD_TIME        _T(__TIME__ )  
-#define HSI_FILE_DESCRIPTION          "2022.09.02 / 18:58 "  
-#define HSI_FILE_CSDESCRIPTION        _T("2022.09.02 / 18:58 ")  
+#define HSI_FILE_DESCRIPTION          "2022.09.30 / 10:33 "  
+#define HSI_FILE_CSDESCRIPTION        _T("2022.09.30 / 10:33 ")  
@@ -1,2 +0,0 @@
-#TargetFrameworkVersion=v4.0:PlatformToolSet=v141:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit:WindowsTargetPlatformVersion=10.0.19041.0
-Debug|x64|E:\HexagonProjects\2022-05-直线电机平台\LM-Middleware\HSI_HexagonMI_EF3\|
@@ -1,2 +1,2 @@
-#TargetFrameworkVersion=v4.0:PlatformToolSet=v141:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit:WindowsTargetPlatformVersion=10.0.19041.0
+#TargetFrameworkVersion=:PlatformToolSet=v141:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native64Bit:WindowsTargetPlatformVersion=10.0.19041.0
 Debug|x64|E:\HexagonProjects\2022-05-直线电机平台\LM-Middleware\|
@@ -1,2 +0,0 @@
-#TargetFrameworkVersion=v4.0:PlatformToolSet=v141:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit:WindowsTargetPlatformVersion=10.0.19041.0
-Debug|x64|E:\HexagonProjects\2022-05-直线电机平台\EF3-Interfac\PcDmis\Base\Interfac\Msi\Hsi\Tools\UsbUtility\HSI_Sevenocean_EF1\|
@@ -1,5 +0,0 @@
-E:\HexagonProjects\2022-05-直线电机平台\LM-Middleware\Motion\ACS Motion\obj\x64\Debug\ACS Motion.csprojAssemblyReference.cache
-E:\HexagonProjects\2022-05-直线电机平台\LM-Middleware\Motion\ACS Motion\obj\x64\Debug\ACS_DotNET_Library_Advanced_Demo.MainForm.resources
-E:\HexagonProjects\2022-05-直线电机平台\LM-Middleware\Motion\ACS Motion\obj\x64\Debug\ACS_DotNET_Library_Advanced_Demo.Properties.Resources.resources
-E:\HexagonProjects\2022-05-直线电机平台\LM-Middleware\Motion\ACS Motion\obj\x64\Debug\ACS Motion.csproj.GenerateResource.cache
-E:\HexagonProjects\2022-05-直线电机平台\LM-Middleware\Motion\ACS Motion\obj\x64\Debug\ACS Motion.csproj.CoreCompileInputs.cache