From f8cea5d5ceb2c333a0e39231469917d466999705 Mon Sep 17 00:00:00 2001 From: "zhengxuan.zhang" Date: Thu, 20 Feb 2025 16:22:10 +0800 Subject: [PATCH] =?UTF-8?q?#0021:=20=E6=96=B0=E5=A2=9EACS=E9=80=9A?= =?UTF-8?q?=E8=AE=AFIP=E7=9A=84=E5=8F=AF=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HSI_HexagonMI_EF3/CLMS.cpp | 2 +- HSI_HexagonMI_EF3/HSI_Motion.cpp | 11 ++++++++++- HSI_HexagonMI_EF3/HSI_Motion.h | 2 ++ HSI_HexagonMI_EF3/version.h | 4 ++-- .../bin/Debug/Config/EF3_Config.ini | Bin 7786 -> 7860 bytes 5 files changed, 15 insertions(+), 4 deletions(-) diff --git a/HSI_HexagonMI_EF3/CLMS.cpp b/HSI_HexagonMI_EF3/CLMS.cpp index 7d1120b..5df5ebc 100644 --- a/HSI_HexagonMI_EF3/CLMS.cpp +++ b/HSI_HexagonMI_EF3/CLMS.cpp @@ -96,7 +96,7 @@ BOOL CheckLicense() { if (g_pLogger) { - g_pLogger->SendAndFlushWithTime(L"CLMTool.dll Load Failed"); + g_pLogger->SendAndFlushWithTime(L"MORCODE.dll Load Failed"); } return FALSE; diff --git a/HSI_HexagonMI_EF3/HSI_Motion.cpp b/HSI_HexagonMI_EF3/HSI_Motion.cpp index d670748..f063a50 100644 --- a/HSI_HexagonMI_EF3/HSI_Motion.cpp +++ b/HSI_HexagonMI_EF3/HSI_Motion.cpp @@ -492,7 +492,7 @@ HSI_STATUS HSI_Motion::Startup(HWND _hWnd, bool _bOfflineOnly) handleACS = acsc_OpenCommSimulator(); #else // 10.0.0.100 - default IP address of the controller - handleACS = acsc_OpenCommEthernet("100.0.0.100", ACSC_SOCKET_DGRAM_PORT); + handleACS = acsc_OpenCommEthernet(m_ACS_IPAddresses, ACSC_SOCKET_DGRAM_PORT); // for the connection to the controller via local network or Internet // hComm = acsc_OpenCommEthernet("10.0.0.100", ACSC_SOCKET_STREAM_PORT); @@ -4254,6 +4254,15 @@ HSI_STATUS HSI_Motion::Load_EF3_Config_Inifile(CString GoogolIniFile) m_IsUseACS = GetPrivateProfileInt(L"EF3", L"IS_USEACS", 0, csAppPath); m_ForSoft = GetPrivateProfileInt(L"SOFTWARE", L"USE_SOFTWARE", 0, csAppPath); + // 从配置文件中读取IP地址 + TCHAR buffer[50]; + GetPrivateProfileString(L"EF3", L"ACS_ADDRESS", L"100.0.0.100", + buffer, 50, csAppPath); + // 将TCHAR类型的buffer转换为char类型的m_ACS_IPAddresses + size_t convertedChars = 0; + wcstombs_s(&convertedChars, m_ACS_IPAddresses, buffer, _TRUNCATE); + g_pLogger->SendAndFlushWithTime(L"ACS IP Address: %S\n", m_ACS_IPAddresses); + m_IsUse_HSICompensation = GetPrivateProfileInt(L"ASIX", L"IS_USE_HSICOMPENSATION", 0, csAppPath); m_Compensation_Pluse = GetPrivateProfileInt(L"ASIX", L"COMPENSATE_PLUSE", 20, csAppPath); m_IsHardLimit = GetPrivateProfileInt(L"ASIX", L"IS_HARD_LIMIT", 7, csAppPath); diff --git a/HSI_HexagonMI_EF3/HSI_Motion.h b/HSI_HexagonMI_EF3/HSI_Motion.h index 9194c81..1682aa9 100644 --- a/HSI_HexagonMI_EF3/HSI_Motion.h +++ b/HSI_HexagonMI_EF3/HSI_Motion.h @@ -461,6 +461,8 @@ public: int m_IsUseTwentySixLight; //是否启用26路灯光 0为不启用 1位启用 默认为0 int m_IsUseEF3; //是否启用EF3 int m_IsUseACS; //是否用ACS运动控制 + char m_ACS_IPAddresses[50]; // 定义字符串，存储ACS IP地址 + int m_DeviceType; //设备类型，0为通用设备，1为三激光, 2为大视野，3为转盘设备 默认为0 int m_UseAxisNum; //转盘设备使用轴号 int m_IbinCount; //记录获取到的分bin数 diff --git a/HSI_HexagonMI_EF3/version.h b/HSI_HexagonMI_EF3/version.h index 48e7456..c1d5524 100644 --- a/HSI_HexagonMI_EF3/version.h +++ b/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 "2025.02.20 / 9:50 " -#define HSI_FILE_CSDESCRIPTION _T("2025.02.20 / 9:50 ") +#define HSI_FILE_DESCRIPTION "2025.02.20 / 16:04 " +#define HSI_FILE_CSDESCRIPTION _T("2025.02.20 / 16:04 ") diff --git a/HSI_SEVENOCEAN_EF1_CsTest/bin/Debug/Config/EF3_Config.ini b/HSI_SEVENOCEAN_EF1_CsTest/bin/Debug/Config/EF3_Config.ini index 5b70561225bc039658c1532b68b8354251577396..7e81bcfbf1d21690a2661b07e4061f2a29cac7b6 100644 GIT binary patch delta 80 zcmaE5v&DA83Ri0eM+RqxV20(%W