#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);
@@ -239,7 +244,7 @@ public:
 	HSI_STATUS GetPositionXyz(UINT AxisTypes, double& PositionX, double& PositionY, double& PositionZ, double& Time);
 	HSI_STATUS GetPositionXyzOld(UINT AxisTypes, double& PositionX, double& PositionY, double& PositionZ, double& Time);
 	HSI_STATUS GetPositionXyzaProbe(UINT AxisTypes, double& PositionX, double& PositionY, double& PositionZ,
-	                                double& PositionA);
+		double& PositionA);
 	HSI_STATUS GetEncoderXyz(long* lEncoderVal);//获取编码器位置
 	HSI_STATUS GetEncoderXyzOld(long* lEncoderVal);
 	HSI_STATUS JogProbe(UINT AxisTypes, double Speed);
@@ -251,8 +256,8 @@ public:
 	 * \param motionParam
 	 * \return
 	 */
-	HSI_STATUS HSI_Motion::GetSingleAxisParam(int AXIS, double motionParam[5]); //获取单轴运动参数
+	HSI_STATUS GetSingleAxisParam(int AXIS, double motionParam[5]); //获取单轴运动参数
-	HSI_STATUS HSI_Motion::SetSingleAxisParam(int AXIS, double motionParam[5]); //设置单轴运动参数
+	HSI_STATUS SetSingleAxisParam(int AXIS, double motionParam[5]); //设置单轴运动参数
 	/**
 	 * \brief 运行到指定位置
 	 * \param AxisTypes 轴号
@@ -264,11 +269,11 @@ public:
 	 * \return
 	 */
 	HSI_STATUS SetPositionXyz(UINT AxisTypes, double PositionX, double PositionY, double PositionZ,
-	                          HSI_MOTION_MOVE_TYPE eType, double dFlyRadius);
+		HSI_MOTION_MOVE_TYPE eType, double dFlyRadius);
 	HSI_STATUS SetPositionXyzOld(UINT AxisTypes, double PositionX, double PositionY, double PositionZ,
-	                             HSI_MOTION_MOVE_TYPE eType, double dFlyRadius);
+		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_MOTION_MOVE_TYPE eType, double dFlyRadius);
 	HSI_STATUS SetPositionXyzCache(UINT AxisTypes, HSI_MOTION_MOVE_TYPE eType, int DataCount, Point* CacheData);
 	HSI_STATUS GetPositionXyzCache(unsigned char* CacheData, int& DataCount);
 	HSI_STATUS GetPositionR(UINT AxisTypes, double& PositionR, double& Time);
@@ -319,7 +324,7 @@ public:
 	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);
+		double* Intensities);
 	HSI_STATUS DCCPPStartPoint(double* startPoint);
 
 	HSI_STATUS DCCScanSetData(UINT AxisTypes, HSI_SCAN_MOTION_TYPE eType, UINT lTrigNumber, double* dTrigDis);// 下发触发间距,轴、等间距或者等时间、触发数量、间距
@@ -339,11 +344,11 @@ public:
 	HSI_STATUS FindOriginTest(bool state);
 
 	HSI_STATUS StartPlcJob(int* CamerasDis, int* BinsDis, int SubArea, int filterTime1, int filterTime2,
-	                       int pluseSumDis);
+		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);
+		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);
@@ -609,7 +614,7 @@ public:
 	 * \return
 	 */
 	int SpeedPercent(int AxisNum, double& Speed, int& DriveSpeed, int& StartSpeed, int& AccLine, int& DecLine,
-	                 int& AccCurve, int& DecCurve);
+		int& AccCurve, int& DecCurve);
 	/**
 	 * \brief 摇杆切换的运动速度, 与上面那个互锁，动了界面的 摇杆就会失能;
 	 * \param AxisNum
@@ -623,9 +628,9 @@ public:
 	 * \return
 	 */
 	bool SpeedPercentJoyStick(int AxisNum, long& Speed, int& DriveSpeed, int& StartSpeed, int& AccLine, int& DecLine,
-	                          int& AccCurve, int& DecCurve);
+		int& AccCurve, int& DecCurve);
 	void HomeJogGearsChoice(int AxisType, int JogGears, int& DriveSpeed, int& StartSpeed, int& AccLine, int& DecLine,
-	                        int& AccCurve, int& DecCurve);
+		int& AccCurve, int& DecCurve);
 	/**
 	 * \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_DESCRIPTION          "2024.12.23 / 13:41 "  
-#define HSI_FILE_CSDESCRIPTION        _T("周四 2.24.08 / 13:09 ")  
+#define HSI_FILE_CSDESCRIPTION        _T("2024.12.23 / 13:41 ")