#0016: 新增变焦功能的适配

HSI_HexagonMI_EF3/HSI.cpp

@@ -145,9 +145,8 @@ HSI_API HSI_STATUS WINAPI HSI_SHUTDOWM()
 ////////////////////////////////////////////////////////////////////////////////
 // MOTION API 运动相关API
 ///////////////////////////////////////////////////////////////////////////////
-#pragma region  Motion API
+#pragma region  Motion API Phase 1
 
-#pragma region 第一阶段实现的API功能
 //===========================================================================
 HSI_API HSI_STATUS WINAPI HSI_MOTION_STARTUP(bool bHome)
 {
@@ -378,12 +377,6 @@ HSI_API HSI_STATUS WINAPI HSI_MOTION_IS_SUPPORTED(UINT& Types)
 	}
 	return rStatus;
 }
-#pragma  endregion
-
-#define USE_Motion_API
-#ifdef USE_Motion_API
-
-#pragma region 后续考虑
 
 //===========================================================================
 HSI_API HSI_STATUS WINAPI HSI_MOTION_GET_FOCUSSPEED_XYZ(double& Speed)
@@ -415,6 +408,15 @@ HSI_API HSI_STATUS WINAPI HSI_MOTION_SET_FOCUSSPEED_XYZ(double Speed)
 	return rStatus;
 }
 
+
+#pragma  endregion
+
+#define USE_Motion_API
+#ifdef USE_Motion_API
+
+#pragma region 后续考虑
+
+
 //===========================================================================
 HSI_API HSI_STATUS WINAPI HSI_MOTION_SET_SPEED_XYZ(double Speed)
 {

HSI_HexagonMI_EF3/HSI_HexagonMI_EF3.vcxproj

@@ -122,6 +122,9 @@ copy "$(TargetDir)$(ProjectName).dll" "D:\HSI_Sevenocean_EF3.dll" </Command>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="ClassDiagram1.cd" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

HSI_HexagonMI_EF3/HSI_HexagonMI_EF3.vcxproj.filters

@@ -22,4 +22,7 @@
     <ClInclude Include="SevenOcean\CMMIO_SERIAL.H" />
     <ClInclude Include="ACS\ACSC.h" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="ClassDiagram1.cd" />
+  </ItemGroup>
 </Project>

HSI_HexagonMI_EF3/HSI_Motion.h

@@ -191,8 +191,13 @@ public:
 	* \return
 	*/
 	HSI_STATUS SetSpeedXyz(double Speed);
+	// 获取变焦速度
+	HSI_STATUS GetFocusSpeedOld(double& Speed);
 	HSI_STATUS GetFocusSpeed(double& Speed);
+	// 设置变焦速度
+	HSI_STATUS SetFocusSpeedOld(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);
@@ -251,8 +256,8 @@ public:
 	 * \param motionParam
 	 * \return
 	 */
-	HSI_STATUS HSI_Motion::GetSingleAxisParam(int AXIS, double motionParam[5]); //获取单轴运动参数
-	HSI_STATUS HSI_Motion::SetSingleAxisParam(int AXIS, double motionParam[5]); //设置单轴运动参数
+	HSI_STATUS GetSingleAxisParam(int AXIS, double motionParam[5]); //获取单轴运动参数
+	HSI_STATUS SetSingleAxisParam(int AXIS, double motionParam[5]); //设置单轴运动参数
 	/**
 	 * \brief 运行到指定位置
 	 * \param AxisTypes 轴号

HSI_HexagonMI_EF3/version.h

@@ -12,5 +12,5 @@
 #define HSI_VERSION_REVNUM              
 #define HSI_VERSION_BUILD_DATE        _T(__DATE__ )  
 #define HSI_VERSION_BUILD_TIME        _T(__TIME__ )  
-#define HSI_FILE_DESCRIPTION          "周四 2.24.08 / 13:09 "  
-#define HSI_FILE_CSDESCRIPTION        _T("周四 2.24.08 / 13:09 ")  
+#define HSI_FILE_DESCRIPTION          "2024.12.23 / 13:41 "  
+#define HSI_FILE_CSDESCRIPTION        _T("2024.12.23 / 13:41 ")