#0019 剥离平台轴定义到配置文件

HSI_HexagonMI_EF3/CLMS.cpp

@@ -1,6 +1,6 @@
-
 #include "stdafx.h"
 #include "CLMS.h"
+#include "logger.h"
 using namespace std;
 
 #ifdef _DEBUG
@@ -76,55 +76,92 @@ CLM_GetExpirationDateFor m_pCLM_GetExpirationDateFor;
 
 BOOL CheckLicense()
 {
-    m_hCLM = LoadLibrary(_T("CLMTool.dll"));
+	m_hCLM = LoadLibrary(_T("CLMTool.dll"));
-    if (m_hCLM)
+	if (m_hCLM)
-    {
+	{
-        //Production
+		if (g_pLogger)
-        m_pCLM_Login = (CLM_Login)GetProcAddress(m_hCLM, "CLM_Login");
+		{
-        m_pCLM_Logout = (CLM_Logout)GetProcAddress(m_hCLM, "CLM_Logout");
+			g_pLogger->SendAndFlushWithTime(L"CLMTool.dll Load Success");
-        m_pCLM_Login_Scope = (CLM_Login_Scope)GetProcAddress(m_hCLM, "CLM_Login_Scope");
+		}
-        m_pCLM_ModuleIsLicensed = (CLM_ModuleIsLicensed)GetProcAddress(m_hCLM, "CLM_ModuleIsLicensed");
+		
-        m_pCLM_GetExpirationDateFor = (CLM_GetExpirationDateFor)GetProcAddress(m_hCLM, "CLM_GetExpirationDateFor");
+		//Production
-        m_pCLM_GetWarrantyExpiration = (CLM_GetWarrantyExpiration)GetProcAddress(m_hCLM, "CLM_GetWarrantyExpiration");
+		m_pCLM_Login = (CLM_Login)GetProcAddress(m_hCLM, "CLM_Login");
-    }
+		m_pCLM_Logout = (CLM_Logout)GetProcAddress(m_hCLM, "CLM_Logout");
-    //////////////////////////////////////////////////////////////////1登陆验证
+		m_pCLM_Login_Scope = (CLM_Login_Scope)GetProcAddress(m_hCLM, "CLM_Login_Scope");
-    BOOL res = FALSE;
+		m_pCLM_ModuleIsLicensed = (CLM_ModuleIsLicensed)GetProcAddress(m_hCLM, "CLM_ModuleIsLicensed");
-    //Metus软件
+		m_pCLM_GetExpirationDateFor = (CLM_GetExpirationDateFor)GetProcAddress(m_hCLM, "CLM_GetExpirationDateFor");
-    char* strLogin = "rsWoGvmINesgabljzJZpTmMRGMLyKxFsaxpLRZSnpsujYlboLaKwSINrFbtddgMYgsXkCLwxfVUALwfQcxWEbvZZHjrrYwRkNCBMsjfxeKyannbTIVxsrQvLUWraoysNJFcYJrYnCSabWnxgezkDbvwHLksNqdWyvrfHqKeBLyyVyVYROgizPCqVaRQLkNrSROgvbAqShNZNuzKGHjOLYiwLaXnPKgvHcXuNeNLyuGMFeDnpiipTVDrvJaoNXDTq";
+		m_pCLM_GetWarrantyExpiration = (CLM_GetWarrantyExpiration)GetProcAddress(m_hCLM, "CLM_GetWarrantyExpiration");
-    res = m_pCLM_Login(strLogin);
+	}
-    if (!res)
+	else
-    {
+	{
-        return res;
+		if (g_pLogger)
+		{
+			g_pLogger->SendAndFlushWithTime(L"CLMTool.dll Load Failed");
+		}
+	
+		return FALSE;
+	}
+	//////////////////////////////////////////////////////////////////1登陆验证
+	BOOL res = FALSE;
+	//Metus软件
+	char* strLogin = "rsWoGvmINesgabljzJZpTmMRGMLyKxFsaxpLRZSnpsujYlboLaKwSINrFbtddgMYgsXkCLwxfVUALwfQcxWEbvZZHjrrYwRkNCBMsjfxeKyannbTIVxsrQvLUWraoysNJFcYJrYnCSabWnxgezkDbvwHLksNqdWyvrfHqKeBLyyVyVYROgizPCqVaRQLkNrSROgvbAqShNZNuzKGHjOLYiwLaXnPKgvHcXuNeNLyuGMFeDnpiipTVDrvJaoNXDTq";
+	res = m_pCLM_Login(strLogin);
+	if (!res)
+	{
+		//登陆验证失败
+		if (g_pLogger) {
+			g_pLogger->SendAndFlushWithTime(L"登陆验证失败");
+		}
+		
+		return res;
+	}
 
-        //登陆验证失败
+	//////////////////////////////////////////////////////////////////2检查许可
-    }
+	res = m_pCLM_Login_Scope();
+	if (!res)
+	{
+		//检查许可失败
+		if (g_pLogger) {
+			g_pLogger->SendAndFlushWithTime(L"检查许可失败");
+		}
 
-    //////////////////////////////////////////////////////////////////2检查许可
+		return res;
-    res = m_pCLM_Login_Scope();
+	}
-    if (!res)
-    {
-        return res;
-        //检查许可失败
-    }
 
-    //////////////////////////////////////////////////////////////////3获取许可模块
+	//////////////////////////////////////////////////////////////////3获取许可模块
-    UINT16 Mod = 0;//
+	UINT16 Mod = 7;// 对应模块ID，8为模块ID-1， 表示直线电机中间件
-    UINT16 OnLineType = 0;//许可状态
+	UINT16 OnLineType = 0;//许可状态
-    res = m_pCLM_ModuleIsLicensed(Mod, OnLineType);
+	res = m_pCLM_ModuleIsLicensed(Mod, OnLineType);
-    if (!res)
+	if (!res)
-    {
+	{
-        return res;
+		//登陆验证失败
-        //登陆验证失败
+		if (g_pLogger) {
-    }
+			g_pLogger->SendAndFlushWithTime(L"登陆验证失败");
+		}
 
-    //////////////////////////////////////////////////////////////////4获取许可最早到期日期
+		return res;
-    int ModuleID = 2;
+	}
-    int Year, Month, Day;
+
-    res = m_pCLM_GetWarrantyExpiration(Month, Day, Year);//获取过期时间
+	//////////////////////////////////////////////////////////////////4获取许可最早到期日期
-    if (!res)
+	int ModuleID = 2;
-    {
+	int Year, Month, Day;
-        return res;
+	res = m_pCLM_GetWarrantyExpiration(Month, Day, Year);//获取过期时间
-        //登陆验证失败
+	if (!res)
-    }
+	{
-    return res;
+		//登陆验证失败
-}
+		if (g_pLogger) {
+			g_pLogger->SendAndFlushWithTime(L"获取过期时间失败");
+		}
+	
+		return res;
+	}
+	//打印到期时间
+	CString expirationDate;
+	expirationDate.Format(_T("到期时间为：%d年%d月%d日"), Year, Month, Day);
+	if (g_pLogger) {
+		g_pLogger->SendAndFlushWithTime(expirationDate);
+	}
+	
+
+	return res;
+}

HSI_HexagonMI_EF3/HSI.cpp

@@ -1119,6 +1119,23 @@ HSI_API HSI_STATUS WINAPI HSI_MOTION_COLLECTPOS(bool isEnable, MOTOR_AXISCHOOES_
 	}
 	return rStatus;
 }
+
+HSI_API HSI_STATUS WINAPI HSI_ILLUMINATION_SHUTDOWN()
+{
+	auto rStatus = HSI_STATUS_NORMAL;
+	//if (g_pHSI_Illumination)
+	//{
+	//	rStatus = g_pHSI_Illumination->Shutdown();
+	//	delete g_pHSI_Illumination;
+	//	g_pHSI_Illumination = nullptr;
+	//}
+	//else
+	//{
+	//	rStatus = HSI_STATUS_FAILED;
+	//}
+	return rStatus;
+}
+
 #pragma endregion
 #endif // DEBUG
 

HSI_HexagonMI_EF3/HSI.h

@@ -492,6 +492,7 @@ HSI_API HSI_STATUS WINAPI HSI_MOTION_GET_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_ILLUMINATION_SHUTDOWN();
 
 //暂未实现
 //HSI_API HSI_STATUS WINAPI HSI_MOTION_SET_MAGNIFICATION(UINT AxisTypes, double mag, HSI_MOTION_MOVE_TYPE eType, double dSpeedGear);

HSI_HexagonMI_EF3/HSI_HexagonMI_EF3.vcxproj

@@ -72,7 +72,8 @@
     <PostBuildEvent>
       <Command>copy "$(TargetDir)$(ProjectName).dll" "$(SolutionDir)HSI_SEVENOCEAN_EF1_CsTest\bin\Debug\HSI.dll"
 copy "$(TargetDir)$(ProjectName).dll" "C:\Program Files\Hexagon\Metus\Metus-7.10.1967\HSI_Sevenocean_EF3.dll" 
-copy "$(TargetDir)$(ProjectName).dll" "D:\HSI_Sevenocean_EF3.dll" </Command>
+copy "$(TargetDir)$(ProjectName).dll" "D:\HSI_Sevenocean_EF3.dll" 
+copy "$(TargetDir)$(ProjectName).dll" "D:\HSI.dll" </Command>
     </PostBuildEvent>
     <PreBuildEvent>
       <Command>version.cmd</Command>

HSI_HexagonMI_EF3/HSI_Motion.h

@@ -14,7 +14,7 @@
 #define THREAD_EXIT     -1
 #define MAX_BUFF_SIZE   0x200
 const double SCALE_UNITS = 1000.0;
-static CLogger* g_pLogger;
+
 static CLogger* g_pLogger2;
 static bool g_IsClose; //用于DoEvents()的退出，而不异常
 
@@ -554,6 +554,26 @@ public:
 	unsigned char m_cSendData[64];
 	unsigned char m_direct_pos;
 	unsigned char axis_start;
+	
+	// ACS轴号定义
+	static const int MAX_AXES = 10; // 定义轴的最大数量
+
+	// ACS轴号
+	int ACSAxisDefault[MAX_AXES] =
+	{
+		ACSC_AXIS_0, // 默认值
+		ACSC_AXIS_1, // 默认值
+		ACSC_AXIS_2, // 默认值
+		ACSC_AXIS_3, // 默认值
+		ACSC_AXIS_4, // 默认值
+		ACSC_AXIS_5, // 默认值
+		ACSC_AXIS_6, // 默认值
+		ACSC_AXIS_7, // 默认值
+		ACSC_AXIS_8, // 默认值
+		ACSC_AXIS_9, // 默认值
+	};
+
+	int ACSAxisNumbers[3];
 
 	CPSerial m_SO7_Serial;
 	DWORD m_WriteByte;

HSI_HexagonMI_EF3/logger.h

@@ -84,5 +84,5 @@ public:
 	CRITICAL_SECTION m_lockLogger;//临界区
 };
 
-
+extern CLogger* g_pLogger;
 #endif // !defined(LOGGER_H__5142BB38_5565_4124_88A4_56EA08298154__INCLUDED_)

HSI_HexagonMI_EF3/version.cmd

@@ -5,7 +5,7 @@ echo Generate release version
 ::需要人工设置的版本号----------------------------------------------------------------------------------
 set major_ver=0
 set minor_ver=0
-set revsion_ver=2
+set revsion_ver=3
 
 ::------------------------------------------------------------------------------------------------------
 set revfile="%~dp0version.h"

HSI_HexagonMI_EF3/version.h

@@ -4,13 +4,13 @@
 #define HSI_VERSION_NUM                 
 #define HSI_VERSION_SET               _T("")  
 ///  
-#define HSI_VERSION                   "0.0.2" 
+#define HSI_VERSION                   "0.0.3" 
-#define HSI_VERSION_CSTRING           _T("0.0.2")  
+#define HSI_VERSION_CSTRING           _T("0.0.3")  
 #define HSI_VERSION_MAJOR             0  
 #define HSI_VERSION_MINOR             0  
-#define HSI_VERSION_REVISION          2  
+#define HSI_VERSION_REVISION          3  
 #define HSI_VERSION_REVNUM              
 #define HSI_VERSION_BUILD_DATE        _T(__DATE__ )  
 #define HSI_VERSION_BUILD_TIME        _T(__TIME__ )  
-#define HSI_FILE_DESCRIPTION          "2025.02.17 / 11:10 "  
+#define HSI_FILE_DESCRIPTION          "2025.02.18 / 17:09 "  
-#define HSI_FILE_CSDESCRIPTION        _T("2025.02.17 / 11:10 ")  
+#define HSI_FILE_CSDESCRIPTION        _T("2025.02.18 / 17:09 ")